1

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

@@ -43,7 +43,8 @@ public interface ICardManagementInfoService{
 		throws ServiceException;
 
 	@HttpMethod(description = "删除",  permissionName = "名片管理管理")
-	public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")String id)throws ServiceException;
+	public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")String id,
+						@HttpParam(name = "deleteCondition", type = HttpParamType.COMMON, description = "删除条件") String deleteCondition)throws ServiceException;
 
 	@HttpMethod(description = "修改",  permissionName = "名片管理管理")
 	public Boolean update(@NotNull @HttpParam(name = "cardManagementInfo", type = HttpParamType.COMMON, description = "名片管理") CardManagementInfo cardManagementInfo,

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

@@ -2,9 +2,12 @@ package com.iotechn.unimall.admin.api.card.impl;
 
 import java.util.List;
 
+import com.iotechn.unimall.data.domain.CardManagementInfo;
+import com.iotechn.unimall.data.mapper.CardManagementInfoMapper;
 import org.apache.ibatis.session.RowBounds;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -28,6 +31,8 @@ import org.springframework.transaction.annotation.Transactional;
 public class CardHolderInfoServiceImpl implements ICardHolderInfoService{
 	@Autowired
 	private CardHolderInfoMapper cardHolderInfoMapper;
+	@Autowired
+	private CardManagementInfoMapper cardManagementInfoMapper;
 	
 	@Override
 	public Boolean add(CardHolderInfo cardHolderInfo,Long adminId) throws ServiceException {
@@ -61,6 +66,14 @@ public class CardHolderInfoServiceImpl implements ICardHolderInfoService{
 				}
 							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);
+				}
+			}
+		}
 		Integer count = cardHolderInfoMapper.selectCount(wrapper);
 		return new Page<CardHolderInfo>(list, page, limit, count);
 	}

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

@@ -2,6 +2,10 @@ package com.iotechn.unimall.admin.api.card.impl;
 
 import java.util.List;
 
+import com.iotechn.unimall.data.domain.CardHolderInfo;
+import com.iotechn.unimall.data.domain.CircleCardInfo;
+import com.iotechn.unimall.data.mapper.CardHolderInfoMapper;
+import com.iotechn.unimall.data.mapper.CircleCardInfoMapper;
 import org.apache.ibatis.session.RowBounds;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -17,7 +21,6 @@ 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业务层处理
  * 
@@ -28,6 +31,10 @@ import org.springframework.transaction.annotation.Transactional;
 public class CardManagementInfoServiceImpl implements ICardManagementInfoService{
 	@Autowired
 	private CardManagementInfoMapper cardManagementInfoMapper;
+	@Autowired
+	private CircleCardInfoMapper circleCardInfoMapper;
+	@Autowired
+	private CardHolderInfoMapper cardHolderInfoMapper;
 	
 	@Override
 	public Boolean add(CardManagementInfo cardManagementInfo,Long adminId) throws ServiceException {
@@ -88,12 +95,26 @@ public class CardManagementInfoServiceImpl implements ICardManagementInfoService
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public Boolean delete(String id) {
+	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){
-				tmp.setDeleteFlag(1l);
+				//退出关联的圈子
+				List<CircleCardInfo> list=circleCardInfoMapper.selectList(new EntityWrapper<CircleCardInfo>().eq("card_id",tmp.getId()));
+				for(CircleCardInfo aa:list){
+					aa.setDeleteFlag(1l);
+					circleCardInfoMapper.updateById(aa);
+				}
+				//从所有拥有此名片用户列表删除
+				if ("1".equals(deleteCondition)){
+					List<CardHolderInfo> cardHolderInfoList=cardHolderInfoMapper.selectList(new EntityWrapper<CardHolderInfo>().eq("card_id",tmp.getId()));
+					for(CardHolderInfo aa:cardHolderInfoList){
+						aa.setDeleteFlag(1l);
+						cardHolderInfoMapper.updateById(aa);
+					}
+				}
+				tmp.setCommonId(null);
 				cardManagementInfoMapper.updateById(tmp);
 			}
 		}

unimall-app-api/src/main/java/com/iotechn/unimall/app/api/commonUser/CommonUserServiceImpl.java

@@ -86,6 +86,8 @@ public class CommonUserServiceImpl implements CommonUserService {
                 newUserDO.setGmtUpdate(now);
                 newUserDO.setGmtCreate(now);
                 commonUserInfoMapper.insert(newUserDO);
+                //更新数据库默认值
+                newUserDO = commonUserInfoMapper.selectById(newUserDO.getId());
             } else {
                 newUserDO = list.get(0);
             }

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

@@ -62,7 +62,8 @@ public class CardHolderInfo extends SuperDO {
     @Excel(name = "删除标识")
     @TableField("delete_flag")
     private Long deleteFlag;
-
+    @TableField(exist = false)
+    private CardManagementInfo cardManagementInfo;
 
     @Override
     public String toString() {

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

@@ -92,7 +92,11 @@ public class CardManagementInfo extends SuperDO {
     @Excel(name = "删除标识")
     @TableField("delete_flag")
     private Long deleteFlag;
-
+    /**
+     * 删除条件 1所有拥有此名片用户列表删除
+     */
+    @TableField(exist = false)
+    private String deleteCondition;
 
     @Override
     public String toString() {