1

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

@@ -8,6 +8,7 @@ import com.iotechn.unimall.core.annotation.HttpParam;
 import com.iotechn.unimall.core.annotation.HttpParamType;
 import com.iotechn.unimall.core.annotation.param.NotNull;
 import com.iotechn.unimall.core.exception.ServiceException;
+import com.iotechn.unimall.data.domain.CardManagementInfo;
 import com.iotechn.unimall.data.model.Page;
 import java.util.Date;
 
@@ -37,6 +38,9 @@ public interface ICardClassifyInfoService{
 	@HttpMethod(description = "删除",  permissionName = "名片分类管理")
 	public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")String id)throws ServiceException;
 
+	@HttpMethod(description = "置顶",  permissionName = "名片分类管理")
+	public Boolean top(@NotNull @HttpParam(name = "cardClassifyInfo", type = HttpParamType.COMMON, description = "名片分类") CardClassifyInfo cardClassifyInfo)throws ServiceException;
+
 	@HttpMethod(description = "修改",  permissionName = "名片分类管理")
 	public Boolean update(@NotNull @HttpParam(name = "cardClassifyInfo", type = HttpParamType.COMMON, description = "名片分类") CardClassifyInfo cardClassifyInfo)throws ServiceException;
 

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

@@ -48,6 +48,9 @@ public interface ICardManagementInfoService{
 	@HttpMethod(description = "修改",  permissionName = "名片管理管理")
 	public Boolean update(@NotNull @HttpParam(name = "cardManagementInfo", type = HttpParamType.COMMON, description = "名片管理") CardManagementInfo cardManagementInfo)throws ServiceException;
 
+	@HttpMethod(description = "置顶",  permissionName = "名片管理管理")
+	public Boolean top(@NotNull @HttpParam(name = "cardManagementInfo", type = HttpParamType.COMMON, description = "名片管理") CardManagementInfo cardManagementInfo)throws ServiceException;
+
 	@HttpMethod(description = "查询", permissionName = "名片管理管理")
 	public CardManagementInfo get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id)throws ServiceException;
 	

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

@@ -2,9 +2,11 @@ package com.iotechn.unimall.admin.api.card.impl;
 
 import java.util.List;
 
+import com.iotechn.unimall.data.domain.CardManagementInfo;
 import org.apache.ibatis.session.RowBounds;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -78,6 +80,21 @@ public class CardClassifyInfoServiceImpl implements ICardClassifyInfoService{
 		return true;
 	}
 
+	@Override
+	public Boolean top(CardClassifyInfo cardClassifyInfo) throws ServiceException {
+		CardClassifyInfo cardClassifyInfo1=cardClassifyInfoMapper.selectById(cardClassifyInfo.getId());
+		List<CardClassifyInfo> cardClassifyInfoList=cardClassifyInfoMapper.selectList(new EntityWrapper<CardClassifyInfo>()
+				.eq("common_id",cardClassifyInfo1.getCommonId()));
+		if (!CollectionUtils.isEmpty(cardClassifyInfoList)) {
+			for (CardClassifyInfo aa : cardClassifyInfoList) {
+				aa.setTopMarking(0l);
+				cardClassifyInfoMapper.updateById(aa);
+			}
+		}
+		cardClassifyInfo1.setTopMarking(1l);
+		return cardClassifyInfoMapper.updateById(cardClassifyInfo1)>0;
+	}
+
 	@Override
 	public Boolean update(CardClassifyInfo cardClassifyInfo) throws ServiceException {
 		Date now = new Date();

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

@@ -3,7 +3,10 @@ package com.iotechn.unimall.admin.api.card.impl;
 import java.util.List;
 
 import com.iotechn.unimall.data.domain.CardManagementInfo;
+import com.iotechn.unimall.data.domain.CommonUserInfo;
+import com.iotechn.unimall.data.domain.PersonalHomepageInfo;
 import com.iotechn.unimall.data.mapper.CardManagementInfoMapper;
+import com.iotechn.unimall.data.mapper.CommonUserInfoMapper;
 import org.apache.ibatis.session.RowBounds;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -33,6 +36,8 @@ public class CardHolderInfoServiceImpl implements ICardHolderInfoService{
 	private CardHolderInfoMapper cardHolderInfoMapper;
 	@Autowired
 	private CardManagementInfoMapper cardManagementInfoMapper;
+	@Autowired
+	private CommonUserInfoMapper commonUserInfoMapper;
 	
 	@Override
 	public Boolean add(CardHolderInfo cardHolderInfo) throws ServiceException {
@@ -71,6 +76,11 @@ public class CardHolderInfoServiceImpl implements ICardHolderInfoService{
 				if (cardManagementInfo!=null){
 					cardHolderInfo.setCardManagementInfo(cardManagementInfo);
 				}
+				//查看是否允许分享
+				CommonUserInfo commonUserInfo=commonUserInfoMapper.selectById(cardHolderInfo.getCommonId());
+				if (commonUserInfo!=null){
+					cardHolderInfo.setShareCard(commonUserInfo.getShareCard());
+				}
 			}
 		}
 		Integer count = cardHolderInfoMapper.selectCount(wrapper);

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

@@ -2,13 +2,15 @@ package com.iotechn.unimall.admin.api.card.impl;
 
 import java.util.List;
 
-import com.iotechn.unimall.data.domain.CardHolderInfo;
-import com.iotechn.unimall.data.domain.CircleCardInfo;
+import com.iotechn.unimall.data.domain.*;
+import com.iotechn.unimall.data.domain.tools.gen.GenTableColumn;
 import com.iotechn.unimall.data.mapper.CardHolderInfoMapper;
 import com.iotechn.unimall.data.mapper.CircleCardInfoMapper;
+import com.iotechn.unimall.data.mapper.PersonalHomepageInfoMapper;
 import org.apache.ibatis.session.RowBounds;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -16,7 +18,6 @@ import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.iotechn.unimall.core.exception.ServiceException;
 import com.iotechn.unimall.data.util.ExcelUtil;
 import com.iotechn.unimall.data.mapper.CardManagementInfoMapper;
-import com.iotechn.unimall.data.domain.CardManagementInfo;
 import com.iotechn.unimall.admin.api.card.ICardManagementInfoService;
 import com.iotechn.unimall.data.model.Page;
 import java.util.Date;
@@ -35,6 +36,8 @@ public class CardManagementInfoServiceImpl implements ICardManagementInfoService
 	private CircleCardInfoMapper circleCardInfoMapper;
 	@Autowired
 	private CardHolderInfoMapper cardHolderInfoMapper;
+	@Autowired
+	private PersonalHomepageInfoMapper personalHomepageInfoMapper;
 	
 	@Override
 	public Boolean add(CardManagementInfo cardManagementInfo) throws ServiceException {
@@ -86,8 +89,18 @@ public class CardManagementInfoServiceImpl implements ICardManagementInfoService
 												if (!StringUtils.isEmpty(deleteFlag)) {
 					wrapper.eq("delete_flag", deleteFlag);
 				}
-							wrapper.eq("delete_flag", 0);
+							wrapper.eq("delete_flag", 0).orderBy("top_marking",false);
 		List<CardManagementInfo> list = cardManagementInfoMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
+		if (!CollectionUtils.isEmpty(list)){
+			for (CardManagementInfo cardManagementInfo:list){
+				PersonalHomepageInfo personalHomepageInfo=new PersonalHomepageInfo();
+				personalHomepageInfo.setCommonId(cardManagementInfo.getCommonId());
+				PersonalHomepageInfo personalHomepageInfo1=personalHomepageInfoMapper.selectOne(personalHomepageInfo);
+				if (personalHomepageInfo1!=null){
+					cardManagementInfo.setPersonalHomeId(personalHomepageInfo1.getId());
+				}
+			}
+		}
 		Integer count = cardManagementInfoMapper.selectCount(wrapper);
 		return new Page<CardManagementInfo>(list, page, limit, count);
 	}
@@ -127,6 +140,21 @@ public class CardManagementInfoServiceImpl implements ICardManagementInfoService
 		return cardManagementInfoMapper.updateById(cardManagementInfo)>0;
 	}
 
+	@Override
+	public Boolean top(CardManagementInfo cardManagementInfo) throws ServiceException {
+		CardManagementInfo cardManagementInfo1=cardManagementInfoMapper.selectById(cardManagementInfo.getId());
+		List<CardManagementInfo> cardManagementInfoList=cardManagementInfoMapper.selectList(new EntityWrapper<CardManagementInfo>()
+				.eq("common_id",cardManagementInfo1.getCommonId()));
+		if (!CollectionUtils.isEmpty(cardManagementInfoList)) {
+			for (CardManagementInfo aa : cardManagementInfoList) {
+				aa.setTopMarking(0l);
+				cardManagementInfoMapper.updateById(aa);
+			}
+		}
+		cardManagementInfo1.setTopMarking(1l);
+		return cardManagementInfoMapper.updateById(cardManagementInfo1)>0;
+	}
+
 	@Override
 	public CardManagementInfo get(Long id) throws ServiceException {
 		return cardManagementInfoMapper.selectById(id);

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

@@ -5,8 +5,10 @@ import java.util.List;
 
 import com.iotechn.unimall.data.domain.CardManagementInfo;
 import com.iotechn.unimall.data.domain.CircleCardInfo;
+import com.iotechn.unimall.data.domain.CommonUserInfo;
 import com.iotechn.unimall.data.mapper.CardManagementInfoMapper;
 import com.iotechn.unimall.data.mapper.CircleCardInfoMapper;
+import com.iotechn.unimall.data.mapper.CommonUserInfoMapper;
 import org.apache.ibatis.session.RowBounds;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -37,6 +39,8 @@ public class CircleManagementInfoServiceImpl implements ICircleManagementInfoSer
 	private CircleCardInfoMapper circleCardInfoMapper;
 	@Autowired
 	private CardManagementInfoMapper cardManagementInfoMapper;
+	@Autowired
+	private CommonUserInfoMapper commonUserInfoMapper;
 	
 	@Override
 	public Boolean add(CircleManagementInfo circleManagementInfo) throws ServiceException {
@@ -107,6 +111,11 @@ public class CircleManagementInfoServiceImpl implements ICircleManagementInfoSer
 			//查询名片信息
 			CardManagementInfo cardManagementInfo=cardManagementInfoMapper.selectById(circleCardInfo.getCardId());
 			if (cardManagementInfo!=null){
+				//查看是否允许圈子成员查看主页
+				CommonUserInfo commonUserInfo=commonUserInfoMapper.selectById(cardManagementInfo.getCommonId());
+				if (commonUserInfo!=null){
+					cardManagementInfo.setLookPage(commonUserInfo.getLookPage());
+				}
 				cardManagementInfoList.add(cardManagementInfo);
 			}
 		}

unimall-data/src/main/java/com/iotechn/unimall/data/domain/CardHolderInfo.java

@@ -64,7 +64,9 @@ public class CardHolderInfo extends SuperDO {
     private Long deleteFlag;
     @TableField(exist = false)
     private CardManagementInfo cardManagementInfo;
-
+    /** 允许他人分享名片(1允许) */
+    @TableField(exist = false)
+    private Long shareCard;
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

unimall-data/src/main/java/com/iotechn/unimall/data/domain/CardManagementInfo.java

@@ -90,6 +90,11 @@ public class CardManagementInfo extends SuperDO {
     @TableField("qr_code")
     private String qrCode;
 
+    /** 置顶标识 */
+    @Excel(name = "置顶标识")
+    @TableField("top_marking")
+    private Long topMarking;
+
     /**  */
     @Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")
     @TableField("gmt_create")
@@ -109,6 +114,14 @@ public class CardManagementInfo extends SuperDO {
      */
     @TableField(exist = false)
     private String deleteCondition;
+    /**
+     * 主页id
+     */
+    @TableField(exist = false)
+    private Long personalHomeId;
+    /** 允许圈子成员查看主页(1允许) */
+    @TableField(exist = false)
+    private Long lookPage;
 
     @Override
     public String toString() {