1

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

@@ -23,161 +23,163 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
 import com.iotechn.unimall.core.exception.ServiceException;
+
 import java.util.Date;
+
 import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 名片交换Service业务层处理
- * 
+ *
  * @author jlb
  * @date 2023-04-12
  */
 @Service
 public class CardExchangeInfoServiceImpl implements ICardExchangeInfoService {
-	@Autowired
-	private CardExchangeInfoMapper cardExchangeInfoMapper;
-	@Autowired
-	private CardHolderInfoMapper cardHolderInfoMapper;
-	@Autowired
-	private CardManagementInfoMapper cardManagementInfoMapper;
-	
-	@Override
-	public Boolean add(CardExchangeInfo cardExchangeInfo) throws ServiceException {
-		Date now = new Date();
-		cardExchangeInfo.setGmtCreate(now);
-		cardExchangeInfo.setGmtUpdate(now);
-		return cardExchangeInfoMapper.insert(cardExchangeInfo)>0;
-	}
+    @Autowired
+    private CardExchangeInfoMapper cardExchangeInfoMapper;
+    @Autowired
+    private CardHolderInfoMapper cardHolderInfoMapper;
+    @Autowired
+    private CardManagementInfoMapper cardManagementInfoMapper;
+
+    @Override
+    public Boolean add(CardExchangeInfo cardExchangeInfo) throws ServiceException {
+        Date now = new Date();
+        cardExchangeInfo.setGmtCreate(now);
+        cardExchangeInfo.setGmtUpdate(now);
+        return cardExchangeInfoMapper.insert(cardExchangeInfo) > 0;
+    }
+
+    @Override
+    public Page<CardExchangeInfo> list(Long sendId, Long receiveId, Long sendCardId, Long receiveCardId, String circleName, String status, Date gmtCreate, Date gmtUpdate, Long deleteFlag, Integer page, Integer limit) throws ServiceException {
+        Wrapper<CardExchangeInfo> wrapper = new EntityWrapper<CardExchangeInfo>();
+        if (!StringUtils.isEmpty(sendId)) {
+            wrapper.eq("send_id", sendId);
+        }
+        if (!StringUtils.isEmpty(receiveId)) {
+            wrapper.eq("receive_id", receiveId);
+        }
+        if (!StringUtils.isEmpty(sendCardId)) {
+            wrapper.eq("send_card_id", sendCardId);
+        }
+        if (!StringUtils.isEmpty(receiveCardId)) {
+            wrapper.eq("receive_card_id", receiveCardId);
+        }
+        if (!StringUtils.isEmpty(circleName)) {
+            wrapper.eq("circle_name", circleName);
+        }
+        if (!StringUtils.isEmpty(status)) {
+            wrapper.eq("status", status);
+        }
+        if (!StringUtils.isEmpty(gmtCreate)) {
+            wrapper.eq("gmt_create", gmtCreate);
+        }
+        if (!StringUtils.isEmpty(gmtUpdate)) {
+            wrapper.eq("gmt_update", gmtUpdate);
+        }
+        if (!StringUtils.isEmpty(deleteFlag)) {
+            wrapper.eq("delete_flag", deleteFlag);
+        }
+        wrapper.eq("delete_flag", 0);
+        Integer count = cardExchangeInfoMapper.selectCount(wrapper);
+        List<CardExchangeInfo> list = cardExchangeInfoMapper.getCardExchangeInfoPage((page - 1) * limit, limit, receiveId);
+        return new Page<CardExchangeInfo>(list, page, limit, count);
+    }
 
-	@Override
-	public Page<CardExchangeInfo> list(Long sendId,Long receiveId,Long sendCardId,Long receiveCardId,String circleName,String status,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
-		Wrapper<CardExchangeInfo> wrapper = new EntityWrapper<CardExchangeInfo>();
-														if (!StringUtils.isEmpty(sendId)) {
-					wrapper.eq("send_id", sendId);
-				}
-												if (!StringUtils.isEmpty(receiveId)) {
-					wrapper.eq("receive_id", receiveId);
-				}
-												if (!StringUtils.isEmpty(sendCardId)) {
-					wrapper.eq("send_card_id", sendCardId);
-				}
-												if (!StringUtils.isEmpty(receiveCardId)) {
-					wrapper.eq("receive_card_id", receiveCardId);
-				}
-												if (!StringUtils.isEmpty(circleName)) {
-					wrapper.eq("circle_name", circleName);
-				}
-												if (!StringUtils.isEmpty(status)) {
-					wrapper.eq("status", status);
-				}
-												if (!StringUtils.isEmpty(gmtCreate)) {
-					wrapper.eq("gmt_create", gmtCreate);
-				}
-												if (!StringUtils.isEmpty(gmtUpdate)) {
-					wrapper.eq("gmt_update", gmtUpdate);
-				}
-												if (!StringUtils.isEmpty(deleteFlag)) {
-					wrapper.eq("delete_flag", deleteFlag);
-				}
-							wrapper.eq("delete_flag", 0);
-		Integer count = cardExchangeInfoMapper.selectCount(wrapper);
-		List<CardExchangeInfo> list = cardExchangeInfoMapper.getCardExchangeInfoPage((page - 1) * limit, limit,receiveId);
-		return new Page<CardExchangeInfo>(list, page, limit, count);
-	}
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean delete(String id) {
+        String[] ids = String.valueOf(id).split(",");
+        for (String tt : ids) {
+            CardExchangeInfo tmp = cardExchangeInfoMapper.selectById(Long.parseLong(tt));
+            if (tmp != null) {
+                tmp.setDeleteFlag(1L);
+                cardExchangeInfoMapper.updateById(tmp);
+            }
+        }
+        return true;
+    }
 
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public Boolean delete(String id) {
-		String[] ids = String.valueOf(id).split(",");
-		for (String tt:ids) {
-			CardExchangeInfo tmp =  cardExchangeInfoMapper.selectById(Long.parseLong(tt));
-			if(tmp != null){
-				tmp.setDeleteFlag(1L);
-				cardExchangeInfoMapper.updateById(tmp);
-			}
-		}
-		return true;
-	}
+    @Override
+    public Boolean update(CardExchangeInfo cardExchangeInfo, String updateFlag) throws ServiceException {
+        Date now = new Date();
+        cardExchangeInfo.setGmtUpdate(now);
+        //拉黑
+        if ("1".equals(updateFlag)) {
+            cardExchangeInfo.setStatus("7");
+        }
+        //拒绝
+        else if ("2".equals(updateFlag)) {
+            cardExchangeInfo.setStatus("3");
+        }
+        //接受
+        else if ("3".equals(updateFlag)) {
+            cardExchangeInfo.setStatus("1");
+            //接收人名片夹添加数据
+            CardHolderInfo cardHolderInfo = new CardHolderInfo();
+            cardHolderInfo.setCardId(String.valueOf(cardExchangeInfo.getSendCardId()));
+            CardManagementInfo cardManagementInfo = cardManagementInfoMapper.selectById(cardExchangeInfo.getSendCardId());
+            //查看发起人名片是否删除
+            if (cardManagementInfo.getCommonId() == -1) {
+                throw new AppServiceException(ExceptionDefinition.ACCEPT_CARD_ERROR);
+            }
+            cardHolderInfo.setCommonId(cardExchangeInfo.getReceiveId());
+            cardHolderInfo.setGmtCreate(now);
+            cardHolderInfo.setGmtUpdate(now);
+            cardHolderInfoMapper.insert(cardHolderInfo);
+            //发起人名片夹添加数据
+            cardHolderInfo = new CardHolderInfo();
+            cardHolderInfo.setCardId(String.valueOf(cardExchangeInfo.getReceiveCardId()));
+            cardHolderInfo.setCommonId(cardExchangeInfo.getSendId());
+            cardHolderInfo.setGmtCreate(now);
+            cardHolderInfo.setGmtUpdate(now);
+            cardHolderInfoMapper.insert(cardHolderInfo);
+        }
+        //移除
+        else {
+            cardExchangeInfo.setStatus("0");
+        }
+        return cardExchangeInfoMapper.updateById(cardExchangeInfo) > 0;
+    }
 
-	@Override
-	public Boolean update(CardExchangeInfo cardExchangeInfo,String updateFlag) throws ServiceException {
-		Date now = new Date();
-		cardExchangeInfo.setGmtUpdate(now);
-		//拉黑
-		if ("1".equals(updateFlag)){
-			cardExchangeInfo.setStatus("7");
-		}
-		//拒绝
-		else if ("2".equals(updateFlag)){
-			cardExchangeInfo.setStatus("3");
-		}
-		//接受
-		else if ("3".equals(updateFlag)){
-			cardExchangeInfo.setStatus("1");
-			//接收人名片夹添加数据
-			CardHolderInfo cardHolderInfo=new CardHolderInfo();
-			cardHolderInfo.setCardId(String.valueOf(cardExchangeInfo.getSendCardId()));
-			CardManagementInfo cardManagementInfo=cardManagementInfoMapper.selectById(cardExchangeInfo.getSendCardId());
-			//查看发起人名片是否删除
-			if (cardManagementInfo.getCommonId()==-1){
-				throw new AppServiceException(ExceptionDefinition.ACCEPT_CARD_ERROR);
-			}
-			cardHolderInfo.setCommonId(cardExchangeInfo.getReceiveId());
-			cardHolderInfo.setGmtCreate(now);
-			cardHolderInfo.setGmtUpdate(now);
-			cardHolderInfoMapper.insert(cardHolderInfo);
-			//发起人名片夹添加数据
-			cardHolderInfo=new CardHolderInfo();
-			cardHolderInfo.setCardId(String.valueOf(cardExchangeInfo.getReceiveCardId()));
-			cardHolderInfo.setCommonId(cardExchangeInfo.getSendId());
-			cardHolderInfo.setGmtCreate(now);
-			cardHolderInfo.setGmtUpdate(now);
-			cardHolderInfoMapper.insert(cardHolderInfo);
-		}
-		//移除
-		else{
-			cardExchangeInfo.setStatus("0");
-		}
-		return cardExchangeInfoMapper.updateById(cardExchangeInfo)>0;
-	}
+    @Override
+    public CardExchangeInfo get(Long id) throws ServiceException {
+        return cardExchangeInfoMapper.selectById(id);
+    }
 
-	@Override
-	public CardExchangeInfo get(Long id) throws ServiceException {
-		return cardExchangeInfoMapper.selectById(id);
-	}
-	
-	@Override
-	public String export(Long sendId,Long receiveId,Long sendCardId,Long receiveCardId,String circleName,String status,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
-		Wrapper<CardExchangeInfo> wrapper = new EntityWrapper<CardExchangeInfo>();
-														if (!StringUtils.isEmpty(sendId)) {
-					wrapper.eq("send_id", sendId);
-				}
-												if (!StringUtils.isEmpty(receiveId)) {
-					wrapper.eq("receive_id", receiveId);
-				}
-												if (!StringUtils.isEmpty(sendCardId)) {
-					wrapper.eq("send_card_id", sendCardId);
-				}
-												if (!StringUtils.isEmpty(receiveCardId)) {
-					wrapper.eq("receive_card_id", receiveCardId);
-				}
-												if (!StringUtils.isEmpty(circleName)) {
-					wrapper.eq("circle_name", circleName);
-				}
-												if (!StringUtils.isEmpty(status)) {
-					wrapper.eq("status", status);
-				}
-												if (!StringUtils.isEmpty(gmtCreate)) {
-					wrapper.eq("gmt_create", gmtCreate);
-				}
-												if (!StringUtils.isEmpty(gmtUpdate)) {
-					wrapper.eq("gmt_update", gmtUpdate);
-				}
-												if (!StringUtils.isEmpty(deleteFlag)) {
-					wrapper.eq("delete_flag", deleteFlag);
-				}
-							List<CardExchangeInfo> list = cardExchangeInfoMapper.selectList(wrapper);
-		ExcelUtil<CardExchangeInfo> util = new ExcelUtil<CardExchangeInfo>(CardExchangeInfo.class);
-		return util.exportExcel(list, "操作日志");
-	}
+    @Override
+    public String export(Long sendId, Long receiveId, Long sendCardId, Long receiveCardId, String circleName, String status, Date gmtCreate, Date gmtUpdate, Long deleteFlag, Integer page, Integer limit) throws ServiceException {
+        Wrapper<CardExchangeInfo> wrapper = new EntityWrapper<CardExchangeInfo>();
+        if (!StringUtils.isEmpty(sendId)) {
+            wrapper.eq("send_id", sendId);
+        }
+        if (!StringUtils.isEmpty(receiveId)) {
+            wrapper.eq("receive_id", receiveId);
+        }
+        if (!StringUtils.isEmpty(sendCardId)) {
+            wrapper.eq("send_card_id", sendCardId);
+        }
+        if (!StringUtils.isEmpty(receiveCardId)) {
+            wrapper.eq("receive_card_id", receiveCardId);
+        }
+        if (!StringUtils.isEmpty(circleName)) {
+            wrapper.eq("circle_name", circleName);
+        }
+        if (!StringUtils.isEmpty(status)) {
+            wrapper.eq("status", status);
+        }
+        if (!StringUtils.isEmpty(gmtCreate)) {
+            wrapper.eq("gmt_create", gmtCreate);
+        }
+        if (!StringUtils.isEmpty(gmtUpdate)) {
+            wrapper.eq("gmt_update", gmtUpdate);
+        }
+        if (!StringUtils.isEmpty(deleteFlag)) {
+            wrapper.eq("delete_flag", deleteFlag);
+        }
+        List<CardExchangeInfo> list = cardExchangeInfoMapper.selectList(wrapper);
+        ExcelUtil<CardExchangeInfo> util = new ExcelUtil<CardExchangeInfo>(CardExchangeInfo.class);
+        return util.exportExcel(list, "操作日志");
+    }
 }

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

@@ -21,131 +21,133 @@ import com.iotechn.unimall.data.mapper.CardHolderInfoMapper;
 import com.iotechn.unimall.data.domain.CardHolderInfo;
 import com.iotechn.unimall.admin.api.card.ICardHolderInfoService;
 import com.iotechn.unimall.data.model.Page;
+
 import java.util.Date;
+
 import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 名片夹Service业务层处理
- * 
+ *
  * @author jlb
  * @date 2023-04-10
  */
 @Service
-public class CardHolderInfoServiceImpl implements ICardHolderInfoService{
-	@Autowired
-	private CardHolderInfoMapper cardHolderInfoMapper;
-	@Autowired
-	private CardManagementInfoMapper cardManagementInfoMapper;
-	@Autowired
-	private CommonUserInfoMapper commonUserInfoMapper;
-	
-	@Override
-	public Boolean add(CardHolderInfo cardHolderInfo) throws ServiceException {
-		Date now = new Date();
-		cardHolderInfo.setGmtCreate(now);
-		cardHolderInfo.setGmtUpdate(now);
-		//个人展示的二维码 相互交换
-		if (cardHolderInfo.getCardCommonId()!=null){
-			CardHolderInfo cardHolderInfo1=new CardHolderInfo();
-			cardHolderInfo1.setCardId(cardHolderInfo.getMyCardId());
-			cardHolderInfo1.setCommonId(cardHolderInfo.getCardCommonId());
-			cardHolderInfo1.setGmtCreate(now);
-			cardHolderInfo1.setGmtUpdate(now);
-			cardHolderInfoMapper.insert(cardHolderInfo1);
-		}
-		return cardHolderInfoMapper.insert(cardHolderInfo)>0;
-	}
+public class CardHolderInfoServiceImpl implements ICardHolderInfoService {
+    @Autowired
+    private CardHolderInfoMapper cardHolderInfoMapper;
+    @Autowired
+    private CardManagementInfoMapper cardManagementInfoMapper;
+    @Autowired
+    private CommonUserInfoMapper commonUserInfoMapper;
+
+    @Override
+    public Boolean add(CardHolderInfo cardHolderInfo) throws ServiceException {
+        Date now = new Date();
+        cardHolderInfo.setGmtCreate(now);
+        cardHolderInfo.setGmtUpdate(now);
+        //个人展示的二维码 相互交换
+        if (cardHolderInfo.getCardCommonId() != null) {
+            CardHolderInfo cardHolderInfo1 = new CardHolderInfo();
+            cardHolderInfo1.setCardId(cardHolderInfo.getMyCardId());
+            cardHolderInfo1.setCommonId(cardHolderInfo.getCardCommonId());
+            cardHolderInfo1.setGmtCreate(now);
+            cardHolderInfo1.setGmtUpdate(now);
+            cardHolderInfoMapper.insert(cardHolderInfo1);
+        }
+        return cardHolderInfoMapper.insert(cardHolderInfo) > 0;
+    }
+
+    @Override
+    public Page<CardHolderInfo> list(Long commonId, String cardId, String classify, Date gmtCreate, Date gmtUpdate, Long deleteFlag, Integer page, Integer limit) throws ServiceException {
+        Wrapper<CardHolderInfo> wrapper = new EntityWrapper<CardHolderInfo>();
+        if (!StringUtils.isEmpty(commonId)) {
+            wrapper.eq("common_id", commonId);
+        }
+        if (!StringUtils.isEmpty(cardId)) {
+            wrapper.eq("card_id", cardId);
+        }
+        if (!StringUtils.isEmpty(classify)) {
+            wrapper.eq("classify", classify);
+        }
+        if (!StringUtils.isEmpty(gmtCreate)) {
+            wrapper.eq("gmt_create", gmtCreate);
+        }
+        if (!StringUtils.isEmpty(gmtUpdate)) {
+            wrapper.eq("gmt_update", gmtUpdate);
+        }
+        if (!StringUtils.isEmpty(deleteFlag)) {
+            wrapper.eq("delete_flag", deleteFlag);
+        }
+        wrapper.eq("delete_flag", 0);
+        List<CardHolderInfo> list = cardHolderInfoMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
+        if (!CollectionUtils.isEmpty(list)) {
+            for (CardHolderInfo cardHolderInfo : list) {
+                CardManagementInfo cardManagementInfo = cardManagementInfoMapper.selectById(cardHolderInfo.getCardId());
+                if (cardManagementInfo != null) {
+                    cardHolderInfo.setCardManagementInfo(cardManagementInfo);
+                }
+                //查看是否允许分享
+                CommonUserInfo commonUserInfo = commonUserInfoMapper.selectById(cardHolderInfo.getCommonId());
+                if (commonUserInfo != null) {
+                    cardHolderInfo.setShareCard(commonUserInfo.getShareCard());
+                }
+            }
+        }
+        Integer count = cardHolderInfoMapper.selectCount(wrapper);
+        return new Page<CardHolderInfo>(list, page, limit, count);
+    }
 
-	@Override
-	public Page<CardHolderInfo> list(Long commonId,String cardId,String classify,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
-		Wrapper<CardHolderInfo> wrapper = new EntityWrapper<CardHolderInfo>();
-														if (!StringUtils.isEmpty(commonId)) {
-					wrapper.eq("common_id", commonId);
-				}
-												if (!StringUtils.isEmpty(cardId)) {
-					wrapper.eq("card_id", cardId);
-				}
-																	if (!StringUtils.isEmpty(classify)) {
-					wrapper.eq("classify", classify);
-				}
-												if (!StringUtils.isEmpty(gmtCreate)) {
-					wrapper.eq("gmt_create", gmtCreate);
-				}
-												if (!StringUtils.isEmpty(gmtUpdate)) {
-					wrapper.eq("gmt_update", gmtUpdate);
-				}
-												if (!StringUtils.isEmpty(deleteFlag)) {
-					wrapper.eq("delete_flag", deleteFlag);
-				}
-							wrapper.eq("delete_flag", 0);
-		List<CardHolderInfo> list = cardHolderInfoMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
-		if (!CollectionUtils.isEmpty(list)){
-			for (CardHolderInfo cardHolderInfo:list){
-				CardManagementInfo cardManagementInfo=cardManagementInfoMapper.selectById(cardHolderInfo.getCardId());
-				if (cardManagementInfo!=null){
-					cardHolderInfo.setCardManagementInfo(cardManagementInfo);
-				}
-				//查看是否允许分享
-				CommonUserInfo commonUserInfo=commonUserInfoMapper.selectById(cardHolderInfo.getCommonId());
-				if (commonUserInfo!=null){
-					cardHolderInfo.setShareCard(commonUserInfo.getShareCard());
-				}
-			}
-		}
-		Integer count = cardHolderInfoMapper.selectCount(wrapper);
-		return new Page<CardHolderInfo>(list, page, limit, count);
-	}
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean delete(String id) {
+        String[] ids = String.valueOf(id).split(",");
+        for (String tt : ids) {
+            CardHolderInfo tmp = cardHolderInfoMapper.selectById(Long.parseLong(tt));
+            if (tmp != null) {
+                tmp.setDeleteFlag(1l);
+                tmp.setGmtUpdate(new Date());
+                cardHolderInfoMapper.updateById(tmp);
+            }
+        }
+        return true;
+    }
 
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public Boolean delete(String id) {
-		String[] ids = String.valueOf(id).split(",");
-		for (String tt:ids) {
-			CardHolderInfo tmp =  cardHolderInfoMapper.selectById(Long.parseLong(tt));
-			if(tmp != null){
-				tmp.setDeleteFlag(1l);
-				tmp.setGmtUpdate(new Date());
-				cardHolderInfoMapper.updateById(tmp);
-			}
-		}
-		return true;
-	}
+    @Override
+    public Boolean update(CardHolderInfo cardHolderInfo) throws ServiceException {
+        Date now = new Date();
+        cardHolderInfo.setGmtUpdate(now);
+        return cardHolderInfoMapper.updateById(cardHolderInfo) > 0;
+    }
 
-	@Override
-	public Boolean update(CardHolderInfo cardHolderInfo) throws ServiceException {
-		Date now = new Date();
-		cardHolderInfo.setGmtUpdate(now);
-		return cardHolderInfoMapper.updateById(cardHolderInfo)>0;
-	}
+    @Override
+    public CardHolderInfo get(Long id) throws ServiceException {
+        return cardHolderInfoMapper.selectById(id);
+    }
 
-	@Override
-	public CardHolderInfo get(Long id) throws ServiceException {
-		return cardHolderInfoMapper.selectById(id);
-	}
-	
-	@Override
-	public String export(Long commonId,String cardId,String classify,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
-		Wrapper<CardHolderInfo> wrapper = new EntityWrapper<CardHolderInfo>();
-														if (!StringUtils.isEmpty(commonId)) {
-					wrapper.eq("common_id", commonId);
-				}
-												if (!StringUtils.isEmpty(cardId)) {
-					wrapper.eq("card_id", cardId);
-				}
-																	if (!StringUtils.isEmpty(classify)) {
-					wrapper.eq("classify", classify);
-				}
-												if (!StringUtils.isEmpty(gmtCreate)) {
-					wrapper.eq("gmt_create", gmtCreate);
-				}
-												if (!StringUtils.isEmpty(gmtUpdate)) {
-					wrapper.eq("gmt_update", gmtUpdate);
-				}
-												if (!StringUtils.isEmpty(deleteFlag)) {
-					wrapper.eq("delete_flag", deleteFlag);
-				}
-							List<CardHolderInfo> list = cardHolderInfoMapper.selectList(wrapper);
-		ExcelUtil<CardHolderInfo> util = new ExcelUtil<CardHolderInfo>(CardHolderInfo.class);
-		return util.exportExcel(list, "操作日志");
-	}
+    @Override
+    public String export(Long commonId, String cardId, String classify, Date gmtCreate, Date gmtUpdate, Long deleteFlag, Integer page, Integer limit) throws ServiceException {
+        Wrapper<CardHolderInfo> wrapper = new EntityWrapper<CardHolderInfo>();
+        if (!StringUtils.isEmpty(commonId)) {
+            wrapper.eq("common_id", commonId);
+        }
+        if (!StringUtils.isEmpty(cardId)) {
+            wrapper.eq("card_id", cardId);
+        }
+        if (!StringUtils.isEmpty(classify)) {
+            wrapper.eq("classify", classify);
+        }
+        if (!StringUtils.isEmpty(gmtCreate)) {
+            wrapper.eq("gmt_create", gmtCreate);
+        }
+        if (!StringUtils.isEmpty(gmtUpdate)) {
+            wrapper.eq("gmt_update", gmtUpdate);
+        }
+        if (!StringUtils.isEmpty(deleteFlag)) {
+            wrapper.eq("delete_flag", deleteFlag);
+        }
+        List<CardHolderInfo> list = cardHolderInfoMapper.selectList(wrapper);
+        ExcelUtil<CardHolderInfo> util = new ExcelUtil<CardHolderInfo>(CardHolderInfo.class);
+        return util.exportExcel(list, "操作日志");
+    }
 }

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

@@ -21,214 +21,217 @@ import com.iotechn.unimall.data.util.ExcelUtil;
 import com.iotechn.unimall.data.mapper.CardManagementInfoMapper;
 import com.iotechn.unimall.admin.api.card.ICardManagementInfoService;
 import com.iotechn.unimall.data.model.Page;
+
 import java.util.Date;
+
 import org.springframework.transaction.annotation.Transactional;
+
 /**
  * 名片管理Service业务层处理
- * 
+ *
  * @author jlb
  * @date 2023-04-10
  */
 @Service
-public class CardManagementInfoServiceImpl implements ICardManagementInfoService{
-	@Autowired
-	private CardManagementInfoMapper cardManagementInfoMapper;
-	@Autowired
-	private QRCodeUtil qrCodeUtil;
-	@Autowired
-	private CircleCardInfoMapper circleCardInfoMapper;
-	@Autowired
-	private CardHolderInfoMapper cardHolderInfoMapper;
-	@Autowired
-	private PersonalHomepageInfoMapper personalHomepageInfoMapper;
-	
-	@Override
-	public Boolean add(CardManagementInfo cardManagementInfo) throws ServiceException {
-		Date now = new Date();
-		cardManagementInfo.setGmtCreate(now);
-		cardManagementInfo.setGmtUpdate(now);
-		cardManagementInfoMapper.insert(cardManagementInfo);
-		//更新数据库默认值
-		cardManagementInfo = cardManagementInfoMapper.selectById(cardManagementInfo.getId());
-		//二维码
-		String str = qrCodeUtil.getQRCodeImage(String.valueOf(cardManagementInfo.getId()), false, cardManagementInfo.getName(), GeneratorUtil.genUUId());
-		String str1 = qrCodeUtil.getQRCodeImage(cardManagementInfo.getId()+","+cardManagementInfo.getCommonId(), false, cardManagementInfo.getName(), GeneratorUtil.genUUId());
-		cardManagementInfo.setQrCode(str);
-		cardManagementInfo.setQrCodeMyself(str1);
-		return cardManagementInfoMapper.updateById(cardManagementInfo)>0;
-	}
+public class CardManagementInfoServiceImpl implements ICardManagementInfoService {
+    @Autowired
+    private CardManagementInfoMapper cardManagementInfoMapper;
+    @Autowired
+    private QRCodeUtil qrCodeUtil;
+    @Autowired
+    private CircleCardInfoMapper circleCardInfoMapper;
+    @Autowired
+    private CardHolderInfoMapper cardHolderInfoMapper;
+    @Autowired
+    private PersonalHomepageInfoMapper personalHomepageInfoMapper;
+
+    @Override
+    public Boolean add(CardManagementInfo cardManagementInfo) throws ServiceException {
+        Date now = new Date();
+        cardManagementInfo.setGmtCreate(now);
+        cardManagementInfo.setGmtUpdate(now);
+        cardManagementInfoMapper.insert(cardManagementInfo);
+        //更新数据库默认值
+        cardManagementInfo = cardManagementInfoMapper.selectById(cardManagementInfo.getId());
+        //二维码
+        String str = qrCodeUtil.getQRCodeImage(String.valueOf(cardManagementInfo.getId()), false, cardManagementInfo.getName(), GeneratorUtil.genUUId());
+        String str1 = qrCodeUtil.getQRCodeImage(cardManagementInfo.getId() + "," + cardManagementInfo.getCommonId(), false, cardManagementInfo.getName(), GeneratorUtil.genUUId());
+        cardManagementInfo.setQrCode(str);
+        cardManagementInfo.setQrCodeMyself(str1);
+        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 {
+        Wrapper<CardManagementInfo> wrapper = new EntityWrapper<CardManagementInfo>();
+        if (!StringUtils.isEmpty(commonId)) {
+            wrapper.eq("common_id", commonId);
+        }
+        if (!StringUtils.isEmpty(cardBusiness)) {
+            wrapper.eq("card_business", cardBusiness);
+        }
+        if (!StringUtils.isEmpty(name)) {
+            wrapper.eq("name", name);
+        }
+        if (!StringUtils.isEmpty(post)) {
+            wrapper.eq("post", post);
+        }
+        if (!StringUtils.isEmpty(companyName)) {
+            wrapper.eq("company_name", companyName);
+        }
+        if (!StringUtils.isEmpty(location)) {
+            wrapper.eq("location", location);
+        }
+        if (!StringUtils.isEmpty(detailedAddress)) {
+            wrapper.eq("detailed_address", detailedAddress);
+        }
+        if (!StringUtils.isEmpty(phone)) {
+            wrapper.eq("phone", phone);
+        }
+        if (!StringUtils.isEmpty(headSculpture)) {
+            wrapper.eq("head_sculpture", headSculpture);
+        }
+        if (!StringUtils.isEmpty(qrCode)) {
+            wrapper.eq("qr_code", qrCode);
+        }
+        if (!StringUtils.isEmpty(gmtCreate)) {
+            wrapper.eq("gmt_create", gmtCreate);
+        }
+        if (!StringUtils.isEmpty(gmtUpdate)) {
+            wrapper.eq("gmt_update", gmtUpdate);
+        }
+        if (!StringUtils.isEmpty(deleteFlag)) {
+            wrapper.eq("delete_flag", deleteFlag);
+        }
+        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.setDeleteFlag(0l);
+                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);
+    }
 
-	@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 {
-		Wrapper<CardManagementInfo> wrapper = new EntityWrapper<CardManagementInfo>();
-														if (!StringUtils.isEmpty(commonId)) {
-					wrapper.eq("common_id", commonId);
-				}
-												if (!StringUtils.isEmpty(cardBusiness)) {
-					wrapper.eq("card_business", cardBusiness);
-				}
-												if (!StringUtils.isEmpty(name)) {
-					wrapper.eq("name", name);
-				}
-												if (!StringUtils.isEmpty(post)) {
-					wrapper.eq("post", post);
-				}
-												if (!StringUtils.isEmpty(companyName)) {
-					wrapper.eq("company_name", companyName);
-				}
-												if (!StringUtils.isEmpty(location)) {
-					wrapper.eq("location", location);
-				}
-												if (!StringUtils.isEmpty(detailedAddress)) {
-					wrapper.eq("detailed_address", detailedAddress);
-				}
-												if (!StringUtils.isEmpty(phone)) {
-					wrapper.eq("phone", phone);
-				}
-												if (!StringUtils.isEmpty(headSculpture)) {
-					wrapper.eq("head_sculpture", headSculpture);
-				}
-												if (!StringUtils.isEmpty(qrCode)) {
-					wrapper.eq("qr_code", qrCode);
-				}
-												if (!StringUtils.isEmpty(gmtCreate)) {
-					wrapper.eq("gmt_create", gmtCreate);
-				}
-												if (!StringUtils.isEmpty(gmtUpdate)) {
-					wrapper.eq("gmt_update", gmtUpdate);
-				}
-												if (!StringUtils.isEmpty(deleteFlag)) {
-					wrapper.eq("delete_flag", deleteFlag);
-				}
-							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.setDeleteFlag(0l);
-				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);
-	}
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean delete(String id, String deleteCondition) {
+        String[] ids = String.valueOf(id).split(",");
+        for (String tt : ids) {
+            CardManagementInfo tmp = cardManagementInfoMapper.selectById(Long.parseLong(tt));
+            if (tmp != null) {
+                //退出关联的圈子
+                List<CircleCardInfo> list = circleCardInfoMapper.selectList(new EntityWrapper<CircleCardInfo>()
+                        .eq("card_id", tmp.getId())
+                        .eq("delete_flag", 0));
+                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())
+                            .eq("delete_flag", 0));
+                    if (!CollectionUtils.isEmpty(cardHolderInfoList)) {
+                        for (CardHolderInfo aa : cardHolderInfoList) {
+                            aa.setDeleteFlag(1l);
+                            aa.setGmtUpdate(new Date());
+                            cardHolderInfoMapper.updateById(aa);
+                        }
+                    }
+                }
+                tmp.setCommonId(-1l);
+                tmp.setGmtUpdate(new Date());
+                cardManagementInfoMapper.updateById(tmp);
+            }
+        }
+        return true;
+    }
 
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public Boolean delete(String id,String deleteCondition) {
-		String[] ids = String.valueOf(id).split(",");
-		for (String tt:ids) {
-			CardManagementInfo tmp =  cardManagementInfoMapper.selectById(Long.parseLong(tt));
-			if(tmp != null){
-				//退出关联的圈子
-				List<CircleCardInfo> list=circleCardInfoMapper.selectList(new EntityWrapper<CircleCardInfo>()
-						.eq("card_id",tmp.getId())
-						.eq("delete_flag",0));
-				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())
-							.eq("delete_flag",0));
-					if (!CollectionUtils.isEmpty(cardHolderInfoList)) {
-						for (CardHolderInfo aa : cardHolderInfoList) {
-							aa.setDeleteFlag(1l);
-							aa.setGmtUpdate(new Date());
-							cardHolderInfoMapper.updateById(aa);
-						}
-					}
-				}
-				tmp.setCommonId(-1l);
-				tmp.setGmtUpdate(new Date());
-				cardManagementInfoMapper.updateById(tmp);
-			}
-		}
-		return true;
-	}
+    @Override
+    public Boolean update(CardManagementInfo cardManagementInfo) throws ServiceException {
+        Date now = new Date();
+        cardManagementInfo.setGmtUpdate(now);
+        return cardManagementInfoMapper.updateById(cardManagementInfo) > 0;
+    }
 
-	@Override
-	public Boolean update(CardManagementInfo cardManagementInfo) throws ServiceException {
-		Date now = new Date();
-		cardManagementInfo.setGmtUpdate(now);
-		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())
+                .eq("delete_flag", 0));
+        if (!CollectionUtils.isEmpty(cardManagementInfoList)) {
+            for (CardManagementInfo aa : cardManagementInfoList) {
+                aa.setTopMarking(0l);
+                cardManagementInfoMapper.updateById(aa);
+            }
+        }
+        cardManagementInfo1.setTopMarking(1l);
+        cardManagementInfo1.setGmtUpdate(new Date());
+        return cardManagementInfoMapper.updateById(cardManagementInfo1) > 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())
-				.eq("delete_flag",0));
-		if (!CollectionUtils.isEmpty(cardManagementInfoList)) {
-			for (CardManagementInfo aa : cardManagementInfoList) {
-				aa.setTopMarking(0l);
-				cardManagementInfoMapper.updateById(aa);
-			}
-		}
-		cardManagementInfo1.setTopMarking(1l);
-		cardManagementInfo1.setGmtUpdate(new Date());
-		return cardManagementInfoMapper.updateById(cardManagementInfo1)>0;
-	}
+    @Override
+    public CardManagementInfo get(Long id) throws ServiceException {
+        return cardManagementInfoMapper.selectById(id);
+    }
 
-	@Override
-	public CardManagementInfo get(Long id) throws ServiceException {
-		return cardManagementInfoMapper.selectById(id);
-	}
-	
-	@Override
-	public String export(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 {
-		Wrapper<CardManagementInfo> wrapper = new EntityWrapper<CardManagementInfo>();
-														if (!StringUtils.isEmpty(commonId)) {
-					wrapper.eq("common_id", commonId);
-				}
-												if (!StringUtils.isEmpty(cardBusiness)) {
-					wrapper.eq("card_business", cardBusiness);
-				}
-												if (!StringUtils.isEmpty(name)) {
-					wrapper.eq("name", name);
-				}
-												if (!StringUtils.isEmpty(post)) {
-					wrapper.eq("post", post);
-				}
-												if (!StringUtils.isEmpty(companyName)) {
-					wrapper.eq("company_name", companyName);
-				}
-												if (!StringUtils.isEmpty(location)) {
-					wrapper.eq("location", location);
-				}
-												if (!StringUtils.isEmpty(detailedAddress)) {
-					wrapper.eq("detailed_address", detailedAddress);
-				}
-												if (!StringUtils.isEmpty(phone)) {
-					wrapper.eq("phone", phone);
-				}
-												if (!StringUtils.isEmpty(headSculpture)) {
-					wrapper.eq("head_sculpture", headSculpture);
-				}
-												if (!StringUtils.isEmpty(qrCode)) {
-					wrapper.eq("qr_code", qrCode);
-				}
-												if (!StringUtils.isEmpty(gmtCreate)) {
-					wrapper.eq("gmt_create", gmtCreate);
-				}
-												if (!StringUtils.isEmpty(gmtUpdate)) {
-					wrapper.eq("gmt_update", gmtUpdate);
-				}
-												if (!StringUtils.isEmpty(deleteFlag)) {
-					wrapper.eq("delete_flag", deleteFlag);
-				}
-							List<CardManagementInfo> list = cardManagementInfoMapper.selectList(wrapper);
-		ExcelUtil<CardManagementInfo> util = new ExcelUtil<CardManagementInfo>(CardManagementInfo.class);
-		return util.exportExcel(list, "操作日志");
-	}
+    @Override
+    public String export(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 {
+        Wrapper<CardManagementInfo> wrapper = new EntityWrapper<CardManagementInfo>();
+        if (!StringUtils.isEmpty(commonId)) {
+            wrapper.eq("common_id", commonId);
+        }
+        if (!StringUtils.isEmpty(cardBusiness)) {
+            wrapper.eq("card_business", cardBusiness);
+        }
+        if (!StringUtils.isEmpty(name)) {
+            wrapper.eq("name", name);
+        }
+        if (!StringUtils.isEmpty(post)) {
+            wrapper.eq("post", post);
+        }
+        if (!StringUtils.isEmpty(companyName)) {
+            wrapper.eq("company_name", companyName);
+        }
+        if (!StringUtils.isEmpty(location)) {
+            wrapper.eq("location", location);
+        }
+        if (!StringUtils.isEmpty(detailedAddress)) {
+            wrapper.eq("detailed_address", detailedAddress);
+        }
+        if (!StringUtils.isEmpty(phone)) {
+            wrapper.eq("phone", phone);
+        }
+        if (!StringUtils.isEmpty(headSculpture)) {
+            wrapper.eq("head_sculpture", headSculpture);
+        }
+        if (!StringUtils.isEmpty(qrCode)) {
+            wrapper.eq("qr_code", qrCode);
+        }
+        if (!StringUtils.isEmpty(gmtCreate)) {
+            wrapper.eq("gmt_create", gmtCreate);
+        }
+        if (!StringUtils.isEmpty(gmtUpdate)) {
+            wrapper.eq("gmt_update", gmtUpdate);
+        }
+        if (!StringUtils.isEmpty(deleteFlag)) {
+            wrapper.eq("delete_flag", deleteFlag);
+        }
+        List<CardManagementInfo> list = cardManagementInfoMapper.selectList(wrapper);
+        ExcelUtil<CardManagementInfo> util = new ExcelUtil<CardManagementInfo>(CardManagementInfo.class);
+        return util.exportExcel(list, "操作日志");
+    }
 }

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

@@ -15,105 +15,107 @@ import com.iotechn.unimall.data.mapper.CertificateManagementInfoMapper;
 import com.iotechn.unimall.data.domain.CertificateManagementInfo;
 import com.iotechn.unimall.admin.api.card.ICertificateManagementInfoService;
 import com.iotechn.unimall.data.model.Page;
+
 import java.util.Date;
+
 import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 证件管理Service业务层处理
- * 
+ *
  * @author jlb
  * @date 2023-04-10
  */
 @Service
-public class CertificateManagementInfoServiceImpl implements ICertificateManagementInfoService{
-	@Autowired
-	private CertificateManagementInfoMapper certificateManagementInfoMapper;
-	
-	@Override
-	public Boolean add(CertificateManagementInfo certificateManagementInfo) throws ServiceException {
-		Date now = new Date();
-		certificateManagementInfo.setGmtCreate(now);
-		certificateManagementInfo.setGmtUpdate(now);
-		return certificateManagementInfoMapper.insert(certificateManagementInfo)>0;
-	}
+public class CertificateManagementInfoServiceImpl implements ICertificateManagementInfoService {
+    @Autowired
+    private CertificateManagementInfoMapper certificateManagementInfoMapper;
+
+    @Override
+    public Boolean add(CertificateManagementInfo certificateManagementInfo) throws ServiceException {
+        Date now = new Date();
+        certificateManagementInfo.setGmtCreate(now);
+        certificateManagementInfo.setGmtUpdate(now);
+        return certificateManagementInfoMapper.insert(certificateManagementInfo) > 0;
+    }
+
+    @Override
+    public Page<CertificateManagementInfo> list(Long commonId, String certificateName, String certificateImage, Date gmtCreate, Date gmtUpdate, Long deleteFlag, Integer page, Integer limit) throws ServiceException {
+        Wrapper<CertificateManagementInfo> wrapper = new EntityWrapper<CertificateManagementInfo>();
+        if (!StringUtils.isEmpty(commonId)) {
+            wrapper.eq("common_id", commonId);
+        }
+        if (!StringUtils.isEmpty(certificateName)) {
+            wrapper.eq("certificate_name", certificateName);
+        }
+        if (!StringUtils.isEmpty(certificateImage)) {
+            wrapper.eq("certificate_image", certificateImage);
+        }
+        if (!StringUtils.isEmpty(gmtCreate)) {
+            wrapper.eq("gmt_create", gmtCreate);
+        }
+        if (!StringUtils.isEmpty(gmtUpdate)) {
+            wrapper.eq("gmt_update", gmtUpdate);
+        }
+        if (!StringUtils.isEmpty(deleteFlag)) {
+            wrapper.eq("delete_flag", deleteFlag);
+        }
+        wrapper.eq("delete_flag", 0);
+        List<CertificateManagementInfo> list = certificateManagementInfoMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
+        Integer count = certificateManagementInfoMapper.selectCount(wrapper);
+        return new Page<CertificateManagementInfo>(list, page, limit, count);
+    }
 
-	@Override
-	public Page<CertificateManagementInfo> list(Long commonId,String certificateName,String certificateImage,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
-		Wrapper<CertificateManagementInfo> wrapper = new EntityWrapper<CertificateManagementInfo>();
-														if (!StringUtils.isEmpty(commonId)) {
-					wrapper.eq("common_id", commonId);
-				}
-												if (!StringUtils.isEmpty(certificateName)) {
-					wrapper.eq("certificate_name", certificateName);
-				}
-												if (!StringUtils.isEmpty(certificateImage)) {
-					wrapper.eq("certificate_image", certificateImage);
-				}
-												if (!StringUtils.isEmpty(gmtCreate)) {
-					wrapper.eq("gmt_create", gmtCreate);
-				}
-												if (!StringUtils.isEmpty(gmtUpdate)) {
-					wrapper.eq("gmt_update", gmtUpdate);
-				}
-												if (!StringUtils.isEmpty(deleteFlag)) {
-					wrapper.eq("delete_flag", deleteFlag);
-				}
-							wrapper.eq("delete_flag", 0);
-		List<CertificateManagementInfo> list = certificateManagementInfoMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
-		Integer count = certificateManagementInfoMapper.selectCount(wrapper);
-		return new Page<CertificateManagementInfo>(list, page, limit, count);
-	}
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean delete(String id) {
+        String[] ids = String.valueOf(id).split(",");
+        for (String tt : ids) {
+            CertificateManagementInfo tmp = certificateManagementInfoMapper.selectById(Long.parseLong(tt));
+            if (tmp != null) {
+                tmp.setDeleteFlag(1l);
+                tmp.setGmtUpdate(new Date());
+                certificateManagementInfoMapper.updateById(tmp);
+            }
+        }
+        return true;
+    }
 
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public Boolean delete(String id) {
-		String[] ids = String.valueOf(id).split(",");
-		for (String tt:ids) {
-			CertificateManagementInfo tmp =  certificateManagementInfoMapper.selectById(Long.parseLong(tt));
-			if(tmp != null){
-				tmp.setDeleteFlag(1l);
-				tmp.setGmtUpdate(new Date());
-				certificateManagementInfoMapper.updateById(tmp);
-			}
-		}
-		return true;
-	}
+    @Override
+    public Boolean update(CertificateManagementInfo certificateManagementInfo) throws ServiceException {
+        Date now = new Date();
+        certificateManagementInfo.setGmtUpdate(now);
+        return certificateManagementInfoMapper.updateById(certificateManagementInfo) > 0;
+    }
 
-	@Override
-	public Boolean update(CertificateManagementInfo certificateManagementInfo) throws ServiceException {
-		Date now = new Date();
-		certificateManagementInfo.setGmtUpdate(now);
-		return certificateManagementInfoMapper.updateById(certificateManagementInfo)>0;
-	}
+    @Override
+    public CertificateManagementInfo get(Long id) throws ServiceException {
+        return certificateManagementInfoMapper.selectById(id);
+    }
 
-	@Override
-	public CertificateManagementInfo get(Long id) throws ServiceException {
-		return certificateManagementInfoMapper.selectById(id);
-	}
-	
-	@Override
-	public String export(Long commonId,String certificateName,String certificateImage,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
-		Wrapper<CertificateManagementInfo> wrapper = new EntityWrapper<CertificateManagementInfo>();
-														if (!StringUtils.isEmpty(commonId)) {
-					wrapper.eq("common_id", commonId);
-				}
-												if (!StringUtils.isEmpty(certificateName)) {
-					wrapper.eq("certificate_name", certificateName);
-				}
-												if (!StringUtils.isEmpty(certificateImage)) {
-					wrapper.eq("certificate_image", certificateImage);
-				}
-												if (!StringUtils.isEmpty(gmtCreate)) {
-					wrapper.eq("gmt_create", gmtCreate);
-				}
-												if (!StringUtils.isEmpty(gmtUpdate)) {
-					wrapper.eq("gmt_update", gmtUpdate);
-				}
-												if (!StringUtils.isEmpty(deleteFlag)) {
-					wrapper.eq("delete_flag", deleteFlag);
-				}
-							List<CertificateManagementInfo> list = certificateManagementInfoMapper.selectList(wrapper);
-		ExcelUtil<CertificateManagementInfo> util = new ExcelUtil<CertificateManagementInfo>(CertificateManagementInfo.class);
-		return util.exportExcel(list, "操作日志");
-	}
+    @Override
+    public String export(Long commonId, String certificateName, String certificateImage, Date gmtCreate, Date gmtUpdate, Long deleteFlag, Integer page, Integer limit) throws ServiceException {
+        Wrapper<CertificateManagementInfo> wrapper = new EntityWrapper<CertificateManagementInfo>();
+        if (!StringUtils.isEmpty(commonId)) {
+            wrapper.eq("common_id", commonId);
+        }
+        if (!StringUtils.isEmpty(certificateName)) {
+            wrapper.eq("certificate_name", certificateName);
+        }
+        if (!StringUtils.isEmpty(certificateImage)) {
+            wrapper.eq("certificate_image", certificateImage);
+        }
+        if (!StringUtils.isEmpty(gmtCreate)) {
+            wrapper.eq("gmt_create", gmtCreate);
+        }
+        if (!StringUtils.isEmpty(gmtUpdate)) {
+            wrapper.eq("gmt_update", gmtUpdate);
+        }
+        if (!StringUtils.isEmpty(deleteFlag)) {
+            wrapper.eq("delete_flag", deleteFlag);
+        }
+        List<CertificateManagementInfo> list = certificateManagementInfoMapper.selectList(wrapper);
+        ExcelUtil<CertificateManagementInfo> util = new ExcelUtil<CertificateManagementInfo>(CertificateManagementInfo.class);
+        return util.exportExcel(list, "操作日志");
+    }
 }

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

@@ -15,105 +15,107 @@ import com.iotechn.unimall.data.mapper.CircleCardInfoMapper;
 import com.iotechn.unimall.data.domain.CircleCardInfo;
 import com.iotechn.unimall.admin.api.card.ICircleCardInfoService;
 import com.iotechn.unimall.data.model.Page;
+
 import java.util.Date;
+
 import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 圈子个人关系Service业务层处理
- * 
+ *
  * @author jlb
  * @date 2023-04-10
  */
 @Service
-public class CircleCardInfoServiceImpl implements ICircleCardInfoService{
-	@Autowired
-	private CircleCardInfoMapper circleCardInfoMapper;
-	
-	@Override
-	public Boolean add(CircleCardInfo circleCardInfo) throws ServiceException {
-		Date now = new Date();
-		circleCardInfo.setGmtCreate(now);
-		circleCardInfo.setGmtUpdate(now);
-		return circleCardInfoMapper.insert(circleCardInfo)>0;
-	}
+public class CircleCardInfoServiceImpl implements ICircleCardInfoService {
+    @Autowired
+    private CircleCardInfoMapper circleCardInfoMapper;
+
+    @Override
+    public Boolean add(CircleCardInfo circleCardInfo) throws ServiceException {
+        Date now = new Date();
+        circleCardInfo.setGmtCreate(now);
+        circleCardInfo.setGmtUpdate(now);
+        return circleCardInfoMapper.insert(circleCardInfo) > 0;
+    }
+
+    @Override
+    public Page<CircleCardInfo> list(Long circleId, Long cardId, Long commonId, Date gmtCreate, Date gmtUpdate, Long deleteFlag, Integer page, Integer limit) throws ServiceException {
+        Wrapper<CircleCardInfo> wrapper = new EntityWrapper<CircleCardInfo>();
+        if (!StringUtils.isEmpty(circleId)) {
+            wrapper.eq("circle_id", circleId);
+        }
+        if (!StringUtils.isEmpty(cardId)) {
+            wrapper.eq("card_id", cardId);
+        }
+        if (!StringUtils.isEmpty(commonId)) {
+            wrapper.eq("common_id", commonId);
+        }
+        if (!StringUtils.isEmpty(gmtCreate)) {
+            wrapper.eq("gmt_create", gmtCreate);
+        }
+        if (!StringUtils.isEmpty(gmtUpdate)) {
+            wrapper.eq("gmt_update", gmtUpdate);
+        }
+        if (!StringUtils.isEmpty(deleteFlag)) {
+            wrapper.eq("delete_flag", deleteFlag);
+        }
+        wrapper.eq("delete_flag", 0);
+        List<CircleCardInfo> list = circleCardInfoMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
+        Integer count = circleCardInfoMapper.selectCount(wrapper);
+        return new Page<CircleCardInfo>(list, page, limit, count);
+    }
 
-	@Override
-	public Page<CircleCardInfo> list(Long circleId,Long cardId,Long commonId,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
-		Wrapper<CircleCardInfo> wrapper = new EntityWrapper<CircleCardInfo>();
-									if (!StringUtils.isEmpty(circleId)) {
-					wrapper.eq("circle_id", circleId);
-				}
-												if (!StringUtils.isEmpty(cardId)) {
-					wrapper.eq("card_id", cardId);
-				}
-												if (!StringUtils.isEmpty(commonId)) {
-					wrapper.eq("common_id", commonId);
-				}
-												if (!StringUtils.isEmpty(gmtCreate)) {
-					wrapper.eq("gmt_create", gmtCreate);
-				}
-												if (!StringUtils.isEmpty(gmtUpdate)) {
-					wrapper.eq("gmt_update", gmtUpdate);
-				}
-												if (!StringUtils.isEmpty(deleteFlag)) {
-					wrapper.eq("delete_flag", deleteFlag);
-				}
-							wrapper.eq("delete_flag", 0);
-		List<CircleCardInfo> list = circleCardInfoMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
-		Integer count = circleCardInfoMapper.selectCount(wrapper);
-		return new Page<CircleCardInfo>(list, page, limit, count);
-	}
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean delete(String id) {
+        String[] ids = String.valueOf(id).split(",");
+        for (String tt : ids) {
+            CircleCardInfo tmp = circleCardInfoMapper.selectById(Long.parseLong(tt));
+            if (tmp != null) {
+                tmp.setDeleteFlag(1l);
+                tmp.setGmtUpdate(new Date());
+                circleCardInfoMapper.updateById(tmp);
+            }
+        }
+        return true;
+    }
 
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public Boolean delete(String id) {
-		String[] ids = String.valueOf(id).split(",");
-		for (String tt:ids) {
-			CircleCardInfo tmp =  circleCardInfoMapper.selectById(Long.parseLong(tt));
-			if(tmp != null){
-				tmp.setDeleteFlag(1l);
-				tmp.setGmtUpdate(new Date());
-				circleCardInfoMapper.updateById(tmp);
-			}
-		}
-		return true;
-	}
+    @Override
+    public Boolean update(CircleCardInfo circleCardInfo) throws ServiceException {
+        Date now = new Date();
+        circleCardInfo.setGmtUpdate(now);
+        return circleCardInfoMapper.updateById(circleCardInfo) > 0;
+    }
 
-	@Override
-	public Boolean update(CircleCardInfo circleCardInfo) throws ServiceException {
-		Date now = new Date();
-		circleCardInfo.setGmtUpdate(now);
-		return circleCardInfoMapper.updateById(circleCardInfo)>0;
-	}
+    @Override
+    public CircleCardInfo get(Long id) throws ServiceException {
+        return circleCardInfoMapper.selectById(id);
+    }
 
-	@Override
-	public CircleCardInfo get(Long id) throws ServiceException {
-		return circleCardInfoMapper.selectById(id);
-	}
-	
-	@Override
-	public String export(Long circleId,Long cardId,Long commonId,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
-		Wrapper<CircleCardInfo> wrapper = new EntityWrapper<CircleCardInfo>();
-									if (!StringUtils.isEmpty(circleId)) {
-					wrapper.eq("circle_id", circleId);
-				}
-												if (!StringUtils.isEmpty(cardId)) {
-					wrapper.eq("card_id", cardId);
-				}
-												if (!StringUtils.isEmpty(commonId)) {
-					wrapper.eq("common_id", commonId);
-				}
-												if (!StringUtils.isEmpty(gmtCreate)) {
-					wrapper.eq("gmt_create", gmtCreate);
-				}
-												if (!StringUtils.isEmpty(gmtUpdate)) {
-					wrapper.eq("gmt_update", gmtUpdate);
-				}
-												if (!StringUtils.isEmpty(deleteFlag)) {
-					wrapper.eq("delete_flag", deleteFlag);
-				}
-							List<CircleCardInfo> list = circleCardInfoMapper.selectList(wrapper);
-		ExcelUtil<CircleCardInfo> util = new ExcelUtil<CircleCardInfo>(CircleCardInfo.class);
-		return util.exportExcel(list, "操作日志");
-	}
+    @Override
+    public String export(Long circleId, Long cardId, Long commonId, Date gmtCreate, Date gmtUpdate, Long deleteFlag, Integer page, Integer limit) throws ServiceException {
+        Wrapper<CircleCardInfo> wrapper = new EntityWrapper<CircleCardInfo>();
+        if (!StringUtils.isEmpty(circleId)) {
+            wrapper.eq("circle_id", circleId);
+        }
+        if (!StringUtils.isEmpty(cardId)) {
+            wrapper.eq("card_id", cardId);
+        }
+        if (!StringUtils.isEmpty(commonId)) {
+            wrapper.eq("common_id", commonId);
+        }
+        if (!StringUtils.isEmpty(gmtCreate)) {
+            wrapper.eq("gmt_create", gmtCreate);
+        }
+        if (!StringUtils.isEmpty(gmtUpdate)) {
+            wrapper.eq("gmt_update", gmtUpdate);
+        }
+        if (!StringUtils.isEmpty(deleteFlag)) {
+            wrapper.eq("delete_flag", deleteFlag);
+        }
+        List<CircleCardInfo> list = circleCardInfoMapper.selectList(wrapper);
+        ExcelUtil<CircleCardInfo> util = new ExcelUtil<CircleCardInfo>(CircleCardInfo.class);
+        return util.exportExcel(list, "操作日志");
+    }
 }

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

@@ -20,194 +20,193 @@ import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 圈子管理Service业务层处理
- * 
+ *
  * @author jlb
  * @date 2023-04-10
  */
 @Service
-public class CircleManagementInfoServiceImpl implements ICircleManagementInfoService{
-	@Autowired
-	private CircleManagementInfoMapper circleManagementInfoMapper;
-	@Autowired
-	private CircleCardInfoMapper circleCardInfoMapper;
-	@Autowired
-	private CardManagementInfoMapper cardManagementInfoMapper;
-	@Autowired
-	private CommonUserInfoMapper commonUserInfoMapper;
-	@Autowired
-	private CardHolderInfoMapper cardHolderInfoMapper;
-	@Autowired
-	private CardExchangeInfoMapper cardExchangeInfoMapper;
-	
-	@Override
-	public Boolean add(CircleManagementInfo circleManagementInfo) throws ServiceException {
-		Date now = new Date();
-		circleManagementInfo.setGmtCreate(now);
-		circleManagementInfo.setGmtUpdate(now);
-		//添加圈子状态默认未审核
-		circleManagementInfo.setStatus(0l);
-		return circleManagementInfoMapper.insert(circleManagementInfo)>0;
-	}
+public class CircleManagementInfoServiceImpl implements ICircleManagementInfoService {
+    @Autowired
+    private CircleManagementInfoMapper circleManagementInfoMapper;
+    @Autowired
+    private CircleCardInfoMapper circleCardInfoMapper;
+    @Autowired
+    private CardManagementInfoMapper cardManagementInfoMapper;
+    @Autowired
+    private CommonUserInfoMapper commonUserInfoMapper;
+    @Autowired
+    private CardHolderInfoMapper cardHolderInfoMapper;
+    @Autowired
+    private CardExchangeInfoMapper cardExchangeInfoMapper;
 
-	@Override
-	public Page<CircleManagementInfo> list(Long commonId,String circleName,String circleLabel,Long status,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
-		Wrapper<CircleManagementInfo> wrapper = new EntityWrapper<CircleManagementInfo>();
-												if (!StringUtils.isEmpty(circleName)) {
-					wrapper.eq("circle_name", circleName);
-				}
-												if (!StringUtils.isEmpty(circleLabel)) {
-					wrapper.eq("circle_label", circleLabel);
-				}
-												if (!StringUtils.isEmpty(status)) {
-					wrapper.eq("status", status);
-				}
-												if (!StringUtils.isEmpty(gmtCreate)) {
-					wrapper.eq("gmt_create", gmtCreate);
-				}
-												if (!StringUtils.isEmpty(gmtUpdate)) {
-					wrapper.eq("gmt_update", gmtUpdate);
-				}
-												if (!StringUtils.isEmpty(deleteFlag)) {
-					wrapper.eq("delete_flag", deleteFlag);
-				}
-							wrapper.eq("delete_flag", 0);
-		List<CircleManagementInfo> list = circleManagementInfoMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
-		if(!CollectionUtils.isEmpty(list)){
-			for (CircleManagementInfo circleManagementInfo:list){
-				List<CircleCardInfo> circleCardInfoList=circleCardInfoMapper.selectList(new EntityWrapper<CircleCardInfo>()
-						.eq("circle_id",circleManagementInfo.getId())
-						.eq("delete_flag",0));
-				circleManagementInfo.setCardNum(circleCardInfoList.size());
-				CircleCardInfo circleCardInfo=new CircleCardInfo();
-				circleCardInfo.setCommonId(commonId);
-				circleCardInfo.setCircleId(circleManagementInfo.getId());
-				circleCardInfo.setDeleteFlag(0l);
-				CircleCardInfo circleCardInfo1=circleCardInfoMapper.selectOne(circleCardInfo);
-				if (circleCardInfo1!=null){
-					circleManagementInfo.setAddedFlag(1l);
-				}
-				else {
-					circleManagementInfo.setAddedFlag(0l);
-				}
-			}
-		}
-		Collections.sort(list, new Comparator<CircleManagementInfo>() {
-			@Override
-			public int compare(CircleManagementInfo o1, CircleManagementInfo o2) {
-				return o1.getAddedFlag()>o2.getAddedFlag()?-1:(o1.getAddedFlag()==o2.getAddedFlag())?0:1;
-			}
-		});
-		Integer count = circleManagementInfoMapper.selectCount(wrapper);
-		return new Page<CircleManagementInfo>(list, page, limit, count);
-	}
+    @Override
+    public Boolean add(CircleManagementInfo circleManagementInfo) throws ServiceException {
+        Date now = new Date();
+        circleManagementInfo.setGmtCreate(now);
+        circleManagementInfo.setGmtUpdate(now);
+        //添加圈子状态默认未审核
+        circleManagementInfo.setStatus(0l);
+        return circleManagementInfoMapper.insert(circleManagementInfo) > 0;
+    }
 
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public Boolean delete(String id) {
-		String[] ids = String.valueOf(id).split(",");
-		for (String tt:ids) {
-			CircleManagementInfo tmp =  circleManagementInfoMapper.selectById(Long.parseLong(tt));
-			if(tmp != null){
-				tmp.setDeleteFlag(1l);
-				tmp.setGmtUpdate(new Date());
-				circleManagementInfoMapper.updateById(tmp);
-			}
-		}
-		return true;
-	}
+    @Override
+    public Page<CircleManagementInfo> list(Long commonId, String circleName, String circleLabel, Long status, Date gmtCreate, Date gmtUpdate, Long deleteFlag, Integer page, Integer limit) throws ServiceException {
+        Wrapper<CircleManagementInfo> wrapper = new EntityWrapper<CircleManagementInfo>();
+        if (!StringUtils.isEmpty(circleName)) {
+            wrapper.eq("circle_name", circleName);
+        }
+        if (!StringUtils.isEmpty(circleLabel)) {
+            wrapper.eq("circle_label", circleLabel);
+        }
+        if (!StringUtils.isEmpty(status)) {
+            wrapper.eq("status", status);
+        }
+        if (!StringUtils.isEmpty(gmtCreate)) {
+            wrapper.eq("gmt_create", gmtCreate);
+        }
+        if (!StringUtils.isEmpty(gmtUpdate)) {
+            wrapper.eq("gmt_update", gmtUpdate);
+        }
+        if (!StringUtils.isEmpty(deleteFlag)) {
+            wrapper.eq("delete_flag", deleteFlag);
+        }
+        wrapper.eq("delete_flag", 0);
+        List<CircleManagementInfo> list = circleManagementInfoMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
+        if (!CollectionUtils.isEmpty(list)) {
+            for (CircleManagementInfo circleManagementInfo : list) {
+                List<CircleCardInfo> circleCardInfoList = circleCardInfoMapper.selectList(new EntityWrapper<CircleCardInfo>()
+                        .eq("circle_id", circleManagementInfo.getId())
+                        .eq("delete_flag", 0));
+                circleManagementInfo.setCardNum(circleCardInfoList.size());
+                CircleCardInfo circleCardInfo = new CircleCardInfo();
+                circleCardInfo.setCommonId(commonId);
+                circleCardInfo.setCircleId(circleManagementInfo.getId());
+                circleCardInfo.setDeleteFlag(0l);
+                CircleCardInfo circleCardInfo1 = circleCardInfoMapper.selectOne(circleCardInfo);
+                if (circleCardInfo1 != null) {
+                    circleManagementInfo.setAddedFlag(1l);
+                } else {
+                    circleManagementInfo.setAddedFlag(0l);
+                }
+            }
+        }
+        Collections.sort(list, new Comparator<CircleManagementInfo>() {
+            @Override
+            public int compare(CircleManagementInfo o1, CircleManagementInfo o2) {
+                return o1.getAddedFlag() > o2.getAddedFlag() ? -1 : (o1.getAddedFlag() == o2.getAddedFlag()) ? 0 : 1;
+            }
+        });
+        Integer count = circleManagementInfoMapper.selectCount(wrapper);
+        return new Page<CircleManagementInfo>(list, page, limit, count);
+    }
 
-	@Override
-	public Boolean update(CircleManagementInfo circleManagementInfo) throws ServiceException {
-		Date now = new Date();
-		circleManagementInfo.setGmtUpdate(now);
-		return circleManagementInfoMapper.updateById(circleManagementInfo)>0;
-	}
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean delete(String id) {
+        String[] ids = String.valueOf(id).split(",");
+        for (String tt : ids) {
+            CircleManagementInfo tmp = circleManagementInfoMapper.selectById(Long.parseLong(tt));
+            if (tmp != null) {
+                tmp.setDeleteFlag(1l);
+                tmp.setGmtUpdate(new Date());
+                circleManagementInfoMapper.updateById(tmp);
+            }
+        }
+        return true;
+    }
 
-	@Override
-	public CircleManagementInfo get(Long id,Long commonId) throws ServiceException {
-		CircleManagementInfo circleManagementInfo=circleManagementInfoMapper.selectById(id);
-		//查询圈子名片关系表
-		List<CircleCardInfo> circleCardInfoList=circleCardInfoMapper.selectList(new EntityWrapper<CircleCardInfo>()
-				.eq("circle_id",id)
-				.eq("delete_flag",0));
-		List<CardManagementInfo> cardManagementInfoList=new ArrayList<>();
-		for(CircleCardInfo circleCardInfo:circleCardInfoList){
-			//查询名片信息
-			CardManagementInfo cardManagementInfo=cardManagementInfoMapper.selectById(circleCardInfo.getCardId());
-			if (cardManagementInfo!=null){
-				//我的名片
-				if (cardManagementInfo.getCommonId().equals(commonId)){
-					cardManagementInfo.setNotDisplay(1l);
-				}
-				List<CardHolderInfo> cardHolderInfoList=cardHolderInfoMapper.selectList(new EntityWrapper<CardHolderInfo>()
-					.eq("delete_flag",0)
-					.eq("common_id",commonId)
-					.eq("card_id",cardManagementInfo.getId()));
-				//我拥有的名片
-				if (cardHolderInfoList.size()>0){
-					cardManagementInfo.setNotDisplay(1l);
-					cardManagementInfo.setExchangeFlag(1l);
-				}
-				List<CardExchangeInfo> cardExchangeInfoList=cardExchangeInfoMapper.selectList(new EntityWrapper<CardExchangeInfo>()
-						.eq("delete_flag",0)
-						.eq("send_id",commonId)
-						.eq("receive_card_id",cardManagementInfo.getId()));
-				//发送过邀请的名片
-				if (cardHolderInfoList.size()>0){
-					for (CardExchangeInfo cardExchangeInfo:cardExchangeInfoList){
-						//已接收未处理或者拉黑的
-						if ("1".equals(cardExchangeInfo.getStatus())||"7".equals(cardExchangeInfo.getStatus())||"0".equals(cardExchangeInfo.getStatus())){
-							cardManagementInfo.setNotDisplay(1l);
-						}
-					}
-				}
-				//查看是否允许圈子成员查看主页
-				CommonUserInfo commonUserInfo=commonUserInfoMapper.selectById(cardManagementInfo.getCommonId());
-				if (commonUserInfo!=null){
-					cardManagementInfo.setLookPage(commonUserInfo.getLookPage());
-				}
-				cardManagementInfoList.add(cardManagementInfo);
-			}
-		}
-		circleManagementInfo.setCardManagementInfoList(cardManagementInfoList);
-		CircleCardInfo circleCardInfo=new CircleCardInfo();
-		circleCardInfo.setCommonId(commonId);
-		circleCardInfo.setCircleId(circleManagementInfo.getId());
-		circleCardInfo.setDeleteFlag(0l);
-		CircleCardInfo circleCardInfo1=circleCardInfoMapper.selectOne(circleCardInfo);
-		//我加入该圈子的名片
-		if (circleCardInfo1!=null){
-			circleManagementInfo.setCircleCardInfo(circleCardInfo1);
-		}
-		return circleManagementInfo;
-	}
-	
-	@Override
-	public String export(Long commonId,String circleName,String circleLabel,Long status,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
-		Wrapper<CircleManagementInfo> wrapper = new EntityWrapper<CircleManagementInfo>();
-														if (!StringUtils.isEmpty(commonId)) {
-					wrapper.eq("common_id", commonId);
-				}
-												if (!StringUtils.isEmpty(circleName)) {
-					wrapper.eq("circle_name", circleName);
-				}
-												if (!StringUtils.isEmpty(circleLabel)) {
-					wrapper.eq("circle_label", circleLabel);
-				}
-												if (!StringUtils.isEmpty(status)) {
-					wrapper.eq("status", status);
-				}
-												if (!StringUtils.isEmpty(gmtCreate)) {
-					wrapper.eq("gmt_create", gmtCreate);
-				}
-												if (!StringUtils.isEmpty(gmtUpdate)) {
-					wrapper.eq("gmt_update", gmtUpdate);
-				}
-												if (!StringUtils.isEmpty(deleteFlag)) {
-					wrapper.eq("delete_flag", deleteFlag);
-				}
-							List<CircleManagementInfo> list = circleManagementInfoMapper.selectList(wrapper);
-		ExcelUtil<CircleManagementInfo> util = new ExcelUtil<CircleManagementInfo>(CircleManagementInfo.class);
-		return util.exportExcel(list, "操作日志");
-	}
+    @Override
+    public Boolean update(CircleManagementInfo circleManagementInfo) throws ServiceException {
+        Date now = new Date();
+        circleManagementInfo.setGmtUpdate(now);
+        return circleManagementInfoMapper.updateById(circleManagementInfo) > 0;
+    }
+
+    @Override
+    public CircleManagementInfo get(Long id, Long commonId) throws ServiceException {
+        CircleManagementInfo circleManagementInfo = circleManagementInfoMapper.selectById(id);
+        //查询圈子名片关系表
+        List<CircleCardInfo> circleCardInfoList = circleCardInfoMapper.selectList(new EntityWrapper<CircleCardInfo>()
+                .eq("circle_id", id)
+                .eq("delete_flag", 0));
+        List<CardManagementInfo> cardManagementInfoList = new ArrayList<>();
+        for (CircleCardInfo circleCardInfo : circleCardInfoList) {
+            //查询名片信息
+            CardManagementInfo cardManagementInfo = cardManagementInfoMapper.selectById(circleCardInfo.getCardId());
+            if (cardManagementInfo != null) {
+                //我的名片
+                if (cardManagementInfo.getCommonId().equals(commonId)) {
+                    cardManagementInfo.setNotDisplay(1l);
+                }
+                List<CardHolderInfo> cardHolderInfoList = cardHolderInfoMapper.selectList(new EntityWrapper<CardHolderInfo>()
+                        .eq("delete_flag", 0)
+                        .eq("common_id", commonId)
+                        .eq("card_id", cardManagementInfo.getId()));
+                //我拥有的名片
+                if (cardHolderInfoList.size() > 0) {
+                    cardManagementInfo.setNotDisplay(1l);
+                    cardManagementInfo.setExchangeFlag(1l);
+                }
+                List<CardExchangeInfo> cardExchangeInfoList = cardExchangeInfoMapper.selectList(new EntityWrapper<CardExchangeInfo>()
+                        .eq("delete_flag", 0)
+                        .eq("send_id", commonId)
+                        .eq("receive_card_id", cardManagementInfo.getId()));
+                //发送过邀请的名片
+                if (cardHolderInfoList.size() > 0) {
+                    for (CardExchangeInfo cardExchangeInfo : cardExchangeInfoList) {
+                        //已接收未处理或者拉黑的
+                        if ("1".equals(cardExchangeInfo.getStatus()) || "7".equals(cardExchangeInfo.getStatus()) || "0".equals(cardExchangeInfo.getStatus())) {
+                            cardManagementInfo.setNotDisplay(1l);
+                        }
+                    }
+                }
+                //查看是否允许圈子成员查看主页
+                CommonUserInfo commonUserInfo = commonUserInfoMapper.selectById(cardManagementInfo.getCommonId());
+                if (commonUserInfo != null) {
+                    cardManagementInfo.setLookPage(commonUserInfo.getLookPage());
+                }
+                cardManagementInfoList.add(cardManagementInfo);
+            }
+        }
+        circleManagementInfo.setCardManagementInfoList(cardManagementInfoList);
+        CircleCardInfo circleCardInfo = new CircleCardInfo();
+        circleCardInfo.setCommonId(commonId);
+        circleCardInfo.setCircleId(circleManagementInfo.getId());
+        circleCardInfo.setDeleteFlag(0l);
+        CircleCardInfo circleCardInfo1 = circleCardInfoMapper.selectOne(circleCardInfo);
+        //我加入该圈子的名片
+        if (circleCardInfo1 != null) {
+            circleManagementInfo.setCircleCardInfo(circleCardInfo1);
+        }
+        return circleManagementInfo;
+    }
+
+    @Override
+    public String export(Long commonId, String circleName, String circleLabel, Long status, Date gmtCreate, Date gmtUpdate, Long deleteFlag, Integer page, Integer limit) throws ServiceException {
+        Wrapper<CircleManagementInfo> wrapper = new EntityWrapper<CircleManagementInfo>();
+        if (!StringUtils.isEmpty(commonId)) {
+            wrapper.eq("common_id", commonId);
+        }
+        if (!StringUtils.isEmpty(circleName)) {
+            wrapper.eq("circle_name", circleName);
+        }
+        if (!StringUtils.isEmpty(circleLabel)) {
+            wrapper.eq("circle_label", circleLabel);
+        }
+        if (!StringUtils.isEmpty(status)) {
+            wrapper.eq("status", status);
+        }
+        if (!StringUtils.isEmpty(gmtCreate)) {
+            wrapper.eq("gmt_create", gmtCreate);
+        }
+        if (!StringUtils.isEmpty(gmtUpdate)) {
+            wrapper.eq("gmt_update", gmtUpdate);
+        }
+        if (!StringUtils.isEmpty(deleteFlag)) {
+            wrapper.eq("delete_flag", deleteFlag);
+        }
+        List<CircleManagementInfo> list = circleManagementInfoMapper.selectList(wrapper);
+        ExcelUtil<CircleManagementInfo> util = new ExcelUtil<CircleManagementInfo>(CircleManagementInfo.class);
+        return util.exportExcel(list, "操作日志");
+    }
 }

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

@@ -15,135 +15,137 @@ import com.iotechn.unimall.data.mapper.CommonUserInfoMapper;
 import com.iotechn.unimall.data.domain.CommonUserInfo;
 import com.iotechn.unimall.admin.api.card.ICommonUserInfoService;
 import com.iotechn.unimall.data.model.Page;
+
 import java.util.Date;
+
 import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 用户管理Service业务层处理
- * 
+ *
  * @author jlb
  * @date 2023-04-10
  */
 @Service
-public class CommonUserInfoServiceImpl implements ICommonUserInfoService{
-	@Autowired
-	private CommonUserInfoMapper commonUserInfoMapper;
-	
-	@Override
-	public Boolean add(CommonUserInfo commonUserInfo) throws ServiceException {
-		Date now = new Date();
-		commonUserInfo.setGmtCreate(now);
-		commonUserInfo.setGmtUpdate(now);
-		return commonUserInfoMapper.insert(commonUserInfo)>0;
-	}
+public class CommonUserInfoServiceImpl implements ICommonUserInfoService {
+    @Autowired
+    private CommonUserInfoMapper commonUserInfoMapper;
+
+    @Override
+    public Boolean add(CommonUserInfo commonUserInfo) throws ServiceException {
+        Date now = new Date();
+        commonUserInfo.setGmtCreate(now);
+        commonUserInfo.setGmtUpdate(now);
+        return commonUserInfoMapper.insert(commonUserInfo) > 0;
+    }
+
+    @Override
+    public Page<CommonUserInfo> list(String nickname, String password, String phone, String realname, Long shareCard, Long lookPage, Long autoAccept, Long status, Date gmtCreate, Date gmtUpdate, Long deleteFlag, Integer page, Integer limit) throws ServiceException {
+        Wrapper<CommonUserInfo> wrapper = new EntityWrapper<CommonUserInfo>();
+        if (!StringUtils.isEmpty(nickname)) {
+            wrapper.eq("nickname", nickname);
+        }
+        if (!StringUtils.isEmpty(password)) {
+            wrapper.eq("password", password);
+        }
+        if (!StringUtils.isEmpty(phone)) {
+            wrapper.eq("phone", phone);
+        }
+        if (!StringUtils.isEmpty(realname)) {
+            wrapper.eq("realname", realname);
+        }
+        if (!StringUtils.isEmpty(shareCard)) {
+            wrapper.eq("share_card", shareCard);
+        }
+        if (!StringUtils.isEmpty(lookPage)) {
+            wrapper.eq("look_page", lookPage);
+        }
+        if (!StringUtils.isEmpty(autoAccept)) {
+            wrapper.eq("auto_accept", autoAccept);
+        }
+        if (!StringUtils.isEmpty(status)) {
+            wrapper.eq("status", status);
+        }
+        if (!StringUtils.isEmpty(gmtCreate)) {
+            wrapper.eq("gmt_create", gmtCreate);
+        }
+        if (!StringUtils.isEmpty(gmtUpdate)) {
+            wrapper.eq("gmt_update", gmtUpdate);
+        }
+        if (!StringUtils.isEmpty(deleteFlag)) {
+            wrapper.eq("delete_flag", deleteFlag);
+        }
+        wrapper.eq("delete_flag", 0);
+        List<CommonUserInfo> list = commonUserInfoMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
+        Integer count = commonUserInfoMapper.selectCount(wrapper);
+        return new Page<CommonUserInfo>(list, page, limit, count);
+    }
 
-	@Override
-	public Page<CommonUserInfo> list(String nickname,String password,String phone,String realname,Long shareCard,Long lookPage,Long autoAccept,Long status,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
-		Wrapper<CommonUserInfo> wrapper = new EntityWrapper<CommonUserInfo>();
-														if (!StringUtils.isEmpty(nickname)) {
-					wrapper.eq("nickname", nickname);
-				}
-												if (!StringUtils.isEmpty(password)) {
-					wrapper.eq("password", password);
-				}
-												if (!StringUtils.isEmpty(phone)) {
-					wrapper.eq("phone", phone);
-				}
-												if (!StringUtils.isEmpty(realname)) {
-					wrapper.eq("realname", realname);
-				}
-												if (!StringUtils.isEmpty(shareCard)) {
-					wrapper.eq("share_card", shareCard);
-				}
-												if (!StringUtils.isEmpty(lookPage)) {
-					wrapper.eq("look_page", lookPage);
-				}
-												if (!StringUtils.isEmpty(autoAccept)) {
-					wrapper.eq("auto_accept", autoAccept);
-				}
-												if (!StringUtils.isEmpty(status)) {
-					wrapper.eq("status", status);
-				}
-												if (!StringUtils.isEmpty(gmtCreate)) {
-					wrapper.eq("gmt_create", gmtCreate);
-				}
-												if (!StringUtils.isEmpty(gmtUpdate)) {
-					wrapper.eq("gmt_update", gmtUpdate);
-				}
-												if (!StringUtils.isEmpty(deleteFlag)) {
-					wrapper.eq("delete_flag", deleteFlag);
-				}
-							wrapper.eq("delete_flag", 0);
-		List<CommonUserInfo> list = commonUserInfoMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
-		Integer count = commonUserInfoMapper.selectCount(wrapper);
-		return new Page<CommonUserInfo>(list, page, limit, count);
-	}
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean delete(String id) {
+        String[] ids = String.valueOf(id).split(",");
+        for (String tt : ids) {
+            CommonUserInfo tmp = commonUserInfoMapper.selectById(Long.parseLong(tt));
+            if (tmp != null) {
+                tmp.setDeleteFlag(1L);
+                tmp.setGmtUpdate(new Date());
+                commonUserInfoMapper.updateById(tmp);
+            }
+        }
+        return true;
+    }
 
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public Boolean delete(String id) {
-		String[] ids = String.valueOf(id).split(",");
-		for (String tt:ids) {
-			CommonUserInfo tmp =  commonUserInfoMapper.selectById(Long.parseLong(tt));
-			if(tmp != null){
-				tmp.setDeleteFlag(1L);
-				tmp.setGmtUpdate(new Date());
-				commonUserInfoMapper.updateById(tmp);
-			}
-		}
-		return true;
-	}
+    @Override
+    public Boolean update(CommonUserInfo commonUserInfo) throws ServiceException {
+        Date now = new Date();
+        commonUserInfo.setGmtUpdate(now);
+        return commonUserInfoMapper.updateById(commonUserInfo) > 0;
+    }
 
-	@Override
-	public Boolean update(CommonUserInfo commonUserInfo) throws ServiceException {
-		Date now = new Date();
-		commonUserInfo.setGmtUpdate(now);
-		return commonUserInfoMapper.updateById(commonUserInfo)>0;
-	}
+    @Override
+    public CommonUserInfo get(Long id) throws ServiceException {
+        return commonUserInfoMapper.selectById(id);
+    }
 
-	@Override
-	public CommonUserInfo get(Long id) throws ServiceException {
-		return commonUserInfoMapper.selectById(id);
-	}
-	
-	@Override
-	public String export(String nickname,String password,String phone,String realname,Long shareCard,Long lookPage,Long autoAccept,Long status,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
-		Wrapper<CommonUserInfo> wrapper = new EntityWrapper<CommonUserInfo>();
-														if (!StringUtils.isEmpty(nickname)) {
-					wrapper.eq("nickname", nickname);
-				}
-												if (!StringUtils.isEmpty(password)) {
-					wrapper.eq("password", password);
-				}
-												if (!StringUtils.isEmpty(phone)) {
-					wrapper.eq("phone", phone);
-				}
-												if (!StringUtils.isEmpty(realname)) {
-					wrapper.eq("realname", realname);
-				}
-												if (!StringUtils.isEmpty(shareCard)) {
-					wrapper.eq("share_card", shareCard);
-				}
-												if (!StringUtils.isEmpty(lookPage)) {
-					wrapper.eq("look_page", lookPage);
-				}
-												if (!StringUtils.isEmpty(autoAccept)) {
-					wrapper.eq("auto_accept", autoAccept);
-				}
-												if (!StringUtils.isEmpty(status)) {
-					wrapper.eq("status", status);
-				}
-												if (!StringUtils.isEmpty(gmtCreate)) {
-					wrapper.eq("gmt_create", gmtCreate);
-				}
-												if (!StringUtils.isEmpty(gmtUpdate)) {
-					wrapper.eq("gmt_update", gmtUpdate);
-				}
-												if (!StringUtils.isEmpty(deleteFlag)) {
-					wrapper.eq("delete_flag", deleteFlag);
-				}
-							List<CommonUserInfo> list = commonUserInfoMapper.selectList(wrapper);
-		ExcelUtil<CommonUserInfo> util = new ExcelUtil<CommonUserInfo>(CommonUserInfo.class);
-		return util.exportExcel(list, "操作日志");
-	}
+    @Override
+    public String export(String nickname, String password, String phone, String realname, Long shareCard, Long lookPage, Long autoAccept, Long status, Date gmtCreate, Date gmtUpdate, Long deleteFlag, Integer page, Integer limit) throws ServiceException {
+        Wrapper<CommonUserInfo> wrapper = new EntityWrapper<CommonUserInfo>();
+        if (!StringUtils.isEmpty(nickname)) {
+            wrapper.eq("nickname", nickname);
+        }
+        if (!StringUtils.isEmpty(password)) {
+            wrapper.eq("password", password);
+        }
+        if (!StringUtils.isEmpty(phone)) {
+            wrapper.eq("phone", phone);
+        }
+        if (!StringUtils.isEmpty(realname)) {
+            wrapper.eq("realname", realname);
+        }
+        if (!StringUtils.isEmpty(shareCard)) {
+            wrapper.eq("share_card", shareCard);
+        }
+        if (!StringUtils.isEmpty(lookPage)) {
+            wrapper.eq("look_page", lookPage);
+        }
+        if (!StringUtils.isEmpty(autoAccept)) {
+            wrapper.eq("auto_accept", autoAccept);
+        }
+        if (!StringUtils.isEmpty(status)) {
+            wrapper.eq("status", status);
+        }
+        if (!StringUtils.isEmpty(gmtCreate)) {
+            wrapper.eq("gmt_create", gmtCreate);
+        }
+        if (!StringUtils.isEmpty(gmtUpdate)) {
+            wrapper.eq("gmt_update", gmtUpdate);
+        }
+        if (!StringUtils.isEmpty(deleteFlag)) {
+            wrapper.eq("delete_flag", deleteFlag);
+        }
+        List<CommonUserInfo> list = commonUserInfoMapper.selectList(wrapper);
+        ExcelUtil<CommonUserInfo> util = new ExcelUtil<CommonUserInfo>(CommonUserInfo.class);
+        return util.exportExcel(list, "操作日志");
+    }
 }

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

@@ -15,141 +15,143 @@ import com.iotechn.unimall.data.mapper.PersonalHomepageInfoMapper;
 import com.iotechn.unimall.data.domain.PersonalHomepageInfo;
 import com.iotechn.unimall.admin.api.card.IPersonalHomepageInfoService;
 import com.iotechn.unimall.data.model.Page;
+
 import java.util.Date;
+
 import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 个人主页Service业务层处理
- * 
+ *
  * @author jlb
  * @date 2023-04-10
  */
 @Service
-public class PersonalHomepageInfoServiceImpl implements IPersonalHomepageInfoService{
-	@Autowired
-	private PersonalHomepageInfoMapper personalHomepageInfoMapper;
-	
-	@Override
-	public Boolean add(PersonalHomepageInfo personalHomepageInfo) throws ServiceException {
-		Date now = new Date();
-		personalHomepageInfo.setGmtCreate(now);
-		personalHomepageInfo.setGmtUpdate(now);
-		return personalHomepageInfoMapper.insert(personalHomepageInfo)>0;
-	}
+public class PersonalHomepageInfoServiceImpl implements IPersonalHomepageInfoService {
+    @Autowired
+    private PersonalHomepageInfoMapper personalHomepageInfoMapper;
+
+    @Override
+    public Boolean add(PersonalHomepageInfo personalHomepageInfo) throws ServiceException {
+        Date now = new Date();
+        personalHomepageInfo.setGmtCreate(now);
+        personalHomepageInfo.setGmtUpdate(now);
+        return personalHomepageInfoMapper.insert(personalHomepageInfo) > 0;
+    }
+
+    @Override
+    public Page<PersonalHomepageInfo> list(Long commonId, String companyName, String companyIntroduction, String scopeOfBusiness, String companyAddress, String phone, String portraiture, String postbox, String addressUrl, Date gmtCreate, Date gmtUpdate, Long deleteFlag, Integer page, Integer limit) throws ServiceException {
+        Wrapper<PersonalHomepageInfo> wrapper = new EntityWrapper<PersonalHomepageInfo>();
+        if (!StringUtils.isEmpty(commonId)) {
+            wrapper.eq("common_id", commonId);
+        }
+        if (!StringUtils.isEmpty(companyName)) {
+            wrapper.eq("company_name", companyName);
+        }
+        if (!StringUtils.isEmpty(companyIntroduction)) {
+            wrapper.eq("company_introduction", companyIntroduction);
+        }
+        if (!StringUtils.isEmpty(scopeOfBusiness)) {
+            wrapper.eq("scope_of_business", scopeOfBusiness);
+        }
+        if (!StringUtils.isEmpty(companyAddress)) {
+            wrapper.eq("company_address", companyAddress);
+        }
+        if (!StringUtils.isEmpty(phone)) {
+            wrapper.eq("phone", phone);
+        }
+        if (!StringUtils.isEmpty(portraiture)) {
+            wrapper.eq("portraiture", portraiture);
+        }
+        if (!StringUtils.isEmpty(postbox)) {
+            wrapper.eq("postbox", postbox);
+        }
+        if (!StringUtils.isEmpty(addressUrl)) {
+            wrapper.eq("address_url", addressUrl);
+        }
+        if (!StringUtils.isEmpty(gmtCreate)) {
+            wrapper.eq("gmt_create", gmtCreate);
+        }
+        if (!StringUtils.isEmpty(gmtUpdate)) {
+            wrapper.eq("gmt_update", gmtUpdate);
+        }
+        if (!StringUtils.isEmpty(deleteFlag)) {
+            wrapper.eq("delete_flag", deleteFlag);
+        }
+        wrapper.eq("delete_flag", 0);
+        List<PersonalHomepageInfo> list = personalHomepageInfoMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
+        Integer count = personalHomepageInfoMapper.selectCount(wrapper);
+        return new Page<PersonalHomepageInfo>(list, page, limit, count);
+    }
 
-	@Override
-	public Page<PersonalHomepageInfo> list(Long commonId,String companyName,String companyIntroduction,String scopeOfBusiness,String companyAddress,String phone,String portraiture,String postbox,String addressUrl,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
-		Wrapper<PersonalHomepageInfo> wrapper = new EntityWrapper<PersonalHomepageInfo>();
-														if (!StringUtils.isEmpty(commonId)) {
-					wrapper.eq("common_id", commonId);
-				}
-												if (!StringUtils.isEmpty(companyName)) {
-					wrapper.eq("company_name", companyName);
-				}
-												if (!StringUtils.isEmpty(companyIntroduction)) {
-					wrapper.eq("company_introduction", companyIntroduction);
-				}
-												if (!StringUtils.isEmpty(scopeOfBusiness)) {
-					wrapper.eq("scope_of_business", scopeOfBusiness);
-				}
-												if (!StringUtils.isEmpty(companyAddress)) {
-					wrapper.eq("company_address", companyAddress);
-				}
-												if (!StringUtils.isEmpty(phone)) {
-					wrapper.eq("phone", phone);
-				}
-												if (!StringUtils.isEmpty(portraiture)) {
-					wrapper.eq("portraiture", portraiture);
-				}
-												if (!StringUtils.isEmpty(postbox)) {
-					wrapper.eq("postbox", postbox);
-				}
-												if (!StringUtils.isEmpty(addressUrl)) {
-					wrapper.eq("address_url", addressUrl);
-				}
-												if (!StringUtils.isEmpty(gmtCreate)) {
-					wrapper.eq("gmt_create", gmtCreate);
-				}
-												if (!StringUtils.isEmpty(gmtUpdate)) {
-					wrapper.eq("gmt_update", gmtUpdate);
-				}
-												if (!StringUtils.isEmpty(deleteFlag)) {
-					wrapper.eq("delete_flag", deleteFlag);
-				}
-							wrapper.eq("delete_flag", 0);
-		List<PersonalHomepageInfo> list = personalHomepageInfoMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
-		Integer count = personalHomepageInfoMapper.selectCount(wrapper);
-		return new Page<PersonalHomepageInfo>(list, page, limit, count);
-	}
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean delete(String id) {
+        String[] ids = String.valueOf(id).split(",");
+        for (String tt : ids) {
+            PersonalHomepageInfo tmp = personalHomepageInfoMapper.selectById(Long.parseLong(tt));
+            if (tmp != null) {
+                tmp.setDeleteFlag(1l);
+                tmp.setGmtUpdate(new Date());
+                personalHomepageInfoMapper.updateById(tmp);
+            }
+        }
+        return true;
+    }
 
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public Boolean delete(String id) {
-		String[] ids = String.valueOf(id).split(",");
-		for (String tt:ids) {
-			PersonalHomepageInfo tmp =  personalHomepageInfoMapper.selectById(Long.parseLong(tt));
-			if(tmp != null){
-				tmp.setDeleteFlag(1l);
-				tmp.setGmtUpdate(new Date());
-				personalHomepageInfoMapper.updateById(tmp);
-			}
-		}
-		return true;
-	}
+    @Override
+    public Boolean update(PersonalHomepageInfo personalHomepageInfo) throws ServiceException {
+        Date now = new Date();
+        personalHomepageInfo.setGmtUpdate(now);
+        return personalHomepageInfoMapper.updateById(personalHomepageInfo) > 0;
+    }
 
-	@Override
-	public Boolean update(PersonalHomepageInfo personalHomepageInfo) throws ServiceException {
-		Date now = new Date();
-		personalHomepageInfo.setGmtUpdate(now);
-		return personalHomepageInfoMapper.updateById(personalHomepageInfo)>0;
-	}
+    @Override
+    public PersonalHomepageInfo get(Long id) throws ServiceException {
+        return personalHomepageInfoMapper.selectById(id);
+    }
 
-	@Override
-	public PersonalHomepageInfo get(Long id) throws ServiceException {
-		return personalHomepageInfoMapper.selectById(id);
-	}
-	
-	@Override
-	public String export(Long commonId,String companyName,String companyIntroduction,String scopeOfBusiness,String companyAddress,String phone,String portraiture,String postbox,String addressUrl,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
-		Wrapper<PersonalHomepageInfo> wrapper = new EntityWrapper<PersonalHomepageInfo>();
-														if (!StringUtils.isEmpty(commonId)) {
-					wrapper.eq("common_id", commonId);
-				}
-												if (!StringUtils.isEmpty(companyName)) {
-					wrapper.eq("company_name", companyName);
-				}
-												if (!StringUtils.isEmpty(companyIntroduction)) {
-					wrapper.eq("company_introduction", companyIntroduction);
-				}
-												if (!StringUtils.isEmpty(scopeOfBusiness)) {
-					wrapper.eq("scope_of_business", scopeOfBusiness);
-				}
-												if (!StringUtils.isEmpty(companyAddress)) {
-					wrapper.eq("company_address", companyAddress);
-				}
-												if (!StringUtils.isEmpty(phone)) {
-					wrapper.eq("phone", phone);
-				}
-												if (!StringUtils.isEmpty(portraiture)) {
-					wrapper.eq("portraiture", portraiture);
-				}
-												if (!StringUtils.isEmpty(postbox)) {
-					wrapper.eq("postbox", postbox);
-				}
-												if (!StringUtils.isEmpty(addressUrl)) {
-					wrapper.eq("address_url", addressUrl);
-				}
-												if (!StringUtils.isEmpty(gmtCreate)) {
-					wrapper.eq("gmt_create", gmtCreate);
-				}
-												if (!StringUtils.isEmpty(gmtUpdate)) {
-					wrapper.eq("gmt_update", gmtUpdate);
-				}
-												if (!StringUtils.isEmpty(deleteFlag)) {
-					wrapper.eq("delete_flag", deleteFlag);
-				}
-							List<PersonalHomepageInfo> list = personalHomepageInfoMapper.selectList(wrapper);
-		ExcelUtil<PersonalHomepageInfo> util = new ExcelUtil<PersonalHomepageInfo>(PersonalHomepageInfo.class);
-		return util.exportExcel(list, "操作日志");
-	}
+    @Override
+    public String export(Long commonId, String companyName, String companyIntroduction, String scopeOfBusiness, String companyAddress, String phone, String portraiture, String postbox, String addressUrl, Date gmtCreate, Date gmtUpdate, Long deleteFlag, Integer page, Integer limit) throws ServiceException {
+        Wrapper<PersonalHomepageInfo> wrapper = new EntityWrapper<PersonalHomepageInfo>();
+        if (!StringUtils.isEmpty(commonId)) {
+            wrapper.eq("common_id", commonId);
+        }
+        if (!StringUtils.isEmpty(companyName)) {
+            wrapper.eq("company_name", companyName);
+        }
+        if (!StringUtils.isEmpty(companyIntroduction)) {
+            wrapper.eq("company_introduction", companyIntroduction);
+        }
+        if (!StringUtils.isEmpty(scopeOfBusiness)) {
+            wrapper.eq("scope_of_business", scopeOfBusiness);
+        }
+        if (!StringUtils.isEmpty(companyAddress)) {
+            wrapper.eq("company_address", companyAddress);
+        }
+        if (!StringUtils.isEmpty(phone)) {
+            wrapper.eq("phone", phone);
+        }
+        if (!StringUtils.isEmpty(portraiture)) {
+            wrapper.eq("portraiture", portraiture);
+        }
+        if (!StringUtils.isEmpty(postbox)) {
+            wrapper.eq("postbox", postbox);
+        }
+        if (!StringUtils.isEmpty(addressUrl)) {
+            wrapper.eq("address_url", addressUrl);
+        }
+        if (!StringUtils.isEmpty(gmtCreate)) {
+            wrapper.eq("gmt_create", gmtCreate);
+        }
+        if (!StringUtils.isEmpty(gmtUpdate)) {
+            wrapper.eq("gmt_update", gmtUpdate);
+        }
+        if (!StringUtils.isEmpty(deleteFlag)) {
+            wrapper.eq("delete_flag", deleteFlag);
+        }
+        List<PersonalHomepageInfo> list = personalHomepageInfoMapper.selectList(wrapper);
+        ExcelUtil<PersonalHomepageInfo> util = new ExcelUtil<PersonalHomepageInfo>(PersonalHomepageInfo.class);
+        return util.exportExcel(list, "操作日志");
+    }
 }

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

@@ -15,105 +15,107 @@ import com.iotechn.unimall.data.mapper.SearchRecordsInfoMapper;
 import com.iotechn.unimall.data.domain.SearchRecordsInfo;
 import com.iotechn.unimall.admin.api.card.ISearchRecordsInfoService;
 import com.iotechn.unimall.data.model.Page;
+
 import java.util.Date;
+
 import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 搜索记录Service业务层处理
- * 
+ *
  * @author searchRecordsInfo
  * @date 2023-04-10
  */
 @Service
-public class SearchRecordsInfoServiceImpl implements ISearchRecordsInfoService{
-	@Autowired
-	private SearchRecordsInfoMapper searchRecordsInfoMapper;
-	
-	@Override
-	public Boolean add(SearchRecordsInfo searchRecordsInfo) throws ServiceException {
-		Date now = new Date();
-		searchRecordsInfo.setGmtCreate(now);
-		searchRecordsInfo.setGmtUpdate(now);
-		return searchRecordsInfoMapper.insert(searchRecordsInfo)>0;
-	}
+public class SearchRecordsInfoServiceImpl implements ISearchRecordsInfoService {
+    @Autowired
+    private SearchRecordsInfoMapper searchRecordsInfoMapper;
+
+    @Override
+    public Boolean add(SearchRecordsInfo searchRecordsInfo) throws ServiceException {
+        Date now = new Date();
+        searchRecordsInfo.setGmtCreate(now);
+        searchRecordsInfo.setGmtUpdate(now);
+        return searchRecordsInfoMapper.insert(searchRecordsInfo) > 0;
+    }
+
+    @Override
+    public Page<SearchRecordsInfo> list(Long commonId, String searchContent, String functionType, Date gmtCreate, Date gmtUpdate, Long deleteFlag, Integer page, Integer limit) throws ServiceException {
+        Wrapper<SearchRecordsInfo> wrapper = new EntityWrapper<SearchRecordsInfo>();
+        if (!StringUtils.isEmpty(commonId)) {
+            wrapper.eq("common_id", commonId);
+        }
+        if (!StringUtils.isEmpty(searchContent)) {
+            wrapper.eq("search_content", searchContent);
+        }
+        if (!StringUtils.isEmpty(functionType)) {
+            wrapper.eq("function_type", functionType);
+        }
+        if (!StringUtils.isEmpty(gmtCreate)) {
+            wrapper.eq("gmt_create", gmtCreate);
+        }
+        if (!StringUtils.isEmpty(gmtUpdate)) {
+            wrapper.eq("gmt_update", gmtUpdate);
+        }
+        if (!StringUtils.isEmpty(deleteFlag)) {
+            wrapper.eq("delete_flag", deleteFlag);
+        }
+        wrapper.eq("delete_flag", 0);
+        List<SearchRecordsInfo> list = searchRecordsInfoMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
+        Integer count = searchRecordsInfoMapper.selectCount(wrapper);
+        return new Page<SearchRecordsInfo>(list, page, limit, count);
+    }
 
-	@Override
-	public Page<SearchRecordsInfo> list(Long commonId,String searchContent,String functionType,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
-		Wrapper<SearchRecordsInfo> wrapper = new EntityWrapper<SearchRecordsInfo>();
-														if (!StringUtils.isEmpty(commonId)) {
-					wrapper.eq("common_id", commonId);
-				}
-												if (!StringUtils.isEmpty(searchContent)) {
-					wrapper.eq("search_content", searchContent);
-				}
-												if (!StringUtils.isEmpty(functionType)) {
-					wrapper.eq("function_type", functionType);
-				}
-												if (!StringUtils.isEmpty(gmtCreate)) {
-					wrapper.eq("gmt_create", gmtCreate);
-				}
-												if (!StringUtils.isEmpty(gmtUpdate)) {
-					wrapper.eq("gmt_update", gmtUpdate);
-				}
-												if (!StringUtils.isEmpty(deleteFlag)) {
-					wrapper.eq("delete_flag", deleteFlag);
-				}
-							wrapper.eq("delete_flag", 0);
-		List<SearchRecordsInfo> list = searchRecordsInfoMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
-		Integer count = searchRecordsInfoMapper.selectCount(wrapper);
-		return new Page<SearchRecordsInfo>(list, page, limit, count);
-	}
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean delete(String id) {
+        String[] ids = String.valueOf(id).split(",");
+        for (String tt : ids) {
+            SearchRecordsInfo tmp = searchRecordsInfoMapper.selectById(Long.parseLong(tt));
+            if (tmp != null) {
+                tmp.setDeleteFlag(1l);
+                tmp.setGmtUpdate(new Date());
+                searchRecordsInfoMapper.updateById(tmp);
+            }
+        }
+        return true;
+    }
 
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public Boolean delete(String id) {
-		String[] ids = String.valueOf(id).split(",");
-		for (String tt:ids) {
-			SearchRecordsInfo tmp =  searchRecordsInfoMapper.selectById(Long.parseLong(tt));
-			if(tmp != null){
-				tmp.setDeleteFlag(1l);
-				tmp.setGmtUpdate(new Date());
-				searchRecordsInfoMapper.updateById(tmp);
-			}
-		}
-		return true;
-	}
+    @Override
+    public Boolean update(SearchRecordsInfo searchRecordsInfo) throws ServiceException {
+        Date now = new Date();
+        searchRecordsInfo.setGmtUpdate(now);
+        return searchRecordsInfoMapper.updateById(searchRecordsInfo) > 0;
+    }
 
-	@Override
-	public Boolean update(SearchRecordsInfo searchRecordsInfo) throws ServiceException {
-		Date now = new Date();
-		searchRecordsInfo.setGmtUpdate(now);
-		return searchRecordsInfoMapper.updateById(searchRecordsInfo)>0;
-	}
+    @Override
+    public SearchRecordsInfo get(Long id) throws ServiceException {
+        return searchRecordsInfoMapper.selectById(id);
+    }
 
-	@Override
-	public SearchRecordsInfo get(Long id) throws ServiceException {
-		return searchRecordsInfoMapper.selectById(id);
-	}
-	
-	@Override
-	public String export(Long commonId,String searchContent,String functionType,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
-		Wrapper<SearchRecordsInfo> wrapper = new EntityWrapper<SearchRecordsInfo>();
-														if (!StringUtils.isEmpty(commonId)) {
-					wrapper.eq("common_id", commonId);
-				}
-												if (!StringUtils.isEmpty(searchContent)) {
-					wrapper.eq("search_content", searchContent);
-				}
-												if (!StringUtils.isEmpty(functionType)) {
-					wrapper.eq("function_type", functionType);
-				}
-												if (!StringUtils.isEmpty(gmtCreate)) {
-					wrapper.eq("gmt_create", gmtCreate);
-				}
-												if (!StringUtils.isEmpty(gmtUpdate)) {
-					wrapper.eq("gmt_update", gmtUpdate);
-				}
-												if (!StringUtils.isEmpty(deleteFlag)) {
-					wrapper.eq("delete_flag", deleteFlag);
-				}
-							List<SearchRecordsInfo> list = searchRecordsInfoMapper.selectList(wrapper);
-		ExcelUtil<SearchRecordsInfo> util = new ExcelUtil<SearchRecordsInfo>(SearchRecordsInfo.class);
-		return util.exportExcel(list, "操作日志");
-	}
+    @Override
+    public String export(Long commonId, String searchContent, String functionType, Date gmtCreate, Date gmtUpdate, Long deleteFlag, Integer page, Integer limit) throws ServiceException {
+        Wrapper<SearchRecordsInfo> wrapper = new EntityWrapper<SearchRecordsInfo>();
+        if (!StringUtils.isEmpty(commonId)) {
+            wrapper.eq("common_id", commonId);
+        }
+        if (!StringUtils.isEmpty(searchContent)) {
+            wrapper.eq("search_content", searchContent);
+        }
+        if (!StringUtils.isEmpty(functionType)) {
+            wrapper.eq("function_type", functionType);
+        }
+        if (!StringUtils.isEmpty(gmtCreate)) {
+            wrapper.eq("gmt_create", gmtCreate);
+        }
+        if (!StringUtils.isEmpty(gmtUpdate)) {
+            wrapper.eq("gmt_update", gmtUpdate);
+        }
+        if (!StringUtils.isEmpty(deleteFlag)) {
+            wrapper.eq("delete_flag", deleteFlag);
+        }
+        List<SearchRecordsInfo> list = searchRecordsInfoMapper.selectList(wrapper);
+        ExcelUtil<SearchRecordsInfo> util = new ExcelUtil<SearchRecordsInfo>(SearchRecordsInfo.class);
+        return util.exportExcel(list, "操作日志");
+    }
 }