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

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

@@ -42,6 +42,10 @@ public interface ICardHolderInfoService{
 
 	@HttpMethod(description = "查询", permissionName = "名片夹管理")
 	public CardHolderInfo get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id)throws ServiceException;
+
+	@HttpMethod(description = "查看是否添加", permissionName = "名片夹管理")
+	public CardHolderInfo getAdded(@HttpParam(name = "commonId", type = HttpParamType.COMMON, description = "个人id") Long commonId,
+								   @HttpParam(name = "cardId", type = HttpParamType.COMMON, description = "名片ID") String cardId)throws ServiceException;
 	
 	@HttpMethod(description = "导出excl表", permissionName = "名片夹管理")
 	public String export(

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

@@ -2,6 +2,8 @@ package com.iotechn.unimall.admin.api.card.impl;
 
 import java.util.List;
 
+import com.iotechn.unimall.core.exception.AppServiceException;
+import com.iotechn.unimall.core.exception.ExceptionDefinition;
 import com.iotechn.unimall.data.domain.*;
 import com.iotechn.unimall.data.mapper.CardExchangeInfoMapper;
 import com.iotechn.unimall.data.mapper.CardManagementInfoMapper;
@@ -115,6 +117,25 @@ public class CardHolderInfoServiceImpl implements ICardHolderInfoService {
         return cardHolderInfoMapper.selectById(id);
     }
 
+    @Override
+    public CardHolderInfo getAdded(Long commonId, String cardId) throws ServiceException {
+        CardHolderInfo CardHolderInfo1 = new CardHolderInfo();
+        CardHolderInfo1.setCommonId(commonId);
+        CardHolderInfo1.setCardId(cardId);
+        CardHolderInfo1.setDeleteFlag(0l);
+        CardHolderInfo cardHolderInfo = cardHolderInfoMapper.selectOne(CardHolderInfo1);
+        //查看名片夹是否存有该名片
+        if (cardHolderInfo!=null){
+            throw new AppServiceException(ExceptionDefinition.ALREADY_ADDED_ERROR);
+        }
+        CardManagementInfo cardManagementInfo=cardManagementInfoMapper.selectById(cardId);
+        //查询名片所属id
+        if (commonId.equals(cardManagementInfo.getCommonId())){
+            throw new AppServiceException(ExceptionDefinition.ADD_ONESELF_ERROR);
+        }
+        return null;
+    }
+
     @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>();

unimall-core/src/main/java/com/iotechn/unimall/core/exception/ExceptionDefinition.java

@@ -388,6 +388,10 @@ public class ExceptionDefinition {
             new ServiceExceptionDefinition(53018, "分类名称重复");
     public static final ServiceExceptionDefinition ACCEPT_CARD_ERROR =
             new ServiceExceptionDefinition(53019, "接受失败，对方名片已删除");
+    public static final ServiceExceptionDefinition ALREADY_ADDED_ERROR =
+            new ServiceExceptionDefinition(53020, "已添加过改名片");
+    public static final ServiceExceptionDefinition ADD_ONESELF_ERROR =
+            new ServiceExceptionDefinition(53021, "不可添加自己的名片");
 
 
 

unimall-data/src/main/resources/com/iotechn/unimall/data/mapper/CardHolderInfoMapper.xml

@@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             OR lower( chi.remark) like lower(CONCAT('%',#{searchContent},'%')))
         </if>
         <if test="classify != null">
-            chi.classify= #{classify}
+            and chi.classify= #{classify}
         </if>
         GROUP BY chi.id
         ORDER BY  chi.gmt_update DESC
@@ -66,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             OR lower( chi.remark) like lower(CONCAT('%',#{searchContent},'%')))
         </if>
         <if test="classify != null">
-            chi.classify= #{classify}
+            and chi.classify= #{classify}
         </if>
         GROUP BY chi.id) tt
     </select>