feat:发票添加申请人

feat:添加微信小程序的用户入口

pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/recharge/WalletRechargeInvoiceVo.java

@@ -7,6 +7,11 @@ import lombok.Data;
 @Data
 public class WalletRechargeInvoiceVo extends WalletRechargeInvoiceEntity {
 
+    /**
+     * 申请人相关
+     */
+    private String applyUsername;
+
     private String totalPriceCnStr;
 
     private Boolean isCheckUser;

pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeInvoiceServiceImpl.java

@@ -19,6 +19,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.bsd.pjcloud.admin.api.dto.UserInfo;
 import com.bsd.pjcloud.admin.api.entity.SysDept;
+import com.bsd.pjcloud.admin.api.entity.SysUser;
 import com.bsd.pjcloud.admin.api.feign.RemoteDeptService;
 import com.bsd.pjcloud.admin.api.feign.RemoteFileService;
 import com.bsd.pjcloud.admin.api.feign.RemoteUserService;
@@ -567,5 +568,18 @@ public class WalletRechargeInvoiceServiceImpl extends ServiceImpl<WalletRecharge
                 }
             }
         }
+        // 申请人相关
+        List<Long> applyUserIds = list.stream().map(WalletRechargeInvoiceVo::getApplyUserId).distinct().filter(ObjectUtil::isNotEmpty).toList();
+        if (ObjectUtil.isNotEmpty(applyUserIds)) {
+            List<SysUser> userData = remoteUserService.getInnerUserById(applyUserIds).getData();
+            if (ObjectUtil.isNotEmpty(userData)) {
+                Map<Long, SysUser> userMap = CollectionUtils.convertMap(userData, SysUser::getUserId);
+                for (WalletRechargeInvoiceVo v : list) {
+                    SysUser target = userMap.get(v.getApplyUserId());
+                    if (ObjectUtil.isEmpty(target)) continue;
+                    v.setApplyUsername(target.getName());
+                }
+            }
+        }
     }
 }