`

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

@@ -41,6 +41,9 @@ public interface ICardClassifyInfoService{
 	@HttpMethod(description = "置顶",  permissionName = "名片分类管理")
 	public Boolean top(@NotNull @HttpParam(name = "cardClassifyInfo", type = HttpParamType.COMMON, description = "名片分类") CardClassifyInfo cardClassifyInfo)throws ServiceException;
 
+	@HttpMethod(description = "置顶默认分类",  permissionName = "名片分类管理")
+	public Boolean topDefault(@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/impl/CardClassifyInfoServiceImpl.java

@@ -74,6 +74,7 @@ public class CardClassifyInfoServiceImpl implements ICardClassifyInfoService{
 			CardClassifyInfo tmp =  cardClassifyInfoMapper.selectById(Long.parseLong(tt));
 			if(tmp != null){
 				tmp.setDeleteFlag(1l);
+				tmp.setGmtUpdate(new Date());
 				cardClassifyInfoMapper.updateById(tmp);
 			}
 		}
@@ -92,9 +93,23 @@ public class CardClassifyInfoServiceImpl implements ICardClassifyInfoService{
 			}
 		}
 		cardClassifyInfo1.setTopMarking(1l);
+		cardClassifyInfo1.setGmtUpdate(new Date());
 		return cardClassifyInfoMapper.updateById(cardClassifyInfo1)>0;
 	}
 
+	@Override
+	public Boolean topDefault(CardClassifyInfo cardClassifyInfo) throws ServiceException {
+		List<CardClassifyInfo> cardClassifyInfoList=cardClassifyInfoMapper.selectList(new EntityWrapper<CardClassifyInfo>()
+				.eq("common_id",cardClassifyInfo.getCommonId()));
+		if (!CollectionUtils.isEmpty(cardClassifyInfoList)) {
+			for (CardClassifyInfo aa : cardClassifyInfoList) {
+				aa.setTopMarking(0l);
+				cardClassifyInfoMapper.updateById(aa);
+			}
+		}
+		return true;
+	}
+
 	@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

@@ -95,6 +95,7 @@ public class CardHolderInfoServiceImpl implements ICardHolderInfoService{
 			CardHolderInfo tmp =  cardHolderInfoMapper.selectById(Long.parseLong(tt));
 			if(tmp != null){
 				tmp.setDeleteFlag(1l);
+				tmp.setGmtUpdate(new Date());
 				cardHolderInfoMapper.updateById(tmp);
 			}
 		}

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

@@ -2,9 +2,9 @@ package com.iotechn.unimall.admin.api.card.impl;
 
 import java.util.List;
 
+import com.iotechn.unimall.core.util.GeneratorUtil;
 import com.iotechn.unimall.data.util.QRCodeUtil;
 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;
@@ -47,13 +47,17 @@ public class CardManagementInfoServiceImpl implements ICardManagementInfoService
 		Date now = new Date();
 		cardManagementInfo.setGmtCreate(now);
 		cardManagementInfo.setGmtUpdate(now);
-		return cardManagementInfoMapper.insert(cardManagementInfo)>0;
+		cardManagementInfoMapper.insert(cardManagementInfo);
+		//更新数据库默认值
+		cardManagementInfo = cardManagementInfoMapper.selectById(cardManagementInfo.getId());
+		//二维码
+		String str = qrCodeUtil.getQRCodeImage(String.valueOf(cardManagementInfo.getId()), false, cardManagementInfo.getName(), GeneratorUtil.genUUId());
+		cardManagementInfo.setQrCode(str);
+		return cardManagementInfoMapper.updateById(cardManagementInfo)>0;
 	}
 
 	@Override
 	public Page<CardManagementInfo> list(Long commonId,String cardBusiness,String name,String post,String companyName,String location,String detailedAddress,String phone,String headSculpture,String qrCode,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
-//		String str = qrCodeUtil.getQRCodeImage("id=xxx二维码字符串", false, "名字", GeneratorUtil.genUUId());
-//		System.out.println(str);
 		Wrapper<CardManagementInfo> wrapper = new EntityWrapper<CardManagementInfo>();
 														if (!StringUtils.isEmpty(commonId)) {
 					wrapper.eq("common_id", commonId);
@@ -119,19 +123,26 @@ public class CardManagementInfoServiceImpl implements ICardManagementInfoService
 			if(tmp != null){
 				//退出关联的圈子
 				List<CircleCardInfo> list=circleCardInfoMapper.selectList(new EntityWrapper<CircleCardInfo>().eq("card_id",tmp.getId()));
-				for(CircleCardInfo aa:list){
-					aa.setDeleteFlag(1l);
-					circleCardInfoMapper.updateById(aa);
+				if (!CollectionUtils.isEmpty(list)) {
+					for (CircleCardInfo aa : list) {
+						aa.setDeleteFlag(1l);
+						aa.setGmtUpdate(new Date());
+						circleCardInfoMapper.updateById(aa);
+					}
 				}
 				//从所有拥有此名片用户列表删除
 				if ("1".equals(deleteCondition)){
 					List<CardHolderInfo> cardHolderInfoList=cardHolderInfoMapper.selectList(new EntityWrapper<CardHolderInfo>().eq("card_id",tmp.getId()));
-					for(CardHolderInfo aa:cardHolderInfoList){
-						aa.setDeleteFlag(1l);
-						cardHolderInfoMapper.updateById(aa);
+					if (!CollectionUtils.isEmpty(cardHolderInfoList)) {
+						for (CardHolderInfo aa : cardHolderInfoList) {
+							aa.setDeleteFlag(1l);
+							aa.setGmtUpdate(new Date());
+							cardHolderInfoMapper.updateById(aa);
+						}
 					}
 				}
-				tmp.setCommonId(null);
+				tmp.setCommonId(-1l);
+				tmp.setGmtUpdate(new Date());
 				cardManagementInfoMapper.updateById(tmp);
 			}
 		}
@@ -157,6 +168,7 @@ public class CardManagementInfoServiceImpl implements ICardManagementInfoService
 			}
 		}
 		cardManagementInfo1.setTopMarking(1l);
+		cardManagementInfo1.setGmtUpdate(new Date());
 		return cardManagementInfoMapper.updateById(cardManagementInfo1)>0;
 	}
 

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

@@ -72,6 +72,7 @@ public class CertificateManagementInfoServiceImpl implements ICertificateManagem
 			CertificateManagementInfo tmp =  certificateManagementInfoMapper.selectById(Long.parseLong(tt));
 			if(tmp != null){
 				tmp.setDeleteFlag(1l);
+				tmp.setGmtUpdate(new Date());
 				certificateManagementInfoMapper.updateById(tmp);
 			}
 		}

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

@@ -72,6 +72,7 @@ public class CircleCardInfoServiceImpl implements ICircleCardInfoService{
 			CircleCardInfo tmp =  circleCardInfoMapper.selectById(Long.parseLong(tt));
 			if(tmp != null){
 				tmp.setDeleteFlag(1l);
+				tmp.setGmtUpdate(new Date());
 				circleCardInfoMapper.updateById(tmp);
 			}
 		}

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

@@ -47,6 +47,8 @@ public class CircleManagementInfoServiceImpl implements ICircleManagementInfoSer
 		Date now = new Date();
 		circleManagementInfo.setGmtCreate(now);
 		circleManagementInfo.setGmtUpdate(now);
+		//添加圈子状态默认未审核
+		circleManagementInfo.setStatus(0l);
 		return circleManagementInfoMapper.insert(circleManagementInfo)>0;
 	}
 
@@ -88,6 +90,7 @@ public class CircleManagementInfoServiceImpl implements ICircleManagementInfoSer
 			CircleManagementInfo tmp =  circleManagementInfoMapper.selectById(Long.parseLong(tt));
 			if(tmp != null){
 				tmp.setDeleteFlag(1l);
+				tmp.setGmtUpdate(new Date());
 				circleManagementInfoMapper.updateById(tmp);
 			}
 		}

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

@@ -87,6 +87,7 @@ public class CommonUserInfoServiceImpl implements ICommonUserInfoService{
 			CommonUserInfo tmp =  commonUserInfoMapper.selectById(Long.parseLong(tt));
 			if(tmp != null){
 				tmp.setDeleteFlag(1L);
+				tmp.setGmtUpdate(new Date());
 				commonUserInfoMapper.updateById(tmp);
 			}
 		}

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

@@ -90,6 +90,7 @@ public class PersonalHomepageInfoServiceImpl implements IPersonalHomepageInfoSer
 			PersonalHomepageInfo tmp =  personalHomepageInfoMapper.selectById(Long.parseLong(tt));
 			if(tmp != null){
 				tmp.setDeleteFlag(1l);
+				tmp.setGmtUpdate(new Date());
 				personalHomepageInfoMapper.updateById(tmp);
 			}
 		}

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

@@ -72,6 +72,7 @@ public class SearchRecordsInfoServiceImpl implements ISearchRecordsInfoService{
 			SearchRecordsInfo tmp =  searchRecordsInfoMapper.selectById(Long.parseLong(tt));
 			if(tmp != null){
 				tmp.setDeleteFlag(1l);
+				tmp.setGmtUpdate(new Date());
 				searchRecordsInfoMapper.updateById(tmp);
 			}
 		}

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

@@ -23,7 +23,9 @@ import java.util.Date;
 @TableName("circle_card_info")
 public class CircleCardInfo extends SuperDO {
     private static final long serialVersionUID = 1L;
-
+    /**  */
+    @TableId("id")
+    private Long id;
     /** 圈子id */
     @Excel(name = "圈子id")
     @TableField("circle_id")