1

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

@@ -1,6 +1,7 @@
 package com.iotechn.unimall.admin.api.card;
 
 
+import com.iotechn.unimall.data.domain.CardManagementInfo;
 import com.iotechn.unimall.data.domain.CircleManagementInfo;
 import com.iotechn.unimall.core.annotation.HttpMethod;
 import com.iotechn.unimall.core.annotation.HttpOpenApi;
@@ -44,7 +45,16 @@ public interface ICircleManagementInfoService{
 	@HttpMethod(description = "查询",  permissionName = "圈子管理管理")
 	public CircleManagementInfo get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id,
 									@HttpParam(name = "commonId", type = HttpParamType.COMMON, description = "个人id") Long commonId)throws ServiceException;
-	
+
+	@HttpMethod(description = "圈子详情名片列表",  permissionName = "圈子管理管理")
+	public Page<CardManagementInfo> circleCardlist(
+			@HttpParam(name = "commonId", type = HttpParamType.COMMON, description = "个人id") Long commonId,
+			@HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id,
+			@HttpParam(name = "status", type = HttpParamType.COMMON, description = " 1已交换 2未交换") Long status,
+			@HttpParam(name = "page", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
+			@HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit)
+			throws ServiceException;
+
 	@HttpMethod(description = "导出excl表",  permissionName = "圈子管理管理")
 	public String export(
 								@HttpParam(name = "commonId", type = HttpParamType.COMMON, description = "个人id") Long commonId,

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

@@ -125,50 +125,6 @@ public class CircleManagementInfoServiceImpl implements ICircleManagementInfoSer
     @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());
@@ -181,6 +137,15 @@ public class CircleManagementInfoServiceImpl implements ICircleManagementInfoSer
         return circleManagementInfo;
     }
 
+    @Override
+    public Page<CardManagementInfo> circleCardlist(Long commonId, Long id, Long status, Integer page, Integer limit) throws ServiceException {
+        Wrapper<CardManagementInfo> wrapper = new EntityWrapper<CardManagementInfo>();
+        wrapper.eq("delete_flag", 0);
+        Integer count = cardManagementInfoMapper.getCardManagementCount(status,(page - 1) * limit, limit, commonId,id);
+        List<CardManagementInfo> list = cardManagementInfoMapper.getCardManagementPage(status,(page - 1) * limit, limit, commonId,id);
+        return new Page<CardManagementInfo>(list, page, limit, count);
+    }
+
     @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>();

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

@@ -130,9 +130,9 @@ public class CardManagementInfo extends SuperDO {
     /** 交换按钮不显示标识(1不显示) */
     @TableField(exist = false)
     private Long notDisplay;
-    /** 已交换标识 */
+    /** 业务范围 */
     @TableField(exist = false)
-    private Long exchangeFlag;
+    private String scopeOfBusiness;
 
     @Override
     public String toString() {

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

@@ -43,6 +43,16 @@ public class CertificateManagementInfo extends SuperDO {
     @TableField("certificate_image")
     private String certificateImage;
 
+    /** 身份证号 */
+    @Excel(name = "身份证号")
+    @TableField("person_no")
+    private String personNo;
+
+    /** 银行卡号 */
+    @Excel(name = "银行卡号")
+    @TableField("bank_no")
+    private String bankNo;
+
     /**  */
     @Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")
     @TableField("gmt_create")

unimall-data/src/main/java/com/iotechn/unimall/data/mapper/CardManagementInfoMapper.java

@@ -2,6 +2,9 @@ package com.iotechn.unimall.data.mapper;
 
 import com.iotechn.unimall.data.domain.CardManagementInfo;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+import java.util.List;
+
 /**
  * 名片管理Mapper接口
  * 
@@ -10,4 +13,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  */
 public interface CardManagementInfoMapper extends BaseMapper<CardManagementInfo>{
 
+    Integer getCardManagementCount(Long status, int i, Integer limit, Long commonId,Long id);
+
+    List<CardManagementInfo> getCardManagementPage(Long status, int i, Integer limit, Long commonId,Long id);
 }

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

@@ -20,6 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         card_exchange_info
         WHERE
         receive_id = #{receiveId}
+        and delete_flag=0
         <if test="status != null">
             <if test="status == 1">
                 AND status != 7
@@ -39,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         card_exchange_info
         WHERE
         receive_id = #{receiveId}
+        and delete_flag=0
         <if test="status != null">
             <if test="status == 1">
                 AND status != 7

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

@@ -3,7 +3,73 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.iotechn.unimall.data.mapper.CardManagementInfoMapper">
-    
 
 
+    <select id="getCardManagementPage" resultType="com.iotechn.unimall.data.domain.CardManagementInfo">
+        SELECT
+        cmi.id as id,
+        cmi.name AS name,
+        cmi.post AS post,
+        cmi.company_name as companyName,
+        phi.scope_of_business AS scopeOfBusiness,
+        cui.look_page AS lookPage,
+        case when (cmi.common_id={commonId})  then 1
+        when IFNULL((SELECT count(chi.id)
+        FROM card_holder_info chi
+        WHERE chi.delete_flag = '0'
+        AND chi.common_id ={commonId}
+        AND chi.card_id =cmi.id ),0) >0 then 1
+        when IFNULL((SELECT count(cei.id)
+        FROM card_exchange_info cei
+        WHERE cei.delete_flag = '0'
+        AND cei.send_id ={commonId}
+        AND (cei.status=1 or cei.status=0 or cei.status=7)
+        AND cei.receive_card_id =cmi.id ),0) >0 then 1  else 0 end as notDisplay,
+        cci.gmt_update AS gmtUpdate,
+        cci.gmt_create AS gmtCreate
+        FROM
+        circle_card_info cci
+        LEFT JOIN card_management_info cmi on cmi.id=cci.card_id and cmi.delete_flag=0
+        LEFT JOIN personal_homepage_info phi on phi.common_id=cmi.common_id and phi.delete_flag=0
+        LEFT JOIN common_user_info cui on cui.id=cmi.common_id and cui.delete_flag=0
+        LEFT JOIN card_holder_info ch on ch.common_id={commonId} and ch.card_id=cmi.id and ch.delete_flag=0
+        WHERE
+        cci.circle_id = {id}
+        and cci.delete_flag=0
+        <if test="status != null">
+            <if test="status == 1">
+                AND ch.id is not null
+            </if>
+            <if test="status == 2">
+                AND ch.id is null
+            </if>
+        </if>
+        GROUP BY cci.id
+        ORDER BY cci.gmt_update DESC
+        LIMIT #{offset}, #{limit}
+    </select>
+    <select id="getCardManagementCount" resultType="java.lang.Integer">
+        select
+        count(1)
+        from( SELECT
+        count(1)
+        FROM
+        circle_card_info cci
+        LEFT JOIN card_management_info cmi on cmi.id=cci.card_id and cmi.delete_flag=0
+        LEFT JOIN personal_homepage_info phi on phi.common_id=cmi.common_id and phi.delete_flag=0
+        LEFT JOIN common_user_info cui on cui.id=cmi.common_id and cui.delete_flag=0
+        LEFT JOIN card_holder_info ch on ch.common_id={commonId} and ch.card_id=cmi.id and ch.delete_flag=0
+        WHERE
+        cci.circle_id = {id}
+        and cci.delete_flag=0
+        <if test="status != null">
+            <if test="status == 1">
+                AND ch.id is not null
+            </if>
+            <if test="status == 2">
+                AND ch.id is null
+            </if>
+        </if>
+        GROUP BY cci.id ) tt
+    </select>
 </mapper>