feat：优惠券活动领取显示

pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/act/ActCouponRecordVo.java

@@ -1,9 +1,22 @@
 package com.bsd.pjcloud.wallet.api.vo.act;
 
+import com.bsd.pjcloud.admin.api.vo.base.BaseUserDeptInterface;
 import com.bsd.pjcloud.wallet.api.entity.act.ActCouponRecordEntity;
 import lombok.Data;
 
 @Data
-public class ActCouponRecordVo extends ActCouponRecordEntity {
+public class ActCouponRecordVo extends ActCouponRecordEntity implements BaseUserDeptInterface {
+
+    private Long userId;
+
+    private String username;
+
+    private String userMobile;
+
+    private String userAvatar;
+
+    private Long userDeptId;
+
+    private String userDeptName;
 
 }

pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/act/ActCouponRecordServiceImpl.java

@@ -6,8 +6,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.bsd.pjcloud.admin.api.dto.UserInfo;
 import com.bsd.pjcloud.admin.api.entity.SysUser;
 import com.bsd.pjcloud.admin.api.feign.RemoteUserService;
+import com.bsd.pjcloud.admin.api.utils.DataUtil;
+import com.bsd.pjcloud.admin.api.vo.UserVO;
 import com.bsd.pjcloud.common.core.constant.enums.MerchantTypeEnum;
 import com.bsd.pjcloud.common.core.exception.ServiceException;
+import com.bsd.pjcloud.common.core.util.CollectionUtils;
+import com.bsd.pjcloud.common.core.util.R;
+import com.bsd.pjcloud.hard.api.vo.HardAuthVo;
 import com.bsd.pjcloud.wallet.api.constant.WalletBizEnum;
 import com.bsd.pjcloud.wallet.api.constant.act.ActCouponRecordStatusEnum;
 import com.bsd.pjcloud.wallet.api.constant.act.ActUserReceiveEnum;
@@ -31,6 +36,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDate;
+import java.util.ArrayList;
 import java.util.List;
 
 
@@ -55,7 +61,9 @@ public class ActCouponRecordServiceImpl extends ServiceImpl<ActCouponRecordMappe
      */
     @Override
     public Page<ActCouponRecordVo> pageList(Page page, ActCouponRecordDto dto) {
-        return baseMapper.pageList(page, dto);
+        Page<ActCouponRecordVo> pageList = baseMapper.pageList(page, dto);
+        disposePageList(pageList.getRecords());
+        return pageList;
     }
 
     /**
@@ -144,4 +152,15 @@ public class ActCouponRecordServiceImpl extends ServiceImpl<ActCouponRecordMappe
         return baseMapper.userTotal(userId, List.of(ActCouponRecordStatusEnum.UNUSED.getCode()));
     }
 
+    private void disposePageList(List<ActCouponRecordVo> list) {
+        // 用户
+        List<Long> userIds = list.stream().map(ActCouponRecordVo::getUserId).distinct().toList();
+        if (ObjectUtil.isNotEmpty(userIds)) {
+            R<List<UserVO>> userList = remoteUserService.getUserDeptByIds(new ArrayList<>(userIds));
+            if (ObjectUtil.isNotEmpty(userList.getData())) {
+                DataUtil.convertUserDeptList(list, CollectionUtils.convertMap(userList.getData(), UserVO::getUserId));
+            }
+        }
+    }
+
 }

pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/act/ActCouponMapper.xml

@@ -49,5 +49,6 @@
         <where>
             <include refid="whereA"/>
         </where>
+        order by a.create_time desc , a.id desc
     </select>
 </mapper>

pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/act/ActCouponRecordMapper.xml

@@ -57,6 +57,7 @@
         <where>
             <include refid="whereA"/>
         </where>
+        order by a.create_time desc , a.id desc
     </select>
 
     <select id="userTotal" resultType="java.lang.Long">