1

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

@@ -20,6 +20,7 @@ import com.iotechn.unimall.data.util.ExcelUtil;
 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.iotechn.unimall.core.exception.ServiceException;
@@ -84,6 +85,14 @@ public class CardExchangeInfoServiceImpl implements ICardExchangeInfoService {
         wrapper.eq("delete_flag", 0);
         Integer count = cardExchangeInfoMapper.getCardExchangeCount(status,(page - 1) * limit, limit, receiveId);
         List<CardExchangeInfo> list = cardExchangeInfoMapper.getCardExchangeInfoPage(status,(page - 1) * limit, limit, receiveId);
+        if (!CollectionUtils.isEmpty(list)){
+            for (CardExchangeInfo cardExchangeInfo:list){
+                CardManagementInfo cardManagementInfo = cardManagementInfoMapper.selectById(cardExchangeInfo.getSendCardId());
+                if (cardManagementInfo != null) {
+                    cardExchangeInfo.setCardManagementInfo(cardManagementInfo);
+                }
+            }
+        }
         return new Page<CardExchangeInfo>(list, page, limit, count);
     }
 

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

@@ -77,6 +77,8 @@ public class CardExchangeInfo extends SuperDO {
      */
     @TableField(exist = false)
     private String updateFlag;
+    @TableField(exist = false)
+    private CardManagementInfo cardManagementInfo;
 
     @Override
     public String toString() {