1

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

@@ -50,7 +50,7 @@ public interface ICircleManagementInfoService{
 	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 = "status", type = HttpParamType.COMMON, description = " 1已交换 2未交换") String 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;

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

@@ -78,12 +78,11 @@ public class CircleManagementInfoServiceImpl implements ICircleManagementInfoSer
                         .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) {
+                List<CircleCardInfo> circleCardInfoList1 = circleCardInfoMapper.selectList(new EntityWrapper<CircleCardInfo>()
+                        .eq("circle_id", circleManagementInfo.getId())
+                        .eq("common_id",commonId)
+                        .eq("delete_flag", 0));
+                if (circleCardInfoList1.size()>0){
                     circleManagementInfo.setAddedFlag(1l);
                 } else {
                     circleManagementInfo.setAddedFlag(0l);
@@ -134,11 +133,15 @@ public class CircleManagementInfoServiceImpl implements ICircleManagementInfoSer
         if (circleCardInfo1 != null) {
             circleManagementInfo.setCircleCardInfo(circleCardInfo1);
         }
+        List<CircleCardInfo> circleCardInfoList = circleCardInfoMapper.selectList(new EntityWrapper<CircleCardInfo>()
+                .eq("circle_id", circleManagementInfo.getId())
+                .eq("delete_flag", 0));
+        circleManagementInfo.setCardNum(circleCardInfoList.size());
         return circleManagementInfo;
     }
 
     @Override
-    public Page<CardManagementInfo> circleCardlist(Long commonId, Long id, Long status, Integer page, Integer limit) throws ServiceException {
+    public Page<CardManagementInfo> circleCardlist(Long commonId, Long id, String 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);

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

@@ -133,6 +133,12 @@ public class CardManagementInfo extends SuperDO {
     /** 业务范围 */
     @TableField(exist = false)
     private String scopeOfBusiness;
+    /** 状态 */
+    @TableField(exist = false)
+    private String status;
+    /** 接收人id */
+    @TableField(exist = false)
+    private Long receiveId;
 
     @Override
     public String toString() {

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

@@ -2,6 +2,7 @@ package com.iotechn.unimall.data.mapper;
 
 import com.iotechn.unimall.data.domain.CardManagementInfo;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -13,7 +14,6 @@ import java.util.List;
  */
 public interface CardManagementInfoMapper extends BaseMapper<CardManagementInfo>{
 
-    Integer getCardManagementCount(Long status, int i, Integer limit, Long commonId,Long id);
+    Integer getCardManagementCount(@Param("status") String status, @Param("offset") Integer offset, @Param("limit") Integer limit, @Param("commonId") Long commonId, @Param("id") Long id);
 
-    List<CardManagementInfo> getCardManagementPage(Long status, int i, Integer limit, Long commonId,Long id);
-}
+    List<CardManagementInfo> getCardManagementPage(@Param("status") String status, @Param("offset") Integer offset, @Param("limit") Integer limit, @Param("commonId") Long commonId, @Param("id") Long id);}

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

@@ -8,21 +8,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getCardManagementPage" resultType="com.iotechn.unimall.data.domain.CardManagementInfo">
         SELECT
         cmi.id as id,
+        cmi.common_id as receiveId,
         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
+        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.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.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,
@@ -32,9 +33,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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
+        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}
+        cci.circle_id = #{id}
         and cci.delete_flag=0
         <if test="status != null">
             <if test="status == 1">
@@ -58,9 +59,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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
+        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}
+        cci.circle_id = #{id}
         and cci.delete_flag=0
         <if test="status != null">
             <if test="status == 1">