玩湃
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
44323
2023-10-11 232d3efb20f87f9c60faeda7bae4bc96e5687bd3 
 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,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()));


                        IncomeVO temp = new IncomeVO();


                        temp.setId(competition.getId().intValue());


                        temp.setProvince(tAppUser.getProvince());


@@ -405,6 +405,7 @@


        }


        return incomeVOS;


    }




    /**


     * 获取收入管理列表


     */


@@ -534,7 +535,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());