查询用户账单

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysFinanceServiceImpl.java

@@ -129,7 +129,7 @@ public class SysFinanceServiceImpl implements SysFinanceService {
                 UserBankCard userBankCard = userBankCardDao.findById(userBill.getUserId());
                 if (userBankCard != null) {
                     userBillVo.setBankCardId(userBankCard.getCardId());
-                    userBillVo.setRealName(userBillVo.getRealName());
+                    userBillVo.setRealName(userBankCard.getName());
                 }
                 if (userBill.getState() == BillEnum.BillStateEnum.PAID.getCode()) {
                     //查询结款凭证
@@ -140,7 +140,7 @@ public class SysFinanceServiceImpl implements SysFinanceService {
                 }
                 userBillVoList.add(userBillVo);
             }
-            return Result.success(PageSearchResult.of(pageInfo, userBillList));
+            return Result.success(PageSearchResult.of(pageInfo, userBillVoList));
         } catch (Exception e) {
             logger.error("查询用户账单error:{}", e);
         }
@@ -172,14 +172,20 @@ public class SysFinanceServiceImpl implements SysFinanceService {
                 userOrderBillVo.setAmount(PriceUtil.convertPriceFenToYuan(distributionOrder.getAmount()));
                 userOrderBillVo.setRealAmount(PriceUtil.convertPriceFenToYuan(distributorProfit.getRealAmount()));
                 userOrderBillVo.setOrderType(distributionOrder.getType());
-                userOrderBillVo.setOrderTypeName( DistributionEnum.DistributionTypeEnum.getNameByCode(distributionOrder.getType()));
+                userOrderBillVo.setOrderTypeName(DistributionEnum.DistributionTypeEnum.getNameByCode(distributionOrder.getType()));
                 userOrderBillVo.setCreateTime(distributionOrder.getCreateTime());
                 userOrderBillVo.setState(distributionOrder.getState());
                 userOrderBillVo.setStateName(DistributionEnum.DistributionOrderStateEnum.getNameByCode(distributionOrder.getState()));
                 userOrderBillVo.setType(userAccountDetail.getType());
                 userOrderBillVo.setTypeName(BillEnum.AccountDetailTypeEnum.getNameByCode(userAccountDetail.getType()));
+                if (distributionOrder.getState() != DistributionEnum.DistributionOrderStateEnum.FINISH.getCode())  {
+                    userOrderBillVo.setWaitEnrtyAmount(PriceUtil.convertPriceFenToYuan(userAccountDetail.getAmount()));
+                } else {
+                    userOrderBillVo.setEnrtyAmount(PriceUtil.convertPriceFenToYuan(userAccountDetail.getAmount()));
+                }
+                userOrderBillVoList.add(userOrderBillVo);
             }
-            return Result.success();
+            return Result.success(PageSearchResult.of(pageInfo, userOrderBillVoList));
         } catch (Exception e) {
             logger.error("查询用户账单明细error:{}", e);
         }