10.17.1

nickchange

2023-10-17 a830a73fd10a21e3793c79a35be4e532de124c6f

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TFinanceController.java

@@ -318,7 +318,7 @@
                        temp.setAmount(rechargeRecordsVO.getAmount());
                    }
                    temp.setIncomeType(2);
                    temp.setState(rechargeRecordsVO.getState());
                    temp.setState(rechargeRecordsVO.getPayStatus());
                    incomeVOS.add(temp);
                }
            }
@@ -356,7 +356,10 @@
                        }
                        TAppUser tAppUser = appUserClient.queryById(competition.getAppUserId());
                        Competition competition1 = competitionClient.queryById(competition.getCompetitionId());
                        Store store = storeClient.getStoreById(competition1.getStoreId());
                        if (!competition1.getStoreId().equals("")){
                            String[] split = competition1.getStoreId().split(",");
                        }
                        Store store = storeClient.getStoreById(Integer.valueOf(competition1.getStoreId()));
                        IncomeVO temp = new IncomeVO();
                        temp.setId(competition.getId().intValue());
                        temp.setProvince(tAppUser.getProvince());
@@ -405,6 +408,7 @@
        }
        return incomeVOS;
    }

    /**
     * 获取收入管理列表
     */
@@ -534,7 +538,7 @@
                        }
                        TAppUser tAppUser = appUserClient.queryById(competition.getAppUserId());
                        Competition competition1 = competitionClient.queryById(competition.getCompetitionId());
                        Store store = storeClient.getStoreById(competition1.getStoreId());
                        Store store = storeClient.getStoreById(Integer.valueOf(competition1.getStoreId().split(",")[0]));
                        IncomeVO temp = new IncomeVO();
                        temp.setId(competition.getId().intValue());
                        temp.setProvince(tAppUser.getProvince());