From daefb00c15e24f21209c8e6487a4e7140669ecea Mon Sep 17 00:00:00 2001 From: khalil <842328916@qq.com> Date: Wed, 17 Sep 2025 14:44:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E7=90=86=E5=BA=9F=E5=BC=83=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/dto/ChannelDistributeSearchDto.java | 24 - .../admin/dto/TopLineRequestDto.java | 106 -- .../FlowDataBatchSearchDetailAdminDto.java | 159 -- .../FlowDataBatchSearchGrowAdminDto.java | 64 - .../gamepartner/GamePartnerOrderAdminDto.java | 76 - .../dto/withdraw/WithdrawUserAdminDto.java | 39 - .../withdraw/WithdrawUserLimitAdminDto.java | 22 - .../withdraw/WithdrawUserLimitExportDto.java | 68 - .../withdraw/WithdrawUserRecordAdminDto.java | 75 - .../com/accompany/admin/model/AdminDict.java | 55 - .../admin/model/AdminDictExample.java | 661 -------- .../accompany/admin/model/AdminDictKey.java | 23 - .../model/batch/FlowDataBatchSearch.java | 135 -- .../ActCallBattleItemSaveReqParams.java | 28 - .../params/LuckySeaItemSaveReqParams.java | 28 - .../admin/vo/OperationSmsRecordVo.java | 125 -- .../admin/vo/PhoneAuthApplyRecordExcelVo.java | 31 - .../admin/vo/UserCertifyRecordVo.java | 102 -- .../vo/apply/PhoneAuthApplyRecordAdminVo.java | 38 - .../vo/batch/FlowDataBatchSearchAdminVo.java | 23 - .../batch/FlowDataBatchSearchGrowAdminVo.java | 69 - .../ActCallBattleAdminRecordVo.java | 35 - .../ActCallBattleAdminRoundDetailVo.java | 29 - .../ActCallBattleAdminUserDrawRecord.java | 33 - .../ActCallBattlePlatformStatVo.java | 34 - .../GamePartnerOrderDayAdminVo.java | 52 - .../GamePartnerOrderDayDetailAdminVo.java | 77 - .../UserGamePartnerInfoAdminVo.java | 54 - .../vo/luckysea/LuckySeaActAdminRecordVo.java | 34 - .../LuckySeaActAdminRoundDetailVo.java | 29 - .../LuckySeaActAdminUserDrawRecord.java | 33 - .../luckysea/LuckySeaActPlatformStatVo.java | 40 - .../vo/luckysea/LuckySeaItemGroupAdminVo.java | 31 - .../vo/official/OfficialBrowseCountVo.java | 67 - .../vo/withdraw/WithdrawAccountAdminVo.java | 35 - .../admin/vo/withdraw/WithdrawBlockVo.java | 88 -- .../vo/withdraw/WithdrawConfigAdminVo.java | 77 - .../vo/withdraw/WithdrawRecordAdminVo.java | 49 - .../vo/withdraw/WithdrawUserAdminVo.java | 131 -- .../vo/withdraw/WithdrawUserLimitAdminVo.java | 98 -- .../withdraw/WithdrawUserRecordAdminVo.java | 22 - .../admin/vo/withdraw/WithdrawVo.java | 19 - .../admin/mapper/AdminDictMapper.java | 32 - .../admin/mapper/LuckySeaActAdminMapper.java | 66 - .../OperationSmsRecordMapperExpand.java | 50 - .../mapper/WithdrawBlockMapperExpand.java | 19 - .../batch/FlowDataBatchSearchAdminMapper.java | 196 --- .../batch/FlowDataBatchSearchMapper.java | 12 - .../callbattle/ActCallBattleAdminMapper.java | 64 - .../GamePartnerOrderAdminMapper.java | 48 - .../official/OfficialRecordAdminMapper.java | 15 - .../WithdrawUserLimitAdminMapper.java | 29 - .../ChannelDistributeAdminService.java | 88 -- .../activity/ActCallBattleAdminService.java | 89 -- .../activity/LuckySeaActAdminService.java | 101 -- .../activity/OperationActAdminService.java | 67 - .../activity/StaticActivityPageService.java | 51 - .../impl/ActCallBattleAdminServiceImpl.java | 270 ---- .../impl/LuckySeaActAdminServiceImpl.java | 319 ---- .../admin/service/api/MyApiService.java | 68 - .../FlowDataBatchSearchAdminService.java | 74 - .../batch/FlowDataBatchSearchService.java | 12 - .../FlowDataBatchSearchAdminServiceImpl.java | 704 --------- .../impl/FlowDataBatchSearchServiceImpl.java | 18 - .../impl/ChargeRegionAdminServiceImpl.java | 8 - .../service/finance/FinanceAdminService.java | 108 -- .../GamePartnerOrderAdminService.java | 80 - .../UserGamePartnerInfoAdminService.java | 251 --- .../GamePartnerOrderAdminServiceImpl.java | 124 -- .../OfficialBrowseRecordAdminService.java | 20 - .../official/OfficialConfigAdminService.java | 28 - .../OfficialBrowseRecordAdminServiceImpl.java | 28 - .../impl/OfficialConfigAdminServiceImpl.java | 43 - .../record/OfficialGoldRecordService.java | 10 - .../service/sms/OperationSmsAdminService.java | 316 ---- .../service/system/AdminDictService.java | 70 - .../service/system/AdminPictureService.java | 35 - .../PhoneAuthApplyRecordAdiminService.java | 228 --- .../user/TopicBoxItemAdminService.java | 80 - .../user/UserCertifyRecordAdminService.java | 120 -- .../service/user/WithdrawAdminService.java | 198 --- .../withdraw/ExchangeRateAdminService.java | 29 - .../withdraw/WithdrawAccountAdminService.java | 72 - .../WithdrawAccountDtlAdminService.java | 21 - .../withdraw/WithdrawApplyAdminService.java | 145 -- .../withdraw/WithdrawBlockAdminService.java | 144 -- .../withdraw/WithdrawConfigAdminService.java | 153 -- .../withdraw/WithdrawUserAdminService.java | 49 - .../WithdrawUserLimitAdminService.java | 60 - .../WithdrawUserRecordAdminService.java | 92 -- .../impl/ExchangeRateAdminServiceImpl.java | 88 -- .../WithdrawAccountDtlAdminServiceImpl.java | 28 - .../impl/WithdrawUserAdminServiceImpl.java | 219 --- .../WithdrawUserLimitAdminServiceImpl.java | 173 --- .../WithdrawUserRecordAdminServiceImpl.java | 243 --- .../mapper/ActCallBattleAdminMapper.xml | 121 -- .../main/resources/mapper/AdminDictMapper.xml | 244 --- .../mapper/FlowDataBatchSearchAdminMapper.xml | 288 ---- .../mapper/FlowDataBatchSearchMapper.xml | 4 - .../mapper/GamePartnerOrderAdminMapper.xml | 99 -- .../mapper/LuckySeaActAdminMapper.xml | 120 -- .../mapper/OfficialRecordAdminMapper.xml | 110 -- .../mapper/OperationSmsRecordMapperExpand.xml | 90 -- .../resources/mapper/WithdrawBlockMapper.xml | 206 --- .../mapper/WithdrawBlockMapperExpand.xml | 83 - .../mapper/WithdrawUserLimitAdminMapper.xml | 45 - .../ChannelDistributeAdminController.java | 83 - .../ActCallBattleAdminController.java | 241 --- .../activity/LuckySeaActAdminController.java | 262 ---- .../activity/OperationActAdminController.java | 58 - .../StaticActivityPageController.java | 69 - .../admin/controller/api/MyApiController.java | 9 - .../FlowDataBatchSearchAdminController.java | 130 -- .../charge/MyCardAdminController.java | 63 - .../GamePartnerInfoAdminController.java | 61 - .../GamePartnerOrderAdminController.java | 123 -- .../UserGamePartnerInfoAdminController.java | 47 - .../gift/NewUserGiftAdminController.java | 42 - ...NewUserSayHelloChannelAdminController.java | 57 - .../OfficialBrowseRecordAdminController.java | 37 - .../OfficialConfigAdminController.java | 50 - .../sms/OperationSmsAdminController.java | 103 -- .../sms/SmsRecordAdminController.java | 32 +- .../system/AdminDictController.java | 85 - .../system/AdminPictureController.java | 114 -- .../system/SysConfAdminController.java | 14 - .../system/UserLevelCharmFixController.java | 98 -- .../user/ChargeRecordAdminController.java | 2 +- .../PhoneAuthApplyRecordAdminController.java | 87 -- .../user/TopicBoxItemAdminController.java | 91 -- .../UserCertifyRecordAdminController.java | 99 -- .../withdraw/ExchangeRateAdminController.java | 55 - .../WithdrawAccountAdminController.java | 51 - .../WithdrawAccountDtlAdminController.java | 41 - .../withdraw/WithdrawAdminController.java | 152 -- .../WithdrawApplyAdminController.java | 74 - .../WithdrawBlockAdminController.java | 121 -- .../WithdrawConfigAdminController.java | 81 - .../withdraw/WithdrawUserAdminController.java | 97 -- .../WithdrawUserLimitAdminController.java | 120 -- .../WithdrawUserRecordAdminController.java | 156 -- .../model/phone/PhoneAuthApplyRecord.java | 64 - .../core/model/phone/PhoneAuthRecord.java | 61 - .../PhoneAuthApplyRecordMapper.java | 17 - .../mybatismapper/PhoneAuthRecordMapper.java | 19 - .../core/mybatismapper/SysConfMapper.java | 31 - .../phone/PhoneAuthApplyRecordService.java | 28 - .../service/phone/PhoneAuthRecordService.java | 15 - .../impl/PhoneAuthApplyRecordServiceImpl.java | 338 ---- .../impl/PhoneAuthRecordServiceImpl.java | 21 - .../sqlmappers/PhoneAuthApplyRecordMapper.xml | 21 - .../sqlmappers/PhoneAuthRecordMapper.xml | 22 - .../resources/sqlmappers/SysConfMapper.xml | 237 --- .../common/constant/ExtendsAttach.java | 17 - .../accompany/common/utils/AssertUtil.java | 17 - .../common/utils/CommonCheckSumBuilder.java | 43 - .../com/accompany/common/utils/GameUtil.java | 80 - .../com/accompany/common/utils/MoneyUtil.java | 25 - .../com/accompany/common/utils/Snowflake.java | 60 - .../config/AliYunFinancialFaceConfig.java | 27 - .../accompany/common/config/AliyunConfig.java | 43 - .../common/config/AliyunRPCertifyConfig.java | 35 - .../common/constant/ActRankTypeEnum.java | 53 - .../common/constant/ActTypeEnum.java | 50 - .../accompany/common/constant/Constant.java | 34 +- .../common/constant/PaymentConstant.java | 65 - .../common/constant/SmsConstant.java | 9 - .../accompany/common/model/GamePlayer.java | 56 - .../com/accompany/common/redis/RedisKey.java | 1 - .../common/support/BeanSelfAware.java | 8 - .../InjectBeanSelfBeanPostProcessor.java | 37 - .../accompany/common/utils/AccounUtil.java | 20 - .../accompany/core/annotation/LogTime.java | 16 - .../core/annotation/LogTimeAspect.java | 54 - .../com/accompany/core/dto/SysConfDto.java | 53 - .../accompany/core/model/SysConfExample.java | 630 -------- .../main/resources/META-INF/spring.factories | 1 - .../payment/constant/PayChannelConstant.java | 13 - .../payment/constant/PayConstant.java | 113 -- .../accompany/payment/mycard/BaseResult.java | 33 - .../payment/mycard/dto/CallbackDto.java | 83 - .../payment/mycard/dto/ReplenishDto.java | 35 - .../payment/mycard/enums/PaymentTypeEnum.java | 16 - .../payment/mycard/params/AuthCodeParam.java | 19 - .../mycard/params/AuthGlobalParam.java | 148 -- .../mycard/params/FacServiceIdParam.java | 19 - .../payment/mycard/resp/AuthGlobalResp.java | 56 - .../payment/mycard/resp/ItemResp.java | 51 - .../payment/mycard/resp/PayItemQueryResp.java | 35 - .../payment/mycard/resp/PaymentTypeResp.java | 45 - .../payment/mycard/resp/QueryOrderResp.java | 89 -- .../payment/mycard/resp/TradeQueryResp.java | 89 -- .../payment/mycard/MyCardService.java | 182 --- .../payment/mycard/config/MyCardConfig.java | 41 - .../payment/strategy/MyCardStrategy.java | 105 -- .../mapper/ChargeRecordMapperMgr.xml | 3 - .../accompany/sms/config/AliyunSmsConfig.java | 36 - .../com/accompany/sms/enums/SmsTypeEnum.java | 1 - .../accompany/sms/result/AliyunSmsRet.java | 48 - .../sms/service/AliyunSmsService.java | 144 -- .../com/accompany/sms/service/SmsService.java | 4 +- .../sms/strategy/AliYunSmsStrategy.java | 68 - .../accompany/sms/strategy/SmsFactory.java | 4 +- .../business/annual/AnnualCpDao.java | 205 --- .../business/annual/AnnualTaskDao.java | 126 -- .../business/christmas/ChristmasCpDao.java | 270 ---- .../christmas/ChristmasFirstLetterNumDao.java | 27 - .../ChristmasFourthLetterNumDao.java | 27 - .../christmas/ChristmasLetterDao.java | 132 -- .../christmas/ChristmasLetterNumDao.java | 68 - .../ChristmasSecondLetterNumDao.java | 27 - .../christmas/ChristmasThirdLetterNumDao.java | 27 - .../christmas/ChristmasTicketTaskDao.java | 16 - .../doubleeleven/DoubleElevenTaskDao.java | 16 - .../halloween/HalloweenBoxLevelDao.java | 93 -- .../halloween/HalloweenCandyNumDao.java | 27 - .../halloween/HalloweenMapPosDao.java | 96 -- .../halloween/HalloweenTicketTaskDao.java | 16 - .../mapper/DoubleElevenTaskRecordDao.java | 10 - .../mapper/HalloweenDrawBoxRecordDao.java | 10 - .../mapper/HalloweenDrawRecordDao.java | 10 - .../mapper/HalloweenTaskRecordDao.java | 10 - .../mapper/MidAutumnDrawRecordDao.java | 10 - .../MidAutumnJackpotContributionDao.java | 10 - .../mapper/MidAutumnTaskRecordDao.java | 10 - .../business/mapper/QixiRankDao.java | 14 - .../business/mapper/QixiRedLineRecordDao.java | 15 - .../midautumn/MidAutumnMoonCakeNumDao.java | 27 - .../midautumn/MidAutumnTicketTaskDao.java | 16 - .../business/qixi/QixiRedBagDao.java | 56 - .../business/qixi/QixiRedLineNumDao.java | 46 - .../business/qixi/QixiXiqueNumDao.java | 79 - .../business/qixi/QixiXiqueTaskDao.java | 52 - .../business/valentine/ValentinesCpDao.java | 215 --- .../mapper/DoubleElevenTaskRecordDao.xml | 5 - .../mapper/HalloweenDrawBoxRecordDao.xml | 5 - .../mapper/HalloweenDrawRecordDao.xml | 5 - .../mapper/HalloweenTaskRecordDao.xml | 5 - .../mapper/MidAutumnDrawRecordDao.xml | 5 - .../MidAutumnJackpotContributionDao.xml | 5 - .../mapper/MidAutumnTaskRecordDao.xml | 5 - .../accompany/business/mapper/QixiRankDao.xml | 39 - .../business/mapper/QixiRedLineRecordDao.xml | 29 - .../scheduler/annual/AnnualCpRankTask.java | 24 - .../annual/AnnualPopularRankTask.java | 31 - .../scheduler/annual/AnnualRoomRankTask.java | 25 - .../annual/AnnualTyrantRankTask.java | 24 - .../christmas/ChristmasRankTask.java | 24 - .../doubleeleven/DoubleElevenRankTask.java | 24 - .../scheduler/exp/ExpBattleRankTask.java | 24 - .../halloween/HalloweenRankTask.java | 24 - .../midautumn/MidAutumnJackpotTask.java | 21 - .../midautumn/MidAutumnRankTask.java | 24 - .../scheduler/qixi/QixiRankTask.java | 30 - .../scheduler/special/SpecialRankTask.java | 24 - .../valentines/ValentinesCpRankTask.java | 24 - .../constant/ValentinesDayConstant.java | 11 - .../annual/constant/AnnualConstant.java | 26 - .../constant/AnnualGiftRankTypeEnum.java | 27 - .../dto/AnnualGiftRankActConfigDto.java | 21 - .../annual/dto/AnnualPopularConfigDto.java | 51 - .../annual/dto/AnnualRoomConfigDto.java | 16 - .../annual/dto/AnnualTaskConfigDto.java | 24 - .../annual/vo/AnnualPopularHourRankVo.java | 33 - .../annual/vo/AnnualPopularRankItemVo.java | 15 - .../annual/vo/AnnualRoomPkInfoVo.java | 16 - .../business/annual/vo/AnnualRoomRankVo.java | 11 - .../business/annual/vo/AnnualTaskVo.java | 33 - .../children/dto/ChildrenDayConfigDto.java | 21 - .../children/vo/ChildrenDayTaskVo.java | 82 - .../children/vo/ChildrenDrawRewardVo.java | 69 - .../christmas/constant/ChristmasConstant.java | 34 - .../christmas/dto/ChristmasCpProp.java | 16 - .../dto/ChristmasCpRankActConfigDto.java | 15 - .../christmas/dto/ChristmasCpUserProp.java | 13 - .../dto/ChristmasLetterActConfigDto.java | 11 - .../christmas/dto/ChristmasLetterDto.java | 16 - .../christmas/vo/ChristmasCpUserPropVo.java | 33 - .../business/christmas/vo/ChristmasCpVo.java | 18 - .../christmas/vo/ChristmasLetterConfigVo.java | 25 - .../christmas/vo/ChristmasLetterVo.java | 24 - .../dto/CrossRoomPkActConfigDto.java | 61 - .../constant/DoubleElevenConstant.java | 17 - .../dto/DoubleElevenRankConfigDto.java | 9 - .../dto/DoubleElevenTaskConfigDto.java | 13 - .../model/DoubleElevenTaskRecord.java | 17 - .../vo/DoubleElevenTaskConfigVo.java | 21 - .../exp/constant/ExpBattleActConstant.java | 15 - .../exp/dto/ExpBattleActConfigDto.java | 29 - .../business/exp/vo/ExpBattleActUserVo.java | 15 - .../business/exp/vo/ExpBattleActVo.java | 23 - .../fools/vo/AprilFoolsDayRoomVo.java | 73 - .../halloween/constant/HalloweenConstant.java | 40 - .../halloween/dto/HalloweenDrawConfigDto.java | 27 - .../halloween/dto/HalloweenRankConfigDto.java | 9 - .../halloween/dto/HalloweenTaskConfigDto.java | 9 - .../model/HalloweenDrawBoxRecord.java | 19 - .../model/HalloweenDrawUserRecord.java | 31 - .../halloween/model/HalloweenTaskRecord.java | 17 - .../halloween/vo/HalloweenDrawConfigVo.java | 28 - .../halloween/vo/HalloweenDrawResultVo.java | 22 - .../vo/HalloweenDrawUserRecordVo.java | 20 - .../halloween/vo/HalloweenTaskConfigVo.java | 22 - .../constant/LuckyProcessBarConstant.java | 12 - .../dto/LuckyProcessBarConfigDto.java | 28 - .../model/LuckyProcessBarRewardRecord.java | 17 - .../vo/LuckyProcessBarConfigVo.java | 36 - .../midautumn/constant/MidAutumnConstant.java | 35 - .../midautumn/dto/MidAutumnDrawConfigDto.java | 9 - .../midautumn/dto/MidAutumnJackpotConfig.java | 17 - .../midautumn/dto/MidAutumnRankConfigDto.java | 35 - .../midautumn/dto/MidAutumnTaskConfigDto.java | 11 - .../model/MidAutumnDrawUserRecord.java | 26 - .../model/MidAutumnJackpotContribution.java | 22 - .../midautumn/model/MidAutumnTaskRecord.java | 17 - .../midautumn/vo/MidAutumnDrawConfigVo.java | 22 - .../vo/MidAutumnDrawUserRecordVo.java | 20 - .../vo/MidAutumnJackpotConfigVo.java | 27 - .../vo/MidAutumnJackpotRecordVo.java | 18 - .../midautumn/vo/MidAutumnTaskConfigVo.java | 24 - .../business/qixi/constant/QixiConstant.java | 79 - .../business/qixi/dto/QixiRankConfigDto.java | 26 - .../qixi/dto/QixiRedLineConfigDto.java | 14 - .../qixi/dto/QixiRoomRankConfigDto.java | 5 - .../business/qixi/dto/QixiUserRedBagDto.java | 17 - .../business/qixi/dto/QixiXiqueConfigDto.java | 34 - .../business/qixi/entity/QixiRankHourCp.java | 11 - .../qixi/entity/QixiRedLineUserRecord.java | 26 - .../business/qixi/model/QixiRankHourCp.java | 11 - .../qixi/model/QixiRedLineUserRecord.java | 26 - .../business/qixi/vo/QixiRankHourCpVo.java | 28 - .../business/qixi/vo/QixiRedLineConfigVo.java | 39 - .../qixi/vo/QixiRedLineUserRecordVo.java | 20 - .../business/qixi/vo/QixiXiqueConfigVo.java | 48 - .../snooker/constant/SnookerActConstant.java | 15 - .../snooker/dto/SnookerActConfigDto.java | 11 - .../constant/ValentinesConstant.java | 19 - .../valentine/dto/ValentinesCpUserProp.java | 13 - .../valentine/vo/ValentinesCpRankVo.java | 20 - .../listener/AnnualCpRankGiftListener.java | 20 - .../listener/AnnualGiftRankGiftListener.java | 67 - .../AnnualPopularRankGiftListener.java | 65 - .../listener/AnnualRoomRankChatListener.java | 56 - .../listener/AnnualRoomRankGiftListener.java | 38 - .../listener/AnnualTaskGiftListener.java | 49 - .../AnnualTyrantRankGiftListener.java | 18 - .../AnnualTyrantStayRoomListener.java | 52 - .../annual/service/AnnualCpRankService.java | 114 -- .../AnnualCpUsersRankObjectProvider.java | 116 -- .../annual/service/AnnualGiftRankService.java | 79 - .../service/AnnualPopularHourRankService.java | 223 --- .../service/AnnualPopularRankService.java | 126 -- .../annual/service/AnnualRoomRankService.java | 340 ---- .../annual/service/AnnualTaskService.java | 162 -- .../service/AnnualTyrantRankService.java | 69 - .../handler/LimitGift61ForReceiveHandler.java | 155 -- .../handler/LimitGift61ForSendHandler.java | 155 -- .../listener/KeepTimeTaskListener.java | 38 - .../children/listener/LoginTaskListener.java | 31 - .../MiniGameForBaiShunTaskListener.java | 34 - .../listener/UserFollowTaskListener.java | 34 - .../listener/UserPromiseStarTaskListener.java | 24 - .../service/ChildrenDayGardenService.java | 354 ----- .../service/ChildrenDayTaskService.java | 279 ---- .../listener/ChristmasCpRankGiftListener.java | 20 - .../ChristmasCpRewardGiftListener.java | 52 - .../ChristmasLetterTaskGiftListener.java | 58 - .../listener/ChristmasRankGiftListener.java | 20 - .../service/ChristmasCpRankService.java | 115 -- .../christmas/service/ChristmasCpService.java | 148 -- .../ChristmasCpUsersRankObjectProvider.java | 116 -- .../service/ChristmasLetterService.java | 205 --- .../service/ChristmasRankService.java | 63 - .../SingleCrossRoomPkActListener.java | 154 -- .../service/SingleCrossRoomPkRankService.java | 275 ---- .../service/SingleCrossRoomPkTaskService.java | 91 -- .../DoubleElevenRankGiftListener.java | 20 - .../DoubleElevenTaskGiftListener.java | 61 - .../service/DoubleElevenRankService.java | 64 - .../DoubleElevenTaskRecordService.java | 61 - .../service/DoubleElevenTaskService.java | 76 - .../listener/ExpBattleRankGiftListener.java | 60 - .../exp/service/ArabExpBattleRankService.java | 14 - .../service/ChineseExpBattleRankService.java | 34 - .../service/EnglishExpBattleRankService.java | 14 - .../exp/service/ExpBattleActService.java | 110 -- .../exp/service/ExpBattleRankService.java | 223 --- .../handler/AprilFoolsDayBoxHandler.java | 89 -- .../handler/AprilFoolsDayRoomHandler.java | 322 ---- .../AprilFoolsDayRoomRemainZeroListener.java | 46 - .../AprilFoolsDayRoomTimeOutBackListener.java | 46 - .../AprilFoolsDayRoomTimeOutListener.java | 46 - .../service/AprilFoolsDayRoomService.java | 166 -- .../task/AprilFoolsDayBoxTaskService.java | 92 -- .../HalloweenDrawBoxGiftListener.java | 63 - .../HalloweenDrawBoxLuckyBagListener.java | 64 - .../listener/HalloweenRankGiftListener.java | 20 - .../listener/HalloweenTaskGiftListener.java | 20 - .../HalloweenTaskLuckyBagListener.java | 57 - .../HalloweenTaskLuckySeaListener.java | 50 - .../HalloweenTaskStayRoomListener.java | 66 - .../HalloweenDrawBoxRecordService.java | 27 - .../service/HalloweenDrawBoxService.java | 32 - .../HalloweenDrawHighRewardService.java | 22 - .../HalloweenDrawLowRewardService.java | 21 - .../HalloweenDrawMagicRewardService.java | 22 - .../HalloweenDrawMiddleRewardService.java | 21 - .../service/HalloweenDrawRecordService.java | 66 - .../service/HalloweenDrawRewardService.java | 39 - .../service/HalloweenDrawService.java | 170 -- .../service/HalloweenRankService.java | 64 - .../service/HalloweenTaskRecordService.java | 61 - .../service/HalloweenTaskService.java | 77 - .../handler/ActHotLoveForReceiveHandler.java | 63 - .../handler/ActHotLoveForSendHandler.java | 63 - .../hotlove/service/ActHotLoveService.java | 209 --- .../listener/LuckyProcessBarGiftListener.java | 49 - .../LuckyProcessBarRewardRecordService.java | 61 - .../service/LuckyProcessBarService.java | 147 -- .../MidAutumnJackpotFindLoveDrawListener.java | 34 - .../MidAutumnJackpotLuckyBagListener.java | 33 - .../listener/MidAutumnRankGiftListener.java | 20 - .../MidAutumnTaskDynamicListener.java | 53 - .../MidAutumnTaskFindLoveDrawListener.java | 47 - .../listener/MidAutumnTaskGiftListener.java | 20 - .../MidAutumnTaskLuckyBagListener.java | 56 - .../service/MidAutumnDrawRecordService.java | 64 - .../service/MidAutumnDrawRewardService.java | 22 - .../service/MidAutumnDrawService.java | 71 - .../MidAutumnJackpotCalculateService.java | 245 --- .../MidAutumnJackpotCalculateTestService.java | 189 --- .../service/MidAutumnJackpotService.java | 276 ---- .../service/MidAutumnRankService.java | 64 - .../service/MidAutumnTaskRecordService.java | 61 - .../service/MidAutumnTaskService.java | 78 - .../qixi/event/QixiXiqueAddEvent.java | 17 - .../qixi/listener/QixiRankGiftListener.java | 57 - .../listener/QixiRedLineXiqueListener.java | 41 - .../listener/QixiRoomRankGiftListener.java | 51 - .../qixi/listener/QixiXiqueGiftListener.java | 56 - .../listener/QixiXiqueRoomChatListener.java | 43 - .../listener/QixiXiqueStayRoomListener.java | 48 - .../qixi/service/QixiRankService.java | 370 ----- .../qixi/service/QixiRedLineDrawService.java | 138 -- .../qixi/service/QixiRedLineService.java | 265 ---- .../qixi/service/QixiRoomRankService.java | 147 -- .../qixi/service/QixiXiqueService.java | 241 --- .../signin/handler/RepairSignInHandler.java | 190 --- .../signin/service/ActSignInService.java | 185 --- .../listener/SnookerRankMiniGameListener.java | 81 - .../snooker/service/SnookerRankService.java | 98 -- .../listener/SpecialGiftRankListener.java | 25 - .../service/SpecialGiftRankService.java | 43 - .../handler/ValentinesDayBoxHandler.java | 16 - .../handler/ValentinesDayHighGiftHandler.java | 67 - .../ValentinesCpRankGiftListener.java | 98 -- .../service/ValentinesCpRankService.java | 208 --- .../ValentinesCpUsersRankObjectProvider.java | 116 -- .../WomenDayLimitGiftReceiveHandler.java | 152 -- .../handler/WomenDayLimitGiftSendHandler.java | 152 -- .../WomenDayLoveWingReceiveHandler.java | 153 -- .../handler/WomenDayLoveWingSendHandler.java | 154 -- .../annual/AnnualCpRankController.java | 62 - .../annual/AnnualGiftRankController.java | 41 - .../annual/AnnualPopularRankController.java | 76 - .../annual/AnnualRoomRankController.java | 91 -- .../business/annual/AnnualTaskController.java | 67 - .../annual/AnnualTyrantRankController.java | 62 - .../children/ChildrenDayController.java | 61 - .../christmas/ChristmasCpRankController.java | 103 -- .../christmas/ChristmasLetterController.java | 96 -- .../christmas/ChristmasRankController.java | 67 - .../SingleCrossRoomPkActController.java | 55 - .../DoubleElevenRankController.java | 67 - .../DoubleElevenTaskController.java | 46 - .../business/exp/ExpBattleActController.java | 86 -- .../fools/AprilFoolsDayController.java | 62 - .../halloween/HalloweenDrawController.java | 78 - .../halloween/HalloweenRankController.java | 65 - .../halloween/HalloweenTaskController.java | 46 - .../hotlove/ActHotLoveController.java | 63 - .../LuckyProcessBarController.java | 35 - .../midautumn/MidAutumnDrawController.java | 72 - .../midautumn/MidAutumnJackpotController.java | 124 -- .../midautumn/MidAutumnRankController.java | 67 - .../midautumn/MidAutumnTaskController.java | 46 - .../business/qixi/QixiRankController.java | 90 -- .../business/qixi/QixiRedLineController.java | 104 -- .../business/qixi/QixiRoomRankController.java | 33 - .../business/qixi/QixiXiqueController.java | 65 - .../business/signin/ActSignInController.java | 35 - .../snooker/SnookerActRankController.java | 41 - .../special/SpecialGiftRankController.java | 75 - .../ValentinesCpRankController.java | 62 - .../activities/ActivitesPackTypeEnum.java | 4 +- .../withdraw/WithdrawAccountTypeConstant.java | 20 - .../withdraw/WithdrawUserLimitConstant.java | 13 - .../callbattle/ActCallBattleConfig.java | 45 - .../ActCallBattleRoomTipConfig.java | 27 - .../luckysea/LuckySeaActUserRoundStatDTO.java | 26 - .../luckysea/LuckySeaTicketConfigDto.java | 13 - .../luckysea/LuckySeaUserDrawResultDto.java | 33 - .../callbattle/ActCallBattleBroadCastDTO.java | 28 - .../ActCallBattleGoldPreWarningDTO.java | 26 - .../ActCallBattlePreWarningConfig.java | 87 -- .../callbattle/ActCallBattleTicketConfig.java | 13 - .../ActCallBattleUserDrawResultDto.java | 33 - .../ActCallBattleUserRoundStatDTO.java | 26 - .../dto/certification/CertifyInfo.java | 16 - .../dto/certification/FinancialResult.java | 22 - .../dto/exchange/WithdrawConfigDto.java | 73 - .../dto/gamepartner/GameOrderAmountDto.java | 39 - .../dto/luckysea/LuckySeaActConfig.java | 45 - .../dto/luckysea/LuckySeaBroadCastDTO.java | 28 - .../luckysea/LuckySeaGoldPreWarningDTO.java | 26 - .../luckysea/LuckySeaPreWarningConfig.java | 106 -- .../dto/withdraw/WithdrawAmountHolder.java | 45 - .../enums/certification/CertTypeEnum.java | 11 - .../enums/withdraw/RecordStatusEnum.java | 15 - .../event/LuckySeaDrawMessageEvent.java | 10 - .../gamepartner/GamePartnerFinishEvent.java | 15 - .../gamepartner/GamePartnerInviteEvent.java | 15 - .../business/message/LuckySeaDrawMessage.java | 23 - .../business/model/ActivityConfig.java | 43 - .../business/model/ActivityConfigExample.java | 490 ------ .../business/model/AdminPicture.java | 224 --- .../business/model/AdminPictureExample.java | 1136 -------------- .../business/model/ChannelDistribute.java | 85 - .../model/ChannelDistributeExample.java | 741 --------- .../model/ChargeActivityVisitLog.java | 85 - .../model/ChargeActivityVisitLogExample.java | 701 --------- .../business/model/FinanceGoldDiamond.java | 125 -- .../model/FinanceGoldDiamondDetail.java | 95 -- .../FinanceGoldDiamondDetailExample.java | 781 ---------- .../model/FinanceGoldDiamondExample.java | 941 ------------ .../business/model/FinanceTypeConfig.java | 75 - .../model/FinanceTypeConfigExample.java | 601 -------- .../business/model/OperationAct.java | 68 - .../business/model/OperationActExample.java | 611 -------- .../business/model/OperationSmsRecord.java | 95 -- .../model/OperationSmsRecordExample.java | 781 ---------- .../accompany/business/model/PkActRecord.java | 55 - .../business/model/PkActRecordExample.java | 541 ------- .../business/model/SysConfExample.java | 691 --------- .../com/accompany/business/model/Title.java | 95 -- .../business/model/TitleExample.java | 781 ---------- .../com/accompany/business/model/TopLine.java | 116 -- .../business/model/TopLineExample.java | 930 ----------- .../business/model/TopicBoxItem.java | 85 - .../business/model/TopicBoxItemExample.java | 701 --------- .../business/model/TopicBoxItemVo.java | 30 - .../accompany/business/model/TopicBoxMsg.java | 55 - .../business/model/TopicBoxMsgExample.java | 521 ------- .../accompany/business/model/TopicRoom.java | 85 - .../business/model/TopicRoomExample.java | 711 --------- .../business/model/UserCertifyRecord.java | 175 --- .../model/UserCertifyRecordExample.java | 1361 ----------------- .../business/model/UserYearReport.java | 30 - .../accompany/business/model/WebConfig.java | 53 - .../business/model/WebConfigExample.java | 550 ------- .../business/model/WithdrawAccount.java | 59 - .../business/model/WithdrawRecord.java | 59 - .../BigGiftNameplateActivityConfig.java | 30 - .../model/activity/CarActivityConfig.java | 14 - .../activity/ChildrenActivityConfig.java | 27 - .../business/model/activity/PageActivity.java | 37 - .../activity/luckysea/LuckySeaActInfo.java | 73 - .../activity/luckysea/LuckySeaDrawItem.java | 32 - .../model/activity/luckysea/LuckySeaItem.java | 59 - .../activity/luckysea/LuckySeaItemGroup.java | 47 - .../luckysea/LuckySeaRoomTipConfig.java | 37 - .../luckysea/LuckySeaUserDrawRecord.java | 81 - .../luckysea/LuckySeaUserDrawResult.java | 56 - .../model/callbattle/ActCallBattleInfo.java | 93 -- .../model/callbattle/ActCallBattleItem.java | 67 - .../ActCallBattleUserDrawRecord.java | 85 - .../ActCallBattleUserDrawResult.java | 58 - .../model/chat/PublicChatTopRecord.java | 98 -- .../model/gamepartner/GamePartnerInfo.java | 27 - .../model/gamepartner/GamePartnerInfoTag.java | 11 - .../model/gamepartner/GamePartnerOrder.java | 95 -- .../model/gamepartner/UserGamePartner.java | 19 - .../gamepartner/UserGamePartnerInfo.java | 24 - .../gamepartner/UserGamePartnerInfoTag.java | 12 - .../newUserStart/NewUserSayHelloChannel.java | 60 - .../business/model/newbie/NewbieMessage.java | 12 - .../model/newbie/NewbieMessageRecord.java | 17 - .../model/newuser/NewUserInRoomGift.java | 21 - .../newuser/NewUserInRoomGiftRecord.java | 28 - .../model/official/OfficialBrowseRecord.java | 62 - .../model/official/OfficialClickRecord.java | 75 - .../model/official/OfficialConfig.java | 104 -- .../business/model/room/RoomSearchLog.java | 30 - .../business/model/withdraw/ExchangeRate.java | 53 - .../model/withdraw/WithdrawAccountDtl.java | 58 - .../model/withdraw/WithdrawConfig.java | 71 - .../business/model/withdraw/WithdrawUser.java | 54 - .../model/withdraw/WithdrawUserAccount.java | 155 -- .../model/withdraw/WithdrawUserLimit.java | 61 - .../model/withdraw/WithdrawUserRecord.java | 208 --- .../GamePartnerInfoTagListTypeHandler.java | 18 - .../LuckySeaDrawItemListTypeHandler.java | 18 - ...UserGamePartnerInfoTagListTypeHandler.java | 18 - .../ad/AdPlatfromTrackActiveReqParams.java | 43 - .../callbattle/ActCallBattleDrawParams.java | 32 - .../AdKuaishouTrackActiveReqParams.java | 29 - .../vo/activities/DoubleElevenGiftVo.java | 70 - .../vo/activities/LuckySeaActInfoVo.java | 38 - .../LuckySeaActRoundRankUserVo.java | 24 - .../activities/LuckySeaActUserDrawItemVO.java | 35 - .../LuckySeaActUserOneRoundDrawResult.java | 44 - .../vo/activities/LuckySeaPushMsg.java | 17 - .../activities/LuckySeaUserDrawResultVo.java | 36 - .../vo/activities/PageActivityVO.java | 26 - .../business/vo/activity/ActSigningUpVo.java | 130 -- .../activity/ActivitySingleRoomRankAward.java | 22 - .../ActivitySingleRoomRankConfig.java | 21 - .../vo/activity/ActivitySingleRoomRankVo.java | 22 - .../business/vo/activity/ActivityVo.java | 42 - .../business/vo/activity/AnnualCpRankVo.java | 53 - .../vo/activity/AnnualRankParentVo.java | 29 - .../business/vo/activity/AnnualRankVo.java | 81 - .../vo/activity/AnnualRoomRankParentVo.java | 29 - .../vo/activity/AnnualRoomRankVo.java | 101 -- .../vo/activity/ChristmasTreeActConfigVo.java | 81 - .../vo/activity/ChristmasTreeInfoVo.java | 129 -- .../vo/activity/NationalActivityVo.java | 48 - .../vo/activity/PlayMyTeamHonorRankVo.java | 26 - .../vo/activity/PlayTeamHonorRankVo.java | 82 - .../vo/activity/RegisterActivityStatusVo.java | 28 - .../vo/activity/SpecialGiftRulesVo.java | 37 - .../business/vo/activity/VkissPrizeVo.java | 45 - .../vo/callbattle/ActCallBattleInfoVo.java | 38 - .../callbattle/ActCallBattleRankListVo.java | 39 - .../vo/callbattle/ActCallBattleRankVo.java | 35 - .../callbattle/ActCallBattleRoundStatVo.java | 37 - .../ActCallBattleUserDrawItemVO.java | 31 - .../ActCallBattleUserDrawRecordVo.java | 54 - .../ActCallBattleUserDrawResultVo.java | 36 - .../vo/callbattle/ActCallBattleUserInfo.java | 37 - .../ActCallBattleUserOneRoundDrawResult.java | 38 - .../vo/chat/PublicChatTopRecordVo.java | 34 - .../vo/exchange/WithdrawAccountVo.java | 17 - .../vo/gamepartner/GamePartnerOrderVo.java | 96 -- .../vo/gamepartner/GamePartnerUserInfoVo.java | 17 - .../vo/gamepartner/UserGamePartnerInfoVo.java | 65 - .../business/vo/gift/NewUserGift.java | 37 - .../business/vo/gift/NewUserGiftVo.java | 28 - .../business/vo/helper/AliyunToken.java | 51 - .../business/vo/user/UserDetailsVo.java | 3 - .../business/vo/user/UserYearReportVo.java | 51 - .../vo/withdraw/WithdrawAccountDtlVo.java | 35 - .../vo/withdraw/WithdrawUserAccountVo.java | 46 - .../vo/withdraw/WithdrawUserRecordVo.java | 37 - .../event/listener/GiftNotifyListener.java | 3 +- .../listener/charge/MyCardChargeListener.java | 38 - .../GamePartnerFinishListener.java | 65 - .../GamePartnerInviteListener.java | 84 - .../ActSingleRoomRankMapper.java | 16 - .../mybatismapper/ActivityConfigMapper.java | 23 - .../mybatismapper/AdminPictureMapper.java | 31 - .../ChannelDistributeMapper.java | 31 - .../ChannelDistributeMapperExpand.java | 36 - .../ChargeActivityVisitLogMapper.java | 31 - .../FinanceGoldDiamondDetailMapper.java | 31 - .../FinanceGoldDiamondDetailMapperExpand.java | 11 - .../FinanceGoldDiamondMapper.java | 31 - .../FinanceTypeConfigMapper.java | 31 - .../GetLostUserMapperExpand.java | 39 - .../mybatismapper/GreetMsgMapper.java | 35 - .../mybatismapper/GreetMsgMapperExpand.java | 12 - .../HomeRoomFlowPeriodMapperMgr.java | 33 - .../mybatismapper/LostUserMapper.java | 23 - .../mybatismapper/OperationActMapper.java | 31 - .../OperationSmsRecordMapper.java | 31 - .../mybatismapper/PkActRecordMapper.java | 29 - .../mybatismapper/PkActRecordMapperMgr.java | 13 - .../mybatismapper/RoomSearchLogMapper.java | 10 - .../mybatismapper/SmsTemplateMapper.java | 29 - .../business/mybatismapper/TitleMapper.java | 29 - .../mybatismapper/TopicBoxItemMapper.java | 29 - .../mybatismapper/TopicBoxMsgMapper.java | 29 - .../UserCertifyRecordMapper.java | 29 - .../UserCertifyRecordMapperExpand.java | 14 - .../mybatismapper/UserYearReportMapper.java | 7 - .../mybatismapper/WebConfigMapper.java | 21 - .../WithDrawPacketCashProdMapper.java | 22 - .../mybatismapper/WithdrawAccountMapper.java | 7 - .../mybatismapper/WithdrawRecordMapper.java | 7 - .../activity/LuckySeaActInfoMapper.java | 25 - .../activity/LuckySeaActMapper.java | 82 - .../activity/LuckySeaItemGroupMapper.java | 15 - .../activity/LuckySeaItemMapper.java | 25 - .../activity/LuckySeaPreWarningMapper.java | 34 - .../LuckySeaUserDrawRecordMapper.java | 25 - .../LuckySeaUserDrawResultMapper.java | 25 - .../activity/PageActivityMapper.java | 12 - .../callbattle/ActCallBattleInfoMapper.java | 25 - .../callbattle/ActCallBattleItemMapper.java | 25 - .../callbattle/ActCallBattleMapper.java | 119 -- .../ActCallBattlePreWarningMapper.java | 39 - .../ActCallBattleUserDrawRecordMapper.java | 25 - .../ActCallBattleUserDrawResultMapper.java | 25 - .../chat/PublicChatTopRecordMapper.java | 12 - .../flow/FlowTeamMemberBaseMapper.java | 14 - .../gamepartner/GamePartnerInfoMapper.java | 12 - .../gamepartner/GamePartnerOrderMapper.java | 39 - .../UserGamePartnerInfoMapper.java | 15 - .../gamepartner/UserGamePartnerMapper.java | 15 - .../NewUserSayHelloChannelMapper.java | 13 - .../newbie/NewbieMessageMapper.java | 8 - .../newbie/NewbieMessageRecordMapper.java | 7 - .../newbie/NewbiePoolMapper.java | 13 - .../newuser/NewUserInRoomGiftMapper.java | 13 - .../NewUserInRoomGiftRecordMapper.java | 12 - .../official/OfficialBrowseRecordMapper.java | 12 - .../official/OfficialClickRecordMapper.java | 12 - .../official/OfficialConfigMapper.java | 12 - .../withdraw/ExchangeRateMapper.java | 21 - .../withdraw/WithdrawAccountDtlMapper.java | 12 - .../withdraw/WithdrawConfigMapper.java | 12 - .../withdraw/WithdrawUserAccountMapper.java | 12 - .../withdraw/WithdrawUserLimitMapper.java | 12 - .../withdraw/WithdrawUserMapper.java | 13 - .../withdraw/WithdrawUserRecordMapper.java | 43 - .../business/service/AppStoreService.java | 62 - .../service/ChannelDistributeService.java | 40 - .../business/service/ChargeService.java | 1 - .../business/service/GreetMsgService.java | 28 - .../service/LuckySeaPreWarningService.java | 267 ---- .../business/service/WebConfigService.java | 82 - .../activities/ActSingleRoomRankService.java | 166 -- .../luckySea/ActivitiesLuckySeaService.java | 87 -- .../luckySea/LuckySeaActConfigService.java | 16 - .../luckySea/LuckySeaActInfoService.java | 35 - .../luckySea/LuckySeaDrawService.java | 20 - .../luckySea/LuckySeaItemGroupService.java | 18 - .../luckySea/LuckySeaItemService.java | 22 - .../luckySea/LuckySeaRankService.java | 16 - .../luckySea/LuckySeaSettlementService.java | 12 - .../luckySea/LuckySeaStockService.java | 57 - .../luckySea/LuckySeaTicketService.java | 76 - .../LuckySeaUserDrawRecordService.java | 33 - .../LuckySeaUserDrawResultService.java | 15 - .../impl/ActivitiesLuckySeaServiceImpl.java | 329 ---- .../impl/LuckySeaActConfigServiceImpl.java | 56 - .../impl/LuckySeaActInfoServiceImpl.java | 169 -- .../impl/LuckySeaDrawServiceImpl.java | 368 ----- .../impl/LuckySeaItemGroupServiceImpl.java | 32 - .../impl/LuckySeaItemServiceImpl.java | 87 -- .../luckySea/impl/LuckySeaPushMsgService.java | 162 -- .../impl/LuckySeaRankServiceImpl.java | 78 - .../impl/LuckySeaSettlementServiceImpl.java | 171 --- .../LuckySeaUserDrawRecordServiceImpl.java | 112 -- .../LuckySeaUserDrawResultServiceImpl.java | 22 - .../vo/LuckySeaActUserDrawRecordVo.java | 50 - .../activities/vo/LuckySeaActUserInfo.java | 37 - .../activities/vo/LuckySeaRankListVo.java | 39 - .../service/activities/vo/LuckySeaRankVo.java | 35 - .../activity/ActivityConfigService.java | 164 -- .../activity/ActivityPackMessageService.java | 6 - .../service/activity/ActivityPackService.java | 11 - .../BigGiftNameplateActivityService.java | 87 -- .../service/activity/CarActivityService.java | 53 - .../ChargeActivityVisitLogService.java | 28 - .../service/activity/OperationActService.java | 49 - .../service/activity/PageActivityService.java | 49 - .../service/activity/PkActivityService.java | 155 -- .../callbattle/ActCallBattleBizService.java | 150 -- .../callbattle/ActCallBattleDrawService.java | 160 -- .../callbattle/ActCallBattleInfoService.java | 29 - .../callbattle/ActCallBattleItemService.java | 25 - .../ActCallBattleMessageService.java | 104 -- .../ActCallBattlePreWarningService.java | 225 --- .../callbattle/ActCallBattleStockService.java | 54 - .../ActCallBattleTicketService.java | 71 - .../ActCallBattleUserDrawRecordService.java | 32 - .../ActCallBattleUserDrawResultService.java | 25 - .../impl/ActCallBattleBizServiceImpl.java | 783 ---------- .../impl/ActCallBattleInfoServiceImpl.java | 54 - .../impl/ActCallBattleItemServiceImpl.java | 32 - ...ctCallBattleUserDrawRecordServiceImpl.java | 95 -- ...ctCallBattleUserDrawResultServiceImpl.java | 31 - .../certification/AbstractCertifyService.java | 332 ---- .../FinancialFaceVerifyService.java | 104 -- .../RealPeopleCertifyService.java | 266 ---- .../TwoFactorCertifyService.java | 76 - .../YiDunLivePersonCertifyService.java | 28 - .../aliyun/FinancialFaceVerify.java | 74 - .../aliyun/FinancialFaceVerifyClient.java | 103 -- .../chat/PublicChatTopRecordService.java | 46 - .../impl/PublicChatTopRecordServiceImpl.java | 321 ---- .../exchange/WithdrawAccountService.java | 15 - .../exchange/WithdrawRecordService.java | 15 - .../service/exchange/WithdrawService.java | 190 --- .../gamepartner/GamePartnerInfoService.java | 132 -- .../gamepartner/GamePartnerOrderService.java | 47 - .../gamepartner/GamePartnerUserService.java | 84 - .../UserGamePartnerInfoService.java | 115 -- .../gamepartner/UserGamePartnerService.java | 64 - .../impl/GamePartnerOrderServiceImpl.java | 106 -- .../service/mycard/MyCardBizService.java | 49 - .../mycard/impl/MyCardBizServiceImpl.java | 316 ---- .../NewUserSayHelloChannelService.java | 387 ----- .../NewUserStartRecordService.java | 24 - .../service/newbie/NewUserService.java | 80 - .../newbie/NewbieMessageRecordService.java | 32 - .../service/newbie/NewbieMessageService.java | 47 - .../service/newbie/NewbiePoolService.java | 357 ----- .../NewUserInRoomGiftRecordService.java | 49 - .../newuser/NewUserInRoomGiftService.java | 120 -- .../official/OfficialBrowseRecordService.java | 12 - .../official/OfficialClickRecordService.java | 12 - .../official/OfficialConfigService.java | 28 - .../impl/OfficialBrowseRecordServiceImpl.java | 18 - .../impl/OfficialClickRecordServiceImpl.java | 18 - .../impl/OfficialConfigServiceImpl.java | 170 -- .../service/purse/UserPurseService.java | 5 - .../service/room/RoomSearchLogService.java | 63 - .../room/impl/BlindDateServiceImpl.java | 17 +- .../room/impl/PushRoomServiceImpl.java | 4 +- .../service/user/TopicBoxItemService.java | 66 - .../service/user/TopicBoxMsgService.java | 200 --- .../service/user/UserDetailsService.java | 4 - .../service/user/UserYearReportService.java | 63 - .../business/service/user/UsersService.java | 13 +- .../impl/UserSignRecordServiceImpl.java | 8 - .../service/vip/VipDiamondOpenService.java | 2 - .../service/withdraw/ExchangeRateService.java | 25 - .../service/withdraw/SmsWithdrawService.java | 20 - .../withdraw/WithdrawAccountDtlService.java | 23 - .../withdraw/WithdrawConfigService.java | 12 - .../withdraw/WithdrawUserAccountService.java | 59 - .../withdraw/WithdrawUserLimitService.java | 19 - .../withdraw/WithdrawUserRecordService.java | 42 - .../service/withdraw/WithdrawUserService.java | 20 - .../impl/ExchangeRateServiceImpl.java | 50 - .../withdraw/impl/SmsWithdrawServiceImpl.java | 50 - .../impl/WithdrawAccountDtlServiceImpl.java | 89 -- .../impl/WithdrawConfigServiceImpl.java | 18 - .../impl/WithdrawUserAccountServiceImpl.java | 342 ----- .../impl/WithdrawUserLimitServiceImpl.java | 39 - .../impl/WithdrawUserRecordServiceImpl.java | 37 - .../impl/WithdrawUserServiceImpl.java | 42 - .../sqlmappers/ActCallBattleMapper.xml | 165 -- .../ActCallBattlePreWarningMapper.xml | 26 - .../sqlmappers/ActivityConfigMapper.xml | 173 --- .../sqlmappers/AdminPictureMapper.xml | 275 ---- .../sqlmappers/ChannelDistributeMapper.xml | 261 ---- .../ChannelDistributeMapperExpand.xml | 98 -- .../ChargeActivityVisitLogMapper.xml | 259 ---- .../sqlmappers/ExchangeRateMapper.xml | 7 - .../FinanceGoldDiamondDetailMapper.xml | 277 ---- .../FinanceGoldDiamondDetailMapperExpand.xml | 31 - .../sqlmappers/FinanceGoldDiamondMapper.xml | 324 ---- .../sqlmappers/FinanceTypeConfigMapper.xml | 229 --- .../sqlmappers/GamePartnerInfoMapper.xml | 4 - .../sqlmappers/GamePartnerOrderMapper.xml | 65 - .../sqlmappers/LuckySeaActMapper.xml | 122 -- .../sqlmappers/LuckySeaPreWarningMapper.xml | 35 - .../sqlmappers/NewUserInRoomGiftMapper.xml | 8 - .../sqlmappers/NewbieMessageMapper.xml | 11 - .../accompany/sqlmappers/NewbiePoolMapper.xml | 19 - .../sqlmappers/OfficialBrowseRecordMapper.xml | 5 - .../sqlmappers/OperationActMapper.xml | 229 --- .../sqlmappers/OperationSmsRecordMapper.xml | 277 ---- .../sqlmappers/PkActRecordMapper.xml | 208 --- .../sqlmappers/PkActRecordMapperMgr.xml | 15 - .../sqlmappers/RoomSearchLogMapper.xml | 5 - .../accompany/sqlmappers/TitleMapper.xml | 270 ---- .../sqlmappers/TopicBoxItemMapper.xml | 253 --- .../sqlmappers/TopicBoxMsgMapper.xml | 214 --- .../sqlmappers/UserCertifyRecordMapper.xml | 397 ----- .../UserCertifyRecordMapperExpand.xml | 7 - .../sqlmappers/UserGamePartnerInfoMapper.xml | 9 - .../sqlmappers/UserGamePartnerMapper.xml | 13 - .../accompany/sqlmappers/WebConfigMapper.xml | 178 --- .../WithDrawPacketCashProdMapper.xml | 137 -- .../sqlmappers/WithdrawAccountDtlMapper.xml | 4 - .../sqlmappers/WithdrawConfigMapper.xml | 4 - .../sqlmappers/WithdrawUserAccountMapper.xml | 4 - .../sqlmappers/WithdrawUserLimitMapper.xml | 4 - .../sqlmappers/WithdrawUserMapper.xml | 4 - .../sqlmappers/WithdrawUserRecordMapper.xml | 71 - .../business/config/WebMVCConfig.java | 2 - .../ChannelDistributeController.java | 37 - .../controller/GreetMsgController.java | 42 - .../controller/HealthCheckController.java | 22 - .../business/controller/SearchController.java | 14 +- .../business/controller/TestGetPubKey.java | 44 - .../controller/WebConfigController.java | 36 - .../activities/ActCallBattleController.java | 125 -- .../ActSingleRoomRankController.java | 40 - .../ActivitiesLuckySeaController.java | 153 -- .../activities/PageActivityController.java | 39 - .../activity/ActivityConfigController.java | 47 - .../activity/CarActivityController.java | 25 - .../ChargeActivityVisitLogController.java | 56 - .../activity/OperationActController.java | 53 - .../controller/apppay/MyCardController.java | 100 -- .../UserCertificationController.java | 255 --- .../charge/ChargeRecordController.java | 35 - .../chat/PublicChatTopRecordController.java | 66 - .../GoldExchangeDiamondController.java | 19 - .../exchange/WithdrawController.java | 62 - .../GamePartnerInfoController.java | 35 - .../GamePartnerOrderController.java | 83 - .../GamePartnerUserController.java | 40 - .../controller/gift/GiftV2Controller.java | 30 - .../controller/help/AliYunController.java | 72 - .../controller/help/AppStoreController.java | 92 -- .../controller/index/IndexController.java | 20 - .../live/LiveAttestationController.java | 11 +- .../newUserStart/NewUserStartController.java | 78 - .../controller/newbie/NewUserController.java | 40 - .../controller/newbie/NewbieController.java | 93 -- .../official/OfficialController.java | 52 - .../phone/PhoneAuthApplyRecordController.java | 66 - .../phone/PhoneAuthRecordController.java | 20 - .../room/RoomBlindDateController.java | 6 - .../controller/room/RoomController.java | 4 +- .../user/TopicBoxItemController.java | 38 - .../user/TopicBoxMsgController.java | 65 - .../user/UserYearReportController.java | 33 - .../withdraw/SmsWithdrawController.java | 58 - .../WithdrawAccountDtlController.java | 45 - .../WithdrawUserAccountController.java | 101 -- .../withdraw/WithdrawUserController.java | 41 - .../listener/ApplicationInitListener.java | 30 - .../servicetest/LuckySeaActServiceTest.java | 45 - .../consumer/MyCardChargeMessageConsumer.java | 74 - .../activity/ActCallBattlePreWarningTask.java | 47 - .../task/activity/ActCallBattleTask.java | 191 --- .../task/activity/LuckySeaActTask.java | 257 ---- .../task/activity/LuckySeaPreWarningTask.java | 30 - .../scheduler/task/chat/PublicChatTask.java | 25 - .../task/newbie/NewbiePoolUpdateTask.java | 42 - .../scheduler/config/BeanConfig.java | 22 - 938 files changed, 33 insertions(+), 75653 deletions(-) delete mode 100644 accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/ChannelDistributeSearchDto.java delete mode 100644 accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/TopLineRequestDto.java delete mode 100644 accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/batch/FlowDataBatchSearchDetailAdminDto.java delete mode 100644 accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/batch/FlowDataBatchSearchGrowAdminDto.java delete mode 100644 accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/gamepartner/GamePartnerOrderAdminDto.java delete mode 100644 accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/withdraw/WithdrawUserAdminDto.java delete mode 100644 accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/withdraw/WithdrawUserLimitAdminDto.java delete mode 100644 accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/withdraw/WithdrawUserLimitExportDto.java delete mode 100644 accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/withdraw/WithdrawUserRecordAdminDto.java delete mode 100644 accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/model/AdminDict.java delete mode 100644 accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/model/AdminDictExample.java delete mode 100644 accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/model/AdminDictKey.java delete mode 100644 accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/model/batch/FlowDataBatchSearch.java delete mode 100644 accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/params/ActCallBattleItemSaveReqParams.java delete mode 100644 accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/params/LuckySeaItemSaveReqParams.java delete mode 100644 accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/OperationSmsRecordVo.java delete mode 100644 accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/PhoneAuthApplyRecordExcelVo.java delete mode 100644 accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/UserCertifyRecordVo.java delete mode 100644 accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/apply/PhoneAuthApplyRecordAdminVo.java delete mode 100644 accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/batch/FlowDataBatchSearchAdminVo.java delete mode 100644 accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/batch/FlowDataBatchSearchGrowAdminVo.java delete mode 100644 accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/callbattle/ActCallBattleAdminRecordVo.java delete mode 100644 accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/callbattle/ActCallBattleAdminRoundDetailVo.java delete mode 100644 accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/callbattle/ActCallBattleAdminUserDrawRecord.java delete mode 100644 accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/callbattle/ActCallBattlePlatformStatVo.java delete mode 100644 accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/gamepartner/GamePartnerOrderDayAdminVo.java delete mode 100644 accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/gamepartner/GamePartnerOrderDayDetailAdminVo.java delete mode 100644 accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/gamepartner/UserGamePartnerInfoAdminVo.java delete mode 100644 accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/luckysea/LuckySeaActAdminRecordVo.java delete mode 100644 accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/luckysea/LuckySeaActAdminRoundDetailVo.java delete mode 100644 accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/luckysea/LuckySeaActAdminUserDrawRecord.java delete mode 100644 accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/luckysea/LuckySeaActPlatformStatVo.java delete mode 100644 accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/luckysea/LuckySeaItemGroupAdminVo.java delete mode 100644 accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/official/OfficialBrowseCountVo.java delete mode 100644 accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/withdraw/WithdrawAccountAdminVo.java delete mode 100644 accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/withdraw/WithdrawBlockVo.java delete mode 100644 accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/withdraw/WithdrawConfigAdminVo.java delete mode 100644 accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/withdraw/WithdrawRecordAdminVo.java delete mode 100644 accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/withdraw/WithdrawUserAdminVo.java delete mode 100644 accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/withdraw/WithdrawUserLimitAdminVo.java delete mode 100644 accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/withdraw/WithdrawUserRecordAdminVo.java delete mode 100644 accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/withdraw/WithdrawVo.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/AdminDictMapper.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/LuckySeaActAdminMapper.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/OperationSmsRecordMapperExpand.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/WithdrawBlockMapperExpand.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/batch/FlowDataBatchSearchAdminMapper.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/batch/FlowDataBatchSearchMapper.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/callbattle/ActCallBattleAdminMapper.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/gamepartner/GamePartnerOrderAdminMapper.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/official/OfficialRecordAdminMapper.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/withdraw/WithdrawUserLimitAdminMapper.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/ChannelDistributeAdminService.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/ActCallBattleAdminService.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/LuckySeaActAdminService.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/OperationActAdminService.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/StaticActivityPageService.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/impl/ActCallBattleAdminServiceImpl.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/impl/LuckySeaActAdminServiceImpl.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/batch/FlowDataBatchSearchAdminService.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/batch/FlowDataBatchSearchService.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/batch/impl/FlowDataBatchSearchAdminServiceImpl.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/batch/impl/FlowDataBatchSearchServiceImpl.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/finance/FinanceAdminService.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gamepartner/GamePartnerOrderAdminService.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gamepartner/UserGamePartnerInfoAdminService.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gamepartner/impl/GamePartnerOrderAdminServiceImpl.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/official/OfficialBrowseRecordAdminService.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/official/OfficialConfigAdminService.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/official/impl/OfficialBrowseRecordAdminServiceImpl.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/official/impl/OfficialConfigAdminServiceImpl.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/sms/OperationSmsAdminService.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/system/AdminDictService.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/system/AdminPictureService.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/PhoneAuthApplyRecordAdiminService.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/TopicBoxItemAdminService.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/UserCertifyRecordAdminService.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/WithdrawAdminService.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/ExchangeRateAdminService.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/WithdrawAccountAdminService.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/WithdrawAccountDtlAdminService.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/WithdrawApplyAdminService.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/WithdrawBlockAdminService.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/WithdrawConfigAdminService.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/WithdrawUserAdminService.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/WithdrawUserLimitAdminService.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/WithdrawUserRecordAdminService.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/impl/ExchangeRateAdminServiceImpl.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/impl/WithdrawAccountDtlAdminServiceImpl.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/impl/WithdrawUserAdminServiceImpl.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/impl/WithdrawUserLimitAdminServiceImpl.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/impl/WithdrawUserRecordAdminServiceImpl.java delete mode 100644 accompany-admin/accompany-admin-service/src/main/resources/mapper/ActCallBattleAdminMapper.xml delete mode 100644 accompany-admin/accompany-admin-service/src/main/resources/mapper/AdminDictMapper.xml delete mode 100644 accompany-admin/accompany-admin-service/src/main/resources/mapper/FlowDataBatchSearchAdminMapper.xml delete mode 100644 accompany-admin/accompany-admin-service/src/main/resources/mapper/FlowDataBatchSearchMapper.xml delete mode 100644 accompany-admin/accompany-admin-service/src/main/resources/mapper/GamePartnerOrderAdminMapper.xml delete mode 100644 accompany-admin/accompany-admin-service/src/main/resources/mapper/LuckySeaActAdminMapper.xml delete mode 100644 accompany-admin/accompany-admin-service/src/main/resources/mapper/OfficialRecordAdminMapper.xml delete mode 100644 accompany-admin/accompany-admin-service/src/main/resources/mapper/OperationSmsRecordMapperExpand.xml delete mode 100644 accompany-admin/accompany-admin-service/src/main/resources/mapper/WithdrawBlockMapper.xml delete mode 100644 accompany-admin/accompany-admin-service/src/main/resources/mapper/WithdrawBlockMapperExpand.xml delete mode 100644 accompany-admin/accompany-admin-service/src/main/resources/mapper/WithdrawUserLimitAdminMapper.xml delete mode 100644 accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/ChannelDistributeAdminController.java delete mode 100644 accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/ActCallBattleAdminController.java delete mode 100644 accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/LuckySeaActAdminController.java delete mode 100644 accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/OperationActAdminController.java delete mode 100644 accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/StaticActivityPageController.java delete mode 100644 accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/batch/FlowDataBatchSearchAdminController.java delete mode 100644 accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/charge/MyCardAdminController.java delete mode 100644 accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/gamepartner/GamePartnerInfoAdminController.java delete mode 100644 accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/gamepartner/GamePartnerOrderAdminController.java delete mode 100644 accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/gamepartner/UserGamePartnerInfoAdminController.java delete mode 100644 accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/gift/NewUserGiftAdminController.java delete mode 100644 accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/newUserStart/NewUserSayHelloChannelAdminController.java delete mode 100644 accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/official/OfficialBrowseRecordAdminController.java delete mode 100644 accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/official/OfficialConfigAdminController.java delete mode 100644 accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/sms/OperationSmsAdminController.java delete mode 100644 accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/AdminDictController.java delete mode 100644 accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/AdminPictureController.java delete mode 100644 accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/UserLevelCharmFixController.java delete mode 100644 accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/PhoneAuthApplyRecordAdminController.java delete mode 100644 accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/TopicBoxItemAdminController.java delete mode 100644 accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/UserCertifyRecordAdminController.java delete mode 100644 accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/ExchangeRateAdminController.java delete mode 100644 accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawAccountAdminController.java delete mode 100644 accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawAccountDtlAdminController.java delete mode 100644 accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawAdminController.java delete mode 100644 accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawApplyAdminController.java delete mode 100644 accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawBlockAdminController.java delete mode 100644 accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawConfigAdminController.java delete mode 100644 accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawUserAdminController.java delete mode 100644 accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawUserLimitAdminController.java delete mode 100644 accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawUserRecordAdminController.java delete mode 100644 accompany-base/accompany-basic/accompany-basic-sdk/src/main/java/com/accompany/core/model/phone/PhoneAuthApplyRecord.java delete mode 100644 accompany-base/accompany-basic/accompany-basic-sdk/src/main/java/com/accompany/core/model/phone/PhoneAuthRecord.java delete mode 100644 accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/mybatismapper/PhoneAuthApplyRecordMapper.java delete mode 100644 accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/mybatismapper/PhoneAuthRecordMapper.java delete mode 100644 accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/mybatismapper/SysConfMapper.java delete mode 100644 accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/service/phone/PhoneAuthApplyRecordService.java delete mode 100644 accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/service/phone/PhoneAuthRecordService.java delete mode 100644 accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/service/phone/impl/PhoneAuthApplyRecordServiceImpl.java delete mode 100644 accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/service/phone/impl/PhoneAuthRecordServiceImpl.java delete mode 100644 accompany-base/accompany-basic/accompany-basic-service/src/main/resources/sqlmappers/PhoneAuthApplyRecordMapper.xml delete mode 100644 accompany-base/accompany-basic/accompany-basic-service/src/main/resources/sqlmappers/PhoneAuthRecordMapper.xml delete mode 100644 accompany-base/accompany-basic/accompany-basic-service/src/main/resources/sqlmappers/SysConfMapper.xml delete mode 100644 accompany-base/accompany-common/src/main/java/com/accompany/common/constant/ExtendsAttach.java delete mode 100644 accompany-base/accompany-common/src/main/java/com/accompany/common/utils/AssertUtil.java delete mode 100644 accompany-base/accompany-common/src/main/java/com/accompany/common/utils/CommonCheckSumBuilder.java delete mode 100644 accompany-base/accompany-common/src/main/java/com/accompany/common/utils/GameUtil.java delete mode 100644 accompany-base/accompany-common/src/main/java/com/accompany/common/utils/MoneyUtil.java delete mode 100644 accompany-base/accompany-common/src/main/java/com/accompany/common/utils/Snowflake.java delete mode 100644 accompany-base/accompany-core/src/main/java/com/accompany/common/config/AliYunFinancialFaceConfig.java delete mode 100644 accompany-base/accompany-core/src/main/java/com/accompany/common/config/AliyunConfig.java delete mode 100644 accompany-base/accompany-core/src/main/java/com/accompany/common/config/AliyunRPCertifyConfig.java delete mode 100644 accompany-base/accompany-core/src/main/java/com/accompany/common/constant/ActRankTypeEnum.java delete mode 100644 accompany-base/accompany-core/src/main/java/com/accompany/common/constant/ActTypeEnum.java delete mode 100644 accompany-base/accompany-core/src/main/java/com/accompany/common/constant/PaymentConstant.java delete mode 100644 accompany-base/accompany-core/src/main/java/com/accompany/common/model/GamePlayer.java delete mode 100644 accompany-base/accompany-core/src/main/java/com/accompany/common/support/BeanSelfAware.java delete mode 100644 accompany-base/accompany-core/src/main/java/com/accompany/common/support/InjectBeanSelfBeanPostProcessor.java delete mode 100644 accompany-base/accompany-core/src/main/java/com/accompany/common/utils/AccounUtil.java delete mode 100644 accompany-base/accompany-core/src/main/java/com/accompany/core/annotation/LogTime.java delete mode 100644 accompany-base/accompany-core/src/main/java/com/accompany/core/annotation/LogTimeAspect.java delete mode 100644 accompany-base/accompany-core/src/main/java/com/accompany/core/dto/SysConfDto.java delete mode 100644 accompany-base/accompany-core/src/main/java/com/accompany/core/model/SysConfExample.java delete mode 100644 accompany-base/accompany-core/src/main/resources/META-INF/spring.factories delete mode 100644 accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/constant/PayChannelConstant.java delete mode 100644 accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/BaseResult.java delete mode 100644 accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/dto/CallbackDto.java delete mode 100644 accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/dto/ReplenishDto.java delete mode 100644 accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/enums/PaymentTypeEnum.java delete mode 100644 accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/params/AuthCodeParam.java delete mode 100644 accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/params/AuthGlobalParam.java delete mode 100644 accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/params/FacServiceIdParam.java delete mode 100644 accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/resp/AuthGlobalResp.java delete mode 100644 accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/resp/ItemResp.java delete mode 100644 accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/resp/PayItemQueryResp.java delete mode 100644 accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/resp/PaymentTypeResp.java delete mode 100644 accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/resp/QueryOrderResp.java delete mode 100644 accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/resp/TradeQueryResp.java delete mode 100644 accompany-base/accompany-payment/accompany-payment-service/src/main/java/com/accompany/payment/mycard/MyCardService.java delete mode 100644 accompany-base/accompany-payment/accompany-payment-service/src/main/java/com/accompany/payment/mycard/config/MyCardConfig.java delete mode 100644 accompany-base/accompany-payment/accompany-payment-service/src/main/java/com/accompany/payment/strategy/MyCardStrategy.java delete mode 100644 accompany-base/accompany-sms/accompany-sms-sdk/src/main/java/com/accompany/sms/config/AliyunSmsConfig.java delete mode 100644 accompany-base/accompany-sms/accompany-sms-sdk/src/main/java/com/accompany/sms/result/AliyunSmsRet.java delete mode 100644 accompany-base/accompany-sms/accompany-sms-service/src/main/java/com/accompany/sms/service/AliyunSmsService.java delete mode 100644 accompany-base/accompany-sms/accompany-sms-service/src/main/java/com/accompany/sms/strategy/AliYunSmsStrategy.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/annual/AnnualCpDao.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/annual/AnnualTaskDao.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/christmas/ChristmasCpDao.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/christmas/ChristmasFirstLetterNumDao.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/christmas/ChristmasFourthLetterNumDao.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/christmas/ChristmasLetterDao.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/christmas/ChristmasLetterNumDao.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/christmas/ChristmasSecondLetterNumDao.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/christmas/ChristmasThirdLetterNumDao.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/christmas/ChristmasTicketTaskDao.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/doubleeleven/DoubleElevenTaskDao.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/halloween/HalloweenBoxLevelDao.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/halloween/HalloweenCandyNumDao.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/halloween/HalloweenMapPosDao.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/halloween/HalloweenTicketTaskDao.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/mapper/DoubleElevenTaskRecordDao.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/mapper/HalloweenDrawBoxRecordDao.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/mapper/HalloweenDrawRecordDao.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/mapper/HalloweenTaskRecordDao.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/mapper/MidAutumnDrawRecordDao.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/mapper/MidAutumnJackpotContributionDao.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/mapper/MidAutumnTaskRecordDao.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/mapper/QixiRankDao.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/mapper/QixiRedLineRecordDao.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/midautumn/MidAutumnMoonCakeNumDao.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/midautumn/MidAutumnTicketTaskDao.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/qixi/QixiRedBagDao.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/qixi/QixiRedLineNumDao.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/qixi/QixiXiqueNumDao.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/qixi/QixiXiqueTaskDao.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/valentine/ValentinesCpDao.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/resources/com/accompany/business/mapper/DoubleElevenTaskRecordDao.xml delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/resources/com/accompany/business/mapper/HalloweenDrawBoxRecordDao.xml delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/resources/com/accompany/business/mapper/HalloweenDrawRecordDao.xml delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/resources/com/accompany/business/mapper/HalloweenTaskRecordDao.xml delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/resources/com/accompany/business/mapper/MidAutumnDrawRecordDao.xml delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/resources/com/accompany/business/mapper/MidAutumnJackpotContributionDao.xml delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/resources/com/accompany/business/mapper/MidAutumnTaskRecordDao.xml delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/resources/com/accompany/business/mapper/QixiRankDao.xml delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/resources/com/accompany/business/mapper/QixiRedLineRecordDao.xml delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/annual/AnnualCpRankTask.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/annual/AnnualPopularRankTask.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/annual/AnnualRoomRankTask.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/annual/AnnualTyrantRankTask.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/christmas/ChristmasRankTask.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/doubleeleven/DoubleElevenRankTask.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/exp/ExpBattleRankTask.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/halloween/HalloweenRankTask.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/midautumn/MidAutumnJackpotTask.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/midautumn/MidAutumnRankTask.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/qixi/QixiRankTask.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/special/SpecialRankTask.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/valentines/ValentinesCpRankTask.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/activity/constant/ValentinesDayConstant.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/annual/constant/AnnualConstant.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/annual/constant/AnnualGiftRankTypeEnum.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/annual/dto/AnnualGiftRankActConfigDto.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/annual/dto/AnnualPopularConfigDto.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/annual/dto/AnnualRoomConfigDto.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/annual/dto/AnnualTaskConfigDto.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/annual/vo/AnnualPopularHourRankVo.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/annual/vo/AnnualPopularRankItemVo.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/annual/vo/AnnualRoomPkInfoVo.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/annual/vo/AnnualRoomRankVo.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/annual/vo/AnnualTaskVo.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/children/dto/ChildrenDayConfigDto.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/children/vo/ChildrenDayTaskVo.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/children/vo/ChildrenDrawRewardVo.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/christmas/constant/ChristmasConstant.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/christmas/dto/ChristmasCpProp.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/christmas/dto/ChristmasCpRankActConfigDto.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/christmas/dto/ChristmasCpUserProp.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/christmas/dto/ChristmasLetterActConfigDto.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/christmas/dto/ChristmasLetterDto.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/christmas/vo/ChristmasCpUserPropVo.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/christmas/vo/ChristmasCpVo.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/christmas/vo/ChristmasLetterConfigVo.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/christmas/vo/ChristmasLetterVo.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/crossroompk/dto/CrossRoomPkActConfigDto.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/doubleeleven/constant/DoubleElevenConstant.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/doubleeleven/dto/DoubleElevenRankConfigDto.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/doubleeleven/dto/DoubleElevenTaskConfigDto.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/doubleeleven/model/DoubleElevenTaskRecord.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/doubleeleven/vo/DoubleElevenTaskConfigVo.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/exp/constant/ExpBattleActConstant.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/exp/dto/ExpBattleActConfigDto.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/exp/vo/ExpBattleActUserVo.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/exp/vo/ExpBattleActVo.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/fools/vo/AprilFoolsDayRoomVo.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/constant/HalloweenConstant.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/dto/HalloweenDrawConfigDto.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/dto/HalloweenRankConfigDto.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/dto/HalloweenTaskConfigDto.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/model/HalloweenDrawBoxRecord.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/model/HalloweenDrawUserRecord.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/model/HalloweenTaskRecord.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/vo/HalloweenDrawConfigVo.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/vo/HalloweenDrawResultVo.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/vo/HalloweenDrawUserRecordVo.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/vo/HalloweenTaskConfigVo.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/luckyprocessbar/constant/LuckyProcessBarConstant.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/luckyprocessbar/dto/LuckyProcessBarConfigDto.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/luckyprocessbar/model/LuckyProcessBarRewardRecord.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/luckyprocessbar/vo/LuckyProcessBarConfigVo.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/constant/MidAutumnConstant.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/dto/MidAutumnDrawConfigDto.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/dto/MidAutumnJackpotConfig.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/dto/MidAutumnRankConfigDto.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/dto/MidAutumnTaskConfigDto.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/model/MidAutumnDrawUserRecord.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/model/MidAutumnJackpotContribution.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/model/MidAutumnTaskRecord.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/vo/MidAutumnDrawConfigVo.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/vo/MidAutumnDrawUserRecordVo.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/vo/MidAutumnJackpotConfigVo.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/vo/MidAutumnJackpotRecordVo.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/vo/MidAutumnTaskConfigVo.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/constant/QixiConstant.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/dto/QixiRankConfigDto.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/dto/QixiRedLineConfigDto.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/dto/QixiRoomRankConfigDto.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/dto/QixiUserRedBagDto.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/dto/QixiXiqueConfigDto.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/entity/QixiRankHourCp.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/entity/QixiRedLineUserRecord.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/model/QixiRankHourCp.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/model/QixiRedLineUserRecord.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/vo/QixiRankHourCpVo.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/vo/QixiRedLineConfigVo.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/vo/QixiRedLineUserRecordVo.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/vo/QixiXiqueConfigVo.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/snooker/constant/SnookerActConstant.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/snooker/dto/SnookerActConfigDto.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/valentine/constant/ValentinesConstant.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/valentine/dto/ValentinesCpUserProp.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/valentine/vo/ValentinesCpRankVo.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualCpRankGiftListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualGiftRankGiftListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualPopularRankGiftListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualRoomRankChatListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualRoomRankGiftListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualTaskGiftListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualTyrantRankGiftListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualTyrantStayRoomListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualCpRankService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualCpUsersRankObjectProvider.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualGiftRankService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualPopularHourRankService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualPopularRankService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualRoomRankService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualTaskService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualTyrantRankService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/children/handler/LimitGift61ForReceiveHandler.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/children/handler/LimitGift61ForSendHandler.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/children/listener/KeepTimeTaskListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/children/listener/LoginTaskListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/children/listener/MiniGameForBaiShunTaskListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/children/listener/UserFollowTaskListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/children/listener/UserPromiseStarTaskListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/children/service/ChildrenDayGardenService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/children/service/ChildrenDayTaskService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/listener/ChristmasCpRankGiftListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/listener/ChristmasCpRewardGiftListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/listener/ChristmasLetterTaskGiftListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/listener/ChristmasRankGiftListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/service/ChristmasCpRankService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/service/ChristmasCpService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/service/ChristmasCpUsersRankObjectProvider.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/service/ChristmasLetterService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/service/ChristmasRankService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/crossroompk/listener/SingleCrossRoomPkActListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/crossroompk/service/SingleCrossRoomPkRankService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/crossroompk/service/SingleCrossRoomPkTaskService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/doubleeleven/listener/DoubleElevenRankGiftListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/doubleeleven/listener/DoubleElevenTaskGiftListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/doubleeleven/service/DoubleElevenRankService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/doubleeleven/service/DoubleElevenTaskRecordService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/doubleeleven/service/DoubleElevenTaskService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/exp/listener/ExpBattleRankGiftListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/exp/service/ArabExpBattleRankService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/exp/service/ChineseExpBattleRankService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/exp/service/EnglishExpBattleRankService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/exp/service/ExpBattleActService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/exp/service/ExpBattleRankService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/handler/AprilFoolsDayBoxHandler.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/handler/AprilFoolsDayRoomHandler.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/listener/AprilFoolsDayRoomRemainZeroListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/listener/AprilFoolsDayRoomTimeOutBackListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/listener/AprilFoolsDayRoomTimeOutListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/service/AprilFoolsDayRoomService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/task/AprilFoolsDayBoxTaskService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/listener/HalloweenDrawBoxGiftListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/listener/HalloweenDrawBoxLuckyBagListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/listener/HalloweenRankGiftListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/listener/HalloweenTaskGiftListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/listener/HalloweenTaskLuckyBagListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/listener/HalloweenTaskLuckySeaListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/listener/HalloweenTaskStayRoomListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenDrawBoxRecordService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenDrawBoxService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenDrawHighRewardService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenDrawLowRewardService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenDrawMagicRewardService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenDrawMiddleRewardService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenDrawRecordService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenDrawRewardService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenDrawService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenRankService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenTaskRecordService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenTaskService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/hotlove/handler/ActHotLoveForReceiveHandler.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/hotlove/handler/ActHotLoveForSendHandler.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/hotlove/service/ActHotLoveService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/luckyprocessbar/listener/LuckyProcessBarGiftListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/luckyprocessbar/service/LuckyProcessBarRewardRecordService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/luckyprocessbar/service/LuckyProcessBarService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/listener/MidAutumnJackpotFindLoveDrawListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/listener/MidAutumnJackpotLuckyBagListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/listener/MidAutumnRankGiftListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/listener/MidAutumnTaskDynamicListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/listener/MidAutumnTaskFindLoveDrawListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/listener/MidAutumnTaskGiftListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/listener/MidAutumnTaskLuckyBagListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/service/MidAutumnDrawRecordService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/service/MidAutumnDrawRewardService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/service/MidAutumnDrawService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/service/MidAutumnJackpotCalculateService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/service/MidAutumnJackpotCalculateTestService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/service/MidAutumnJackpotService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/service/MidAutumnRankService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/service/MidAutumnTaskRecordService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/service/MidAutumnTaskService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/event/QixiXiqueAddEvent.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/listener/QixiRankGiftListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/listener/QixiRedLineXiqueListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/listener/QixiRoomRankGiftListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/listener/QixiXiqueGiftListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/listener/QixiXiqueRoomChatListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/listener/QixiXiqueStayRoomListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/service/QixiRankService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/service/QixiRedLineDrawService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/service/QixiRedLineService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/service/QixiRoomRankService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/service/QixiXiqueService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/signin/handler/RepairSignInHandler.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/signin/service/ActSignInService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/snooker/listener/SnookerRankMiniGameListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/snooker/service/SnookerRankService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/special/listener/SpecialGiftRankListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/special/service/SpecialGiftRankService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/valentine/handler/ValentinesDayBoxHandler.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/valentine/handler/ValentinesDayHighGiftHandler.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/valentine/listener/ValentinesCpRankGiftListener.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/valentine/service/ValentinesCpRankService.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/valentine/service/ValentinesCpUsersRankObjectProvider.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/women/handler/WomenDayLimitGiftReceiveHandler.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/women/handler/WomenDayLimitGiftSendHandler.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/women/handler/WomenDayLoveWingReceiveHandler.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/women/handler/WomenDayLoveWingSendHandler.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/annual/AnnualCpRankController.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/annual/AnnualGiftRankController.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/annual/AnnualPopularRankController.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/annual/AnnualRoomRankController.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/annual/AnnualTaskController.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/annual/AnnualTyrantRankController.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/children/ChildrenDayController.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/christmas/ChristmasCpRankController.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/christmas/ChristmasLetterController.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/christmas/ChristmasRankController.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/crossroompk/SingleCrossRoomPkActController.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/doubleeleven/DoubleElevenRankController.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/doubleeleven/DoubleElevenTaskController.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/exp/ExpBattleActController.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/fools/AprilFoolsDayController.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/halloween/HalloweenDrawController.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/halloween/HalloweenRankController.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/halloween/HalloweenTaskController.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/hotlove/ActHotLoveController.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/luckyprocessbar/LuckyProcessBarController.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/midautumn/MidAutumnDrawController.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/midautumn/MidAutumnJackpotController.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/midautumn/MidAutumnRankController.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/midautumn/MidAutumnTaskController.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/qixi/QixiRankController.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/qixi/QixiRedLineController.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/qixi/QixiRoomRankController.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/qixi/QixiXiqueController.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/signin/ActSignInController.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/snooker/SnookerActRankController.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/special/SpecialGiftRankController.java delete mode 100644 accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/valentines/ValentinesCpRankController.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/withdraw/WithdrawAccountTypeConstant.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/withdraw/WithdrawUserLimitConstant.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/activity/callbattle/ActCallBattleConfig.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/activity/callbattle/ActCallBattleRoomTipConfig.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/activity/luckysea/LuckySeaActUserRoundStatDTO.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/activity/luckysea/LuckySeaTicketConfigDto.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/activity/luckysea/LuckySeaUserDrawResultDto.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/callbattle/ActCallBattleBroadCastDTO.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/callbattle/ActCallBattleGoldPreWarningDTO.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/callbattle/ActCallBattlePreWarningConfig.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/callbattle/ActCallBattleTicketConfig.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/callbattle/ActCallBattleUserDrawResultDto.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/callbattle/ActCallBattleUserRoundStatDTO.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/certification/CertifyInfo.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/certification/FinancialResult.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/exchange/WithdrawConfigDto.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/gamepartner/GameOrderAmountDto.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/luckysea/LuckySeaActConfig.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/luckysea/LuckySeaBroadCastDTO.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/luckysea/LuckySeaGoldPreWarningDTO.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/luckysea/LuckySeaPreWarningConfig.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/withdraw/WithdrawAmountHolder.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/enums/certification/CertTypeEnum.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/enums/withdraw/RecordStatusEnum.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/event/LuckySeaDrawMessageEvent.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/event/gamepartner/GamePartnerFinishEvent.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/event/gamepartner/GamePartnerInviteEvent.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/message/LuckySeaDrawMessage.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/ActivityConfig.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/ActivityConfigExample.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/AdminPicture.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/AdminPictureExample.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/ChannelDistribute.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/ChannelDistributeExample.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/ChargeActivityVisitLog.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/ChargeActivityVisitLogExample.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/FinanceGoldDiamond.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/FinanceGoldDiamondDetail.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/FinanceGoldDiamondDetailExample.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/FinanceGoldDiamondExample.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/FinanceTypeConfig.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/FinanceTypeConfigExample.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/OperationAct.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/OperationActExample.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/OperationSmsRecord.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/OperationSmsRecordExample.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/PkActRecord.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/PkActRecordExample.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/SysConfExample.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/Title.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/TitleExample.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/TopLine.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/TopLineExample.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/TopicBoxItem.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/TopicBoxItemExample.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/TopicBoxItemVo.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/TopicBoxMsg.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/TopicBoxMsgExample.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/TopicRoom.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/TopicRoomExample.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserCertifyRecord.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserCertifyRecordExample.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserYearReport.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/WebConfig.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/WebConfigExample.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/WithdrawAccount.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/WithdrawRecord.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/activity/BigGiftNameplateActivityConfig.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/activity/CarActivityConfig.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/activity/ChildrenActivityConfig.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/activity/PageActivity.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaActInfo.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaDrawItem.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaItem.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaItemGroup.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaRoomTipConfig.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaUserDrawRecord.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaUserDrawResult.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/callbattle/ActCallBattleInfo.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/callbattle/ActCallBattleItem.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/callbattle/ActCallBattleUserDrawRecord.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/callbattle/ActCallBattleUserDrawResult.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/chat/PublicChatTopRecord.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/gamepartner/GamePartnerInfo.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/gamepartner/GamePartnerInfoTag.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/gamepartner/GamePartnerOrder.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/gamepartner/UserGamePartner.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/gamepartner/UserGamePartnerInfo.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/gamepartner/UserGamePartnerInfoTag.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/newUserStart/NewUserSayHelloChannel.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/newbie/NewbieMessage.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/newbie/NewbieMessageRecord.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/newuser/NewUserInRoomGift.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/newuser/NewUserInRoomGiftRecord.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/official/OfficialBrowseRecord.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/official/OfficialClickRecord.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/official/OfficialConfig.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/room/RoomSearchLog.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/withdraw/ExchangeRate.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/withdraw/WithdrawAccountDtl.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/withdraw/WithdrawConfig.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/withdraw/WithdrawUser.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/withdraw/WithdrawUserAccount.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/withdraw/WithdrawUserLimit.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/withdraw/WithdrawUserRecord.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/mybatis/typehandler/GamePartnerInfoTagListTypeHandler.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/mybatis/typehandler/LuckySeaDrawItemListTypeHandler.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/mybatis/typehandler/UserGamePartnerInfoTagListTypeHandler.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/param/ad/AdPlatfromTrackActiveReqParams.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/param/callbattle/ActCallBattleDrawParams.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/param/kuaishou/AdKuaishouTrackActiveReqParams.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activities/DoubleElevenGiftVo.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activities/LuckySeaActInfoVo.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activities/LuckySeaActRoundRankUserVo.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activities/LuckySeaActUserDrawItemVO.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activities/LuckySeaActUserOneRoundDrawResult.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activities/LuckySeaPushMsg.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activities/LuckySeaUserDrawResultVo.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activities/PageActivityVO.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/ActSigningUpVo.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/ActivitySingleRoomRankAward.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/ActivitySingleRoomRankConfig.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/ActivitySingleRoomRankVo.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/ActivityVo.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/AnnualCpRankVo.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/AnnualRankParentVo.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/AnnualRankVo.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/AnnualRoomRankParentVo.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/AnnualRoomRankVo.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/ChristmasTreeActConfigVo.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/ChristmasTreeInfoVo.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/NationalActivityVo.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/PlayMyTeamHonorRankVo.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/PlayTeamHonorRankVo.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/RegisterActivityStatusVo.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/SpecialGiftRulesVo.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/VkissPrizeVo.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/callbattle/ActCallBattleInfoVo.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/callbattle/ActCallBattleRankListVo.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/callbattle/ActCallBattleRankVo.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/callbattle/ActCallBattleRoundStatVo.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/callbattle/ActCallBattleUserDrawItemVO.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/callbattle/ActCallBattleUserDrawRecordVo.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/callbattle/ActCallBattleUserDrawResultVo.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/callbattle/ActCallBattleUserInfo.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/callbattle/ActCallBattleUserOneRoundDrawResult.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/chat/PublicChatTopRecordVo.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/exchange/WithdrawAccountVo.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/gamepartner/GamePartnerOrderVo.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/gamepartner/GamePartnerUserInfoVo.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/gamepartner/UserGamePartnerInfoVo.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/gift/NewUserGift.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/gift/NewUserGiftVo.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/helper/AliyunToken.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/user/UserYearReportVo.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/withdraw/WithdrawAccountDtlVo.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/withdraw/WithdrawUserAccountVo.java delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/withdraw/WithdrawUserRecordVo.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/charge/MyCardChargeListener.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/gamepartner/GamePartnerFinishListener.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/gamepartner/GamePartnerInviteListener.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ActSingleRoomRankMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ActivityConfigMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/AdminPictureMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ChannelDistributeMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ChannelDistributeMapperExpand.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ChargeActivityVisitLogMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/FinanceGoldDiamondDetailMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/FinanceGoldDiamondDetailMapperExpand.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/FinanceGoldDiamondMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/FinanceTypeConfigMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/GetLostUserMapperExpand.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/GreetMsgMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/GreetMsgMapperExpand.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HomeRoomFlowPeriodMapperMgr.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/LostUserMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/OperationActMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/OperationSmsRecordMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/PkActRecordMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/PkActRecordMapperMgr.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/RoomSearchLogMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/SmsTemplateMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/TitleMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/TopicBoxItemMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/TopicBoxMsgMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserCertifyRecordMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserCertifyRecordMapperExpand.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserYearReportMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/WebConfigMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/WithDrawPacketCashProdMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/WithdrawAccountMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/WithdrawRecordMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaActInfoMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaActMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaItemGroupMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaItemMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaPreWarningMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaUserDrawRecordMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaUserDrawResultMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/PageActivityMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/callbattle/ActCallBattleInfoMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/callbattle/ActCallBattleItemMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/callbattle/ActCallBattleMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/callbattle/ActCallBattlePreWarningMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/callbattle/ActCallBattleUserDrawRecordMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/callbattle/ActCallBattleUserDrawResultMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/chat/PublicChatTopRecordMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/flow/FlowTeamMemberBaseMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/gamepartner/GamePartnerInfoMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/gamepartner/GamePartnerOrderMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/gamepartner/UserGamePartnerInfoMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/gamepartner/UserGamePartnerMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/newUserStart/NewUserSayHelloChannelMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/newbie/NewbieMessageMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/newbie/NewbieMessageRecordMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/newbie/NewbiePoolMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/newuser/NewUserInRoomGiftMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/newuser/NewUserInRoomGiftRecordMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/official/OfficialBrowseRecordMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/official/OfficialClickRecordMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/official/OfficialConfigMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/withdraw/ExchangeRateMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/withdraw/WithdrawAccountDtlMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/withdraw/WithdrawConfigMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/withdraw/WithdrawUserAccountMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/withdraw/WithdrawUserLimitMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/withdraw/WithdrawUserMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/withdraw/WithdrawUserRecordMapper.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/AppStoreService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/ChannelDistributeService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/GreetMsgService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/LuckySeaPreWarningService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/WebConfigService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/ActSingleRoomRankService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/ActivitiesLuckySeaService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaActConfigService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaActInfoService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaDrawService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaItemGroupService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaItemService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaRankService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaSettlementService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaStockService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaTicketService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaUserDrawRecordService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaUserDrawResultService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/ActivitiesLuckySeaServiceImpl.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaActConfigServiceImpl.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaActInfoServiceImpl.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaDrawServiceImpl.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaItemGroupServiceImpl.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaItemServiceImpl.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaPushMsgService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaRankServiceImpl.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaSettlementServiceImpl.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaUserDrawRecordServiceImpl.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaUserDrawResultServiceImpl.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/vo/LuckySeaActUserDrawRecordVo.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/vo/LuckySeaActUserInfo.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/vo/LuckySeaRankListVo.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/vo/LuckySeaRankVo.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/ActivityConfigService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/BigGiftNameplateActivityService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/CarActivityService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/ChargeActivityVisitLogService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/OperationActService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/PageActivityService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/PkActivityService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleBizService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleDrawService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleInfoService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleItemService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleMessageService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattlePreWarningService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleStockService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleTicketService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleUserDrawRecordService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleUserDrawResultService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/impl/ActCallBattleBizServiceImpl.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/impl/ActCallBattleInfoServiceImpl.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/impl/ActCallBattleItemServiceImpl.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/impl/ActCallBattleUserDrawRecordServiceImpl.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/impl/ActCallBattleUserDrawResultServiceImpl.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/certification/AbstractCertifyService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/certification/FinancialFaceVerifyService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/certification/RealPeopleCertifyService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/certification/TwoFactorCertifyService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/certification/YiDunLivePersonCertifyService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/certification/aliyun/FinancialFaceVerify.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/certification/aliyun/FinancialFaceVerifyClient.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/chat/PublicChatTopRecordService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/chat/impl/PublicChatTopRecordServiceImpl.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/exchange/WithdrawAccountService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/exchange/WithdrawRecordService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/exchange/WithdrawService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gamepartner/GamePartnerInfoService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gamepartner/GamePartnerOrderService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gamepartner/GamePartnerUserService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gamepartner/UserGamePartnerInfoService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gamepartner/UserGamePartnerService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gamepartner/impl/GamePartnerOrderServiceImpl.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/mycard/MyCardBizService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/mycard/impl/MyCardBizServiceImpl.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/newUserStart/NewUserSayHelloChannelService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/newUserStart/NewUserStartRecordService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/newbie/NewUserService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/newbie/NewbieMessageRecordService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/newbie/NewbieMessageService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/newbie/NewbiePoolService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/newuser/NewUserInRoomGiftRecordService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/newuser/NewUserInRoomGiftService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/official/OfficialBrowseRecordService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/official/OfficialClickRecordService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/official/OfficialConfigService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/official/impl/OfficialBrowseRecordServiceImpl.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/official/impl/OfficialClickRecordServiceImpl.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/official/impl/OfficialConfigServiceImpl.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomSearchLogService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/TopicBoxItemService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/TopicBoxMsgService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserYearReportService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/ExchangeRateService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/SmsWithdrawService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/WithdrawAccountDtlService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/WithdrawConfigService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/WithdrawUserAccountService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/WithdrawUserLimitService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/WithdrawUserRecordService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/WithdrawUserService.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/ExchangeRateServiceImpl.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/SmsWithdrawServiceImpl.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/WithdrawAccountDtlServiceImpl.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/WithdrawConfigServiceImpl.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/WithdrawUserAccountServiceImpl.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/WithdrawUserLimitServiceImpl.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/WithdrawUserRecordServiceImpl.java delete mode 100644 accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/WithdrawUserServiceImpl.java delete mode 100644 accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/ActCallBattleMapper.xml delete mode 100644 accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/ActCallBattlePreWarningMapper.xml delete mode 100644 accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/ActivityConfigMapper.xml delete mode 100644 accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/AdminPictureMapper.xml delete mode 100644 accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/ChannelDistributeMapper.xml delete mode 100644 accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/ChannelDistributeMapperExpand.xml delete mode 100644 accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/ChargeActivityVisitLogMapper.xml delete mode 100644 accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/ExchangeRateMapper.xml delete mode 100644 accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/FinanceGoldDiamondDetailMapper.xml delete mode 100644 accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/FinanceGoldDiamondDetailMapperExpand.xml delete mode 100644 accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/FinanceGoldDiamondMapper.xml delete mode 100644 accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/FinanceTypeConfigMapper.xml delete mode 100644 accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/GamePartnerInfoMapper.xml delete mode 100644 accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/GamePartnerOrderMapper.xml delete mode 100644 accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/LuckySeaActMapper.xml delete mode 100644 accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/LuckySeaPreWarningMapper.xml delete mode 100644 accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/NewUserInRoomGiftMapper.xml delete mode 100644 accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/NewbieMessageMapper.xml delete mode 100644 accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/NewbiePoolMapper.xml delete mode 100644 accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/OfficialBrowseRecordMapper.xml delete mode 100644 accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/OperationActMapper.xml delete mode 100644 accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/OperationSmsRecordMapper.xml delete mode 100644 accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/PkActRecordMapper.xml delete mode 100644 accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/PkActRecordMapperMgr.xml delete mode 100644 accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/RoomSearchLogMapper.xml delete mode 100644 accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/TitleMapper.xml delete mode 100644 accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/TopicBoxItemMapper.xml delete mode 100644 accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/TopicBoxMsgMapper.xml delete mode 100644 accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserCertifyRecordMapper.xml delete mode 100644 accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserCertifyRecordMapperExpand.xml delete mode 100644 accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserGamePartnerInfoMapper.xml delete mode 100644 accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserGamePartnerMapper.xml delete mode 100644 accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/WebConfigMapper.xml delete mode 100644 accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/WithDrawPacketCashProdMapper.xml delete mode 100644 accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/WithdrawAccountDtlMapper.xml delete mode 100644 accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/WithdrawConfigMapper.xml delete mode 100644 accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/WithdrawUserAccountMapper.xml delete mode 100644 accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/WithdrawUserLimitMapper.xml delete mode 100644 accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/WithdrawUserMapper.xml delete mode 100644 accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/WithdrawUserRecordMapper.xml delete mode 100644 accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/ChannelDistributeController.java delete mode 100644 accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/GreetMsgController.java delete mode 100644 accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/HealthCheckController.java delete mode 100644 accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/TestGetPubKey.java delete mode 100644 accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/WebConfigController.java delete mode 100644 accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activities/ActCallBattleController.java delete mode 100644 accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activities/ActSingleRoomRankController.java delete mode 100644 accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activities/ActivitiesLuckySeaController.java delete mode 100644 accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activities/PageActivityController.java delete mode 100644 accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activity/ActivityConfigController.java delete mode 100644 accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activity/CarActivityController.java delete mode 100644 accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activity/ChargeActivityVisitLogController.java delete mode 100644 accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activity/OperationActController.java delete mode 100644 accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/apppay/MyCardController.java delete mode 100644 accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/certification/UserCertificationController.java delete mode 100644 accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/chat/PublicChatTopRecordController.java delete mode 100644 accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/exchange/WithdrawController.java delete mode 100644 accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/gamepartner/GamePartnerInfoController.java delete mode 100644 accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/gamepartner/GamePartnerOrderController.java delete mode 100644 accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/gamepartner/GamePartnerUserController.java delete mode 100644 accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/help/AliYunController.java delete mode 100644 accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/help/AppStoreController.java delete mode 100644 accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/index/IndexController.java delete mode 100644 accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/newUserStart/NewUserStartController.java delete mode 100644 accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/newbie/NewUserController.java delete mode 100644 accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/newbie/NewbieController.java delete mode 100644 accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/official/OfficialController.java delete mode 100644 accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/phone/PhoneAuthApplyRecordController.java delete mode 100644 accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/phone/PhoneAuthRecordController.java delete mode 100644 accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/TopicBoxItemController.java delete mode 100644 accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/TopicBoxMsgController.java delete mode 100644 accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/UserYearReportController.java delete mode 100644 accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/withdraw/SmsWithdrawController.java delete mode 100644 accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/withdraw/WithdrawAccountDtlController.java delete mode 100644 accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/withdraw/WithdrawUserAccountController.java delete mode 100644 accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/withdraw/WithdrawUserController.java delete mode 100644 accompany-business/accompany-business-web/src/main/java/com/accompany/business/listener/ApplicationInitListener.java delete mode 100644 accompany-business/accompany-business-web/src/test/java/servicetest/LuckySeaActServiceTest.java delete mode 100644 accompany-mq/accompany-mq-web/src/main/java/com/accompany/mq/consumer/MyCardChargeMessageConsumer.java delete mode 100644 accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/activity/ActCallBattlePreWarningTask.java delete mode 100644 accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/activity/ActCallBattleTask.java delete mode 100644 accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/activity/LuckySeaActTask.java delete mode 100644 accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/activity/LuckySeaPreWarningTask.java delete mode 100644 accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/chat/PublicChatTask.java delete mode 100644 accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/newbie/NewbiePoolUpdateTask.java delete mode 100644 accompany-scheduler/accompany-scheduler-web/src/main/java/com/accompany/scheduler/config/BeanConfig.java diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/ChannelDistributeSearchDto.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/ChannelDistributeSearchDto.java deleted file mode 100644 index a6ec30795..000000000 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/ChannelDistributeSearchDto.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.accompany.admin.dto; - -import lombok.Data; - -import java.util.Date; - -/** - * ｛这里添加描述｝ - * - * @author fangchengyan - * @date 2020-02-20 2:49 下午 - */ -@Data -public class ChannelDistributeSearchDto { - - private String appId; - - private String channel; - - private Date startTime; - - private Date endTime; - -} diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/TopLineRequestDto.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/TopLineRequestDto.java deleted file mode 100644 index 2ed21c384..000000000 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/TopLineRequestDto.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.accompany.admin.dto; - -import java.util.Date; - -/** - * 后台 头条数据 - */ -public class TopLineRequestDto { - - private Long id; - - private String title; - - // 0 是没有跳转 1是跳转链接 2是房间id - private Integer paramType; - - private String params; - - /** - * 图片 路径 - */ - private String img; - - /** - * 是否发布 - */ - private Boolean publish = false; - - /** - * 发布时间 - */ - private Long publishTime; - - /** - * 发布时间 - */ - private Date publishTimeDate; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getImg() { - return img; - } - - public void setImg(String img) { - this.img = img; - } - - - public boolean isPublish() { - return publish; - } - - public void setPublish(boolean publish) { - this.publish = publish; - } - - public Long getPublishTime() { - return publishTime; - } - - public void setPublishTime(Long publishTime) { - this.publishTime = publishTime; - } - - public Integer getParamType() { - return paramType; - } - - public void setParamType(Integer paramType) { - this.paramType = paramType; - } - - public String getParams() { - return params; - } - - public void setParams(String params) { - this.params = params; - } - - public Date getPublishTimeDate() { - return publishTimeDate; - } - - public void setPublishTimeDate(Date publishTimeDate) { - this.publishTimeDate = publishTimeDate; - } - - - -} diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/batch/FlowDataBatchSearchDetailAdminDto.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/batch/FlowDataBatchSearchDetailAdminDto.java deleted file mode 100644 index f4b10dd1a..000000000 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/batch/FlowDataBatchSearchDetailAdminDto.java +++ /dev/null @@ -1,159 +0,0 @@ -package com.accompany.admin.dto.batch; - -import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; - -import java.math.BigDecimal; - -/** - * @author: liaozetao - * @date: 2023/9/22 18:36 - * @description: - */ -@Data -public class FlowDataBatchSearchDetailAdminDto { - - /** - * 新增时间 - */ - @ExcelProperty("新增时间") - private String signUpTimeStr; - - /** - * 新增归因ID - */ - @ExcelProperty("新增归因ID") - private Long erBanNo; - - /** - * 用户昵称 - */ - @ExcelProperty("用户昵称") - private String nick; - - /** - * 是否进归因房 - */ - @ExcelProperty("是否进归因房") - private String isInRoomStr = "否"; - - /** - * 设备号 - */ - @ExcelProperty("设备号") - private String deviceId; - - /** - * 是否为新设备 - */ - @ExcelProperty("是否为新设备") - private String isNewDevice = "是"; - - /** - * 活动期间私聊行为数 - */ - @ExcelProperty("活动期间私聊行为数") - private Integer chatCount = 0; - - /** - * 新增当天充值 - */ - @ExcelProperty("新增当天充值") - private BigDecimal chargeAmount = BigDecimal.ZERO; - - /** - * 3天充值 - */ - @ExcelProperty("3天充值") - private BigDecimal threeChargeAmount = BigDecimal.ZERO; - - /** - * 7天充值 - */ - @ExcelProperty("7天充值") - private BigDecimal sevenChargeAmount = BigDecimal.ZERO; - - /** - * 15天充值 - */ - @ExcelProperty("15天充值") - private BigDecimal fifteenChargeAmount = BigDecimal.ZERO; - - /** - * 30天充值 - */ - @ExcelProperty("30天充值") - private BigDecimal thirtyChargeAmount = BigDecimal.ZERO; - - /** - * 新增当天收到转赠 - */ - @ExcelProperty("新增当天收到转赠") - private BigDecimal giveDiamondNum = BigDecimal.ZERO; - - /** - * 3天收到转赠 - */ - @ExcelProperty("3天收到转赠") - private BigDecimal threeGiveDiamondNum = BigDecimal.ZERO; - - /** - * 7天收到转赠 - */ - @ExcelProperty("7天收到转赠") - private BigDecimal sevenGiveDiamondNum = BigDecimal.ZERO; - - /** - * 15天收到转赠 - */ - @ExcelProperty("15天收到转赠") - private BigDecimal fifteenGiveDiamondNum = BigDecimal.ZERO; - - /** - * 30天收到转赠 - */ - @ExcelProperty("30天收到转赠") - private BigDecimal thirtyGiveDiamondNum = BigDecimal.ZERO; - - /** - * 累计充值 - */ - @ExcelProperty("累计充值") - private BigDecimal totalChargeAmount = BigDecimal.ZERO; - - /** - * 累计接受转赠钻石 - */ - @ExcelProperty("累计接受转赠钻石") - private BigDecimal totalGiveDiamondNum = BigDecimal.ZERO; - - /** - * 次日是否访问 - */ - @ExcelProperty("次日是否访问") - private Integer isRemain = 0; - - /** - * 第3日是否访问 - */ - @ExcelProperty("第3日是否访问") - private Integer isThreeRemain = 0; - - /** - * 第7日是否访问 - */ - @ExcelProperty("第7日是否访问") - private Integer isSevenRemain = 0; - - /** - * 第15日是否访问 - */ - @ExcelProperty("第15日是否访问") - private Integer isFifteenRemain = 0; - - /** - * 第30日是否访问 - */ - @ExcelProperty("第30日是否访问") - private Integer isThirtyRemain = 0; -} diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/batch/FlowDataBatchSearchGrowAdminDto.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/batch/FlowDataBatchSearchGrowAdminDto.java deleted file mode 100644 index f5f7d3f9c..000000000 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/batch/FlowDataBatchSearchGrowAdminDto.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.accompany.admin.dto.batch; - -import com.alibaba.excel.annotation.ExcelProperty; -import io.swagger.annotations.ApiModel; -import lombok.Data; - -/** - * @author: liaozetao - * @date: 2023/9/23 16:07 - * @description: - */ -@Data -@ApiModel -public class FlowDataBatchSearchGrowAdminDto { - - - /** - * 统计项 - */ - @ExcelProperty("统计项") - private String countItem; - - /** - * 当天情况 - */ - @ExcelProperty("当天情况") - private String currCondition; - - /** - * 次日情况 - */ - @ExcelProperty("次日情况") - private String nextCondition; - - /** - * 3日情况 - */ - @ExcelProperty("3日情况") - private String threeCondition; - - /** - * 7日情况 - */ - @ExcelProperty("7日情况") - private String sevenCondition; - - /** - * 15日情况 - */ - @ExcelProperty("15日情况") - private String fifteenCondition; - - /** - * 30日情况 - */ - @ExcelProperty("30日情况") - private String thirtyCondition; - - /** - * 累计到目前 - */ - @ExcelProperty("累计到目前") - private String totalCondition; -} diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/gamepartner/GamePartnerOrderAdminDto.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/gamepartner/GamePartnerOrderAdminDto.java deleted file mode 100644 index c33dfe27a..000000000 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/gamepartner/GamePartnerOrderAdminDto.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.accompany.admin.dto.gamepartner; - -import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; - -import java.math.BigDecimal; - -/** - * @author: liaozetao - * @date: 2023/8/24 16:51 - * @description: - */ -@Data -public class GamePartnerOrderAdminDto { - - /** - * 订单号 - */ - @ExcelProperty("订单号") - private String orderNo; - - /** - * 下单用户id - */ - @ExcelProperty("下单用户id") - private Long fromErBanNo; - - /** - * 下单用户昵称 - */ - @ExcelProperty("下单用户昵称") - private String fromNick; - - /** - * 接单用户id - */ - @ExcelProperty("接单用户id") - private Long toErBanNo; - - /** - * 接单用户昵称 - */ - @ExcelProperty("接单用户昵称") - private String toNick; - - /** - * 接单用户收益（水晶） - */ - @ExcelProperty("接单用户收益（水晶）") - private BigDecimal income; - - /** - * 下单游戏 - */ - @ExcelProperty("下单游戏") - private String gameName; - - /** - * 下单局数 - */ - @ExcelProperty("下单局数") - private Integer inning; - - /** - * 下单金额 - */ - @ExcelProperty("下单金额") - private BigDecimal amount; - - /** - * 下单时间 - */ - @ExcelProperty("下单时间") - private String orderTime; - -} diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/withdraw/WithdrawUserAdminDto.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/withdraw/WithdrawUserAdminDto.java deleted file mode 100644 index 1538cab9e..000000000 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/withdraw/WithdrawUserAdminDto.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.accompany.admin.dto.withdraw; - -import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; - -/** - * @author: liaozetao - * @date: 2023/7/13 17:20 - * @description: - */ -@Data -public class WithdrawUserAdminDto { - - - /** - * 耳伴号 - */ - @ExcelProperty("Peko号") - private Long erbanNo; - - /** - * 昵称 - */ - @ExcelProperty("昵称") - private String nick; - - /** - * 创建时间 - */ - @ExcelProperty("首次绑定时间") - private String createTimeStr; - - /** - * 提现账户 - */ - @ExcelProperty("提现账户") - private String withdrawAccount; - -} diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/withdraw/WithdrawUserLimitAdminDto.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/withdraw/WithdrawUserLimitAdminDto.java deleted file mode 100644 index 2c6be5dbd..000000000 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/withdraw/WithdrawUserLimitAdminDto.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.accompany.admin.dto.withdraw; - -import com.accompany.business.model.withdraw.WithdrawUserLimit; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author: liaozetao - * @date: 2023/7/10 18:40 - * @description: - */ -@Data -@ApiModel -public class WithdrawUserLimitAdminDto extends WithdrawUserLimit { - - /** - * 耳伴号 - */ - @ApiModelProperty("耳伴号") - private String erbanNo; -} diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/withdraw/WithdrawUserLimitExportDto.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/withdraw/WithdrawUserLimitExportDto.java deleted file mode 100644 index 7984631b4..000000000 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/withdraw/WithdrawUserLimitExportDto.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.accompany.admin.dto.withdraw; - -import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; - -/** - * @author: liaozetao - * @date: 2023/8/3 19:16 - * @description: - */ -@Data -public class WithdrawUserLimitExportDto { - - - /** - * Peko号 - */ - @ExcelProperty("Peko号") - private Long erbanNo; - - /** - * 昵称 - */ - @ExcelProperty("昵称") - private String nick; - - /** - * 所属房间 - */ - @ExcelProperty("所属房间") - private String roomName; - - /** - * 所属房间ID - */ - @ExcelProperty("所属房间ID") - private Long roomErBanNo; - - /** - * 所属公会 - */ - @ExcelProperty("所属公会") - private String hallRoomName; - - /** - * 所属公会ID - */ - @ExcelProperty("所属公会ID") - private Long hallErBanNo; - - /** - * 当前账户金币余额 - */ - @ExcelProperty("当前账户金币余额") - private Double golds; - - /** - * 限制内容 - */ - @ExcelProperty("限制内容") - private String limitContent; - - /** - * 限制时间 - */ - @ExcelProperty("限制时间") - private String limitTimeStr; -} diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/withdraw/WithdrawUserRecordAdminDto.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/withdraw/WithdrawUserRecordAdminDto.java deleted file mode 100644 index c8495d411..000000000 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/withdraw/WithdrawUserRecordAdminDto.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.accompany.admin.dto.withdraw; - -import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; - -import java.math.BigDecimal; - -/** - * @author: liaozetao - * @date: 2023/7/13 17:12 - * @description: - */ -@Data -public class WithdrawUserRecordAdminDto { - - /** - * 平台号 - */ - @ExcelProperty("Peko号") - private String erbanNo; - - /** - * 昵称 - */ - @ExcelProperty("昵称") - private String nick; - - /** - * 用户当前状态 - */ - @ExcelProperty("用户当前状态") - private String blockStatusName; - - /** - * 创建时间 - */ - @ExcelProperty("申请时间") - private String createTimeStr; - - /** - * 提现账户 - */ - @ExcelProperty("提现账户") - private String accountName; - - /** - * 提现金额 - */ - @ExcelProperty("提现金额USD") - private BigDecimal cashAmount; - - /** - * 币种类型 - */ - @ExcelProperty("发放币种") - private String currency; - - /** - * 币种金额 - */ - @ExcelProperty("发放金额") - private BigDecimal currencyAmount; - - /** - * 手续费 - */ - @ExcelProperty("手续费") - private String handlingRateStr; - - /** - * 金币数量 - */ - @ExcelProperty("核销金币") - private Integer goldNum; -} diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/model/AdminDict.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/model/AdminDict.java deleted file mode 100644 index 73c6fdf7b..000000000 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/model/AdminDict.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.accompany.admin.model; - -import java.util.Date; - -public class AdminDict extends AdminDictKey { - private String dictval; - - private Boolean status; - - private Integer showorder; - - private Date createtime; - - private String description; - - public String getDictval() { - return dictval; - } - - public void setDictval(String dictval) { - this.dictval = dictval == null ? null : dictval.trim(); - } - - public Boolean getStatus() { - return status; - } - - public void setStatus(Boolean status) { - this.status = status; - } - - public Integer getShoworder() { - return showorder; - } - - public void setShoworder(Integer showorder) { - this.showorder = showorder; - } - - public Date getCreatetime() { - return createtime; - } - - public void setCreatetime(Date createtime) { - this.createtime = createtime; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description == null ? null : description.trim(); - } -} \ No newline at end of file diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/model/AdminDictExample.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/model/AdminDictExample.java deleted file mode 100644 index 4cc737349..000000000 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/model/AdminDictExample.java +++ /dev/null @@ -1,661 +0,0 @@ -package com.accompany.admin.model; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class AdminDictExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public AdminDictExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andCodeIsNull() { - addCriterion("code is null"); - return (Criteria) this; - } - - public Criteria andCodeIsNotNull() { - addCriterion("code is not null"); - return (Criteria) this; - } - - public Criteria andCodeEqualTo(String value) { - addCriterion("code =", value, "code"); - return (Criteria) this; - } - - public Criteria andCodeNotEqualTo(String value) { - addCriterion("code <>", value, "code"); - return (Criteria) this; - } - - public Criteria andCodeGreaterThan(String value) { - addCriterion("code >", value, "code"); - return (Criteria) this; - } - - public Criteria andCodeGreaterThanOrEqualTo(String value) { - addCriterion("code >=", value, "code"); - return (Criteria) this; - } - - public Criteria andCodeLessThan(String value) { - addCriterion("code <", value, "code"); - return (Criteria) this; - } - - public Criteria andCodeLessThanOrEqualTo(String value) { - addCriterion("code <=", value, "code"); - return (Criteria) this; - } - - public Criteria andCodeLike(String value) { - addCriterion("code like", value, "code"); - return (Criteria) this; - } - - public Criteria andCodeNotLike(String value) { - addCriterion("code not like", value, "code"); - return (Criteria) this; - } - - public Criteria andCodeIn(List values) { - addCriterion("code in", values, "code"); - return (Criteria) this; - } - - public Criteria andCodeNotIn(List values) { - addCriterion("code not in", values, "code"); - return (Criteria) this; - } - - public Criteria andCodeBetween(String value1, String value2) { - addCriterion("code between", value1, value2, "code"); - return (Criteria) this; - } - - public Criteria andCodeNotBetween(String value1, String value2) { - addCriterion("code not between", value1, value2, "code"); - return (Criteria) this; - } - - public Criteria andDictkeyIsNull() { - addCriterion("dictkey is null"); - return (Criteria) this; - } - - public Criteria andDictkeyIsNotNull() { - addCriterion("dictkey is not null"); - return (Criteria) this; - } - - public Criteria andDictkeyEqualTo(String value) { - addCriterion("dictkey =", value, "dictkey"); - return (Criteria) this; - } - - public Criteria andDictkeyNotEqualTo(String value) { - addCriterion("dictkey <>", value, "dictkey"); - return (Criteria) this; - } - - public Criteria andDictkeyGreaterThan(String value) { - addCriterion("dictkey >", value, "dictkey"); - return (Criteria) this; - } - - public Criteria andDictkeyGreaterThanOrEqualTo(String value) { - addCriterion("dictkey >=", value, "dictkey"); - return (Criteria) this; - } - - public Criteria andDictkeyLessThan(String value) { - addCriterion("dictkey <", value, "dictkey"); - return (Criteria) this; - } - - public Criteria andDictkeyLessThanOrEqualTo(String value) { - addCriterion("dictkey <=", value, "dictkey"); - return (Criteria) this; - } - - public Criteria andDictkeyLike(String value) { - addCriterion("dictkey like", value, "dictkey"); - return (Criteria) this; - } - - public Criteria andDictkeyNotLike(String value) { - addCriterion("dictkey not like", value, "dictkey"); - return (Criteria) this; - } - - public Criteria andDictkeyIn(List values) { - addCriterion("dictkey in", values, "dictkey"); - return (Criteria) this; - } - - public Criteria andDictkeyNotIn(List values) { - addCriterion("dictkey not in", values, "dictkey"); - return (Criteria) this; - } - - public Criteria andDictkeyBetween(String value1, String value2) { - addCriterion("dictkey between", value1, value2, "dictkey"); - return (Criteria) this; - } - - public Criteria andDictkeyNotBetween(String value1, String value2) { - addCriterion("dictkey not between", value1, value2, "dictkey"); - return (Criteria) this; - } - - public Criteria andDictvalIsNull() { - addCriterion("dictval is null"); - return (Criteria) this; - } - - public Criteria andDictvalIsNotNull() { - addCriterion("dictval is not null"); - return (Criteria) this; - } - - public Criteria andDictvalEqualTo(String value) { - addCriterion("dictval =", value, "dictval"); - return (Criteria) this; - } - - public Criteria andDictvalNotEqualTo(String value) { - addCriterion("dictval <>", value, "dictval"); - return (Criteria) this; - } - - public Criteria andDictvalGreaterThan(String value) { - addCriterion("dictval >", value, "dictval"); - return (Criteria) this; - } - - public Criteria andDictvalGreaterThanOrEqualTo(String value) { - addCriterion("dictval >=", value, "dictval"); - return (Criteria) this; - } - - public Criteria andDictvalLessThan(String value) { - addCriterion("dictval <", value, "dictval"); - return (Criteria) this; - } - - public Criteria andDictvalLessThanOrEqualTo(String value) { - addCriterion("dictval <=", value, "dictval"); - return (Criteria) this; - } - - public Criteria andDictvalLike(String value) { - addCriterion("dictval like", value, "dictval"); - return (Criteria) this; - } - - public Criteria andDictvalNotLike(String value) { - addCriterion("dictval not like", value, "dictval"); - return (Criteria) this; - } - - public Criteria andDictvalIn(List values) { - addCriterion("dictval in", values, "dictval"); - return (Criteria) this; - } - - public Criteria andDictvalNotIn(List values) { - addCriterion("dictval not in", values, "dictval"); - return (Criteria) this; - } - - public Criteria andDictvalBetween(String value1, String value2) { - addCriterion("dictval between", value1, value2, "dictval"); - return (Criteria) this; - } - - public Criteria andDictvalNotBetween(String value1, String value2) { - addCriterion("dictval not between", value1, value2, "dictval"); - return (Criteria) this; - } - - public Criteria andStatusIsNull() { - addCriterion("status is null"); - return (Criteria) this; - } - - public Criteria andStatusIsNotNull() { - addCriterion("status is not null"); - return (Criteria) this; - } - - public Criteria andStatusEqualTo(Boolean value) { - addCriterion("status =", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotEqualTo(Boolean value) { - addCriterion("status <>", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusGreaterThan(Boolean value) { - addCriterion("status >", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusGreaterThanOrEqualTo(Boolean value) { - addCriterion("status >=", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLessThan(Boolean value) { - addCriterion("status <", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLessThanOrEqualTo(Boolean value) { - addCriterion("status <=", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusIn(List values) { - addCriterion("status in", values, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotIn(List values) { - addCriterion("status not in", values, "status"); - return (Criteria) this; - } - - public Criteria andStatusBetween(Boolean value1, Boolean value2) { - addCriterion("status between", value1, value2, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotBetween(Boolean value1, Boolean value2) { - addCriterion("status not between", value1, value2, "status"); - return (Criteria) this; - } - - public Criteria andShoworderIsNull() { - addCriterion("showOrder is null"); - return (Criteria) this; - } - - public Criteria andShoworderIsNotNull() { - addCriterion("showOrder is not null"); - return (Criteria) this; - } - - public Criteria andShoworderEqualTo(Integer value) { - addCriterion("showOrder =", value, "showorder"); - return (Criteria) this; - } - - public Criteria andShoworderNotEqualTo(Integer value) { - addCriterion("showOrder <>", value, "showorder"); - return (Criteria) this; - } - - public Criteria andShoworderGreaterThan(Integer value) { - addCriterion("showOrder >", value, "showorder"); - return (Criteria) this; - } - - public Criteria andShoworderGreaterThanOrEqualTo(Integer value) { - addCriterion("showOrder >=", value, "showorder"); - return (Criteria) this; - } - - public Criteria andShoworderLessThan(Integer value) { - addCriterion("showOrder <", value, "showorder"); - return (Criteria) this; - } - - public Criteria andShoworderLessThanOrEqualTo(Integer value) { - addCriterion("showOrder <=", value, "showorder"); - return (Criteria) this; - } - - public Criteria andShoworderIn(List values) { - addCriterion("showOrder in", values, "showorder"); - return (Criteria) this; - } - - public Criteria andShoworderNotIn(List values) { - addCriterion("showOrder not in", values, "showorder"); - return (Criteria) this; - } - - public Criteria andShoworderBetween(Integer value1, Integer value2) { - addCriterion("showOrder between", value1, value2, "showorder"); - return (Criteria) this; - } - - public Criteria andShoworderNotBetween(Integer value1, Integer value2) { - addCriterion("showOrder not between", value1, value2, "showorder"); - return (Criteria) this; - } - - public Criteria andCreatetimeIsNull() { - addCriterion("createTime is null"); - return (Criteria) this; - } - - public Criteria andCreatetimeIsNotNull() { - addCriterion("createTime is not null"); - return (Criteria) this; - } - - public Criteria andCreatetimeEqualTo(Date value) { - addCriterion("createTime =", value, "createtime"); - return (Criteria) this; - } - - public Criteria andCreatetimeNotEqualTo(Date value) { - addCriterion("createTime <>", value, "createtime"); - return (Criteria) this; - } - - public Criteria andCreatetimeGreaterThan(Date value) { - addCriterion("createTime >", value, "createtime"); - return (Criteria) this; - } - - public Criteria andCreatetimeGreaterThanOrEqualTo(Date value) { - addCriterion("createTime >=", value, "createtime"); - return (Criteria) this; - } - - public Criteria andCreatetimeLessThan(Date value) { - addCriterion("createTime <", value, "createtime"); - return (Criteria) this; - } - - public Criteria andCreatetimeLessThanOrEqualTo(Date value) { - addCriterion("createTime <=", value, "createtime"); - return (Criteria) this; - } - - public Criteria andCreatetimeIn(List values) { - addCriterion("createTime in", values, "createtime"); - return (Criteria) this; - } - - public Criteria andCreatetimeNotIn(List values) { - addCriterion("createTime not in", values, "createtime"); - return (Criteria) this; - } - - public Criteria andCreatetimeBetween(Date value1, Date value2) { - addCriterion("createTime between", value1, value2, "createtime"); - return (Criteria) this; - } - - public Criteria andCreatetimeNotBetween(Date value1, Date value2) { - addCriterion("createTime not between", value1, value2, "createtime"); - return (Criteria) this; - } - - public Criteria andDescriptionIsNull() { - addCriterion("description is null"); - return (Criteria) this; - } - - public Criteria andDescriptionIsNotNull() { - addCriterion("description is not null"); - return (Criteria) this; - } - - public Criteria andDescriptionEqualTo(String value) { - addCriterion("description =", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionNotEqualTo(String value) { - addCriterion("description <>", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionGreaterThan(String value) { - addCriterion("description >", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionGreaterThanOrEqualTo(String value) { - addCriterion("description >=", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionLessThan(String value) { - addCriterion("description <", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionLessThanOrEqualTo(String value) { - addCriterion("description <=", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionLike(String value) { - addCriterion("description like", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionNotLike(String value) { - addCriterion("description not like", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionIn(List values) { - addCriterion("description in", values, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionNotIn(List values) { - addCriterion("description not in", values, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionBetween(String value1, String value2) { - addCriterion("description between", value1, value2, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionNotBetween(String value1, String value2) { - addCriterion("description not between", value1, value2, "description"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/model/AdminDictKey.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/model/AdminDictKey.java deleted file mode 100644 index 831c634fb..000000000 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/model/AdminDictKey.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.accompany.admin.model; - -public class AdminDictKey { - private String code; - - private String dictkey; - - public String getCode() { - return code; - } - - public void setCode(String code) { - this.code = code == null ? null : code.trim(); - } - - public String getDictkey() { - return dictkey; - } - - public void setDictkey(String dictkey) { - this.dictkey = dictkey == null ? null : dictkey.trim(); - } -} \ No newline at end of file diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/model/batch/FlowDataBatchSearch.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/model/batch/FlowDataBatchSearch.java deleted file mode 100644 index 1981d46eb..000000000 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/model/batch/FlowDataBatchSearch.java +++ /dev/null @@ -1,135 +0,0 @@ -package com.accompany.admin.model.batch; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * @author: liaozetao - * @date: 2023/9/22 15:25 - * @description: - */ -@Data -@TableName("flow_data_batch_search") -public class FlowDataBatchSearch { - - /** - * 主键 - */ - @ApiModelProperty("主键") - @TableId(type = IdType.AUTO) - private Long id; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 负责人 - */ - @ApiModelProperty("负责人") - private String person; - - /** - * 预算 - */ - @ApiModelProperty("预算") - private BigDecimal amount; - - /** - * 关键字 - */ - @ApiModelProperty("关键字") - private String searchKey; - - /** - * 房间UID - */ - @ApiModelProperty("房间UID") - private Long roomUid; - - /** - * 开始时间 - */ - @ApiModelProperty("开始时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date startTime; - - /** - * 结束时间 - */ - @ApiModelProperty("结束时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date endTime; - - /** - * 创建时间 - */ - @ApiModelProperty("创建时间") - private Date createTime; - - /** - * 更新时间 - */ - @ApiModelProperty("更新时间") - private Date updateTime; - - /** - * 期间新增UV - */ - @ApiModelProperty("期间新增UV") - private Integer timeUv = 0; - - /** - * 新增成本 - */ - @ApiModelProperty("新增成本") - private BigDecimal costAmount = BigDecimal.ZERO; - - /** - * 归因新增UV - */ - @ApiModelProperty("归因新增UV") - private Integer ascribeTimeUv = 0; - - /** - * 归因后进入归因房间UV - */ - @ApiModelProperty("归因后进入归因房间UV") - private Integer inRoomUv = 0; - - /** - * 归因新增成本 - */ - @ApiModelProperty("归因新增成本") - private BigDecimal ascribeCostAmount = BigDecimal.ZERO; - - /** - * 活动内私聊用户数 - */ - @ApiModelProperty("活动内私聊用户数") - private Integer chatNum = 0; - - /** - * 私聊用户成本 - */ - @ApiModelProperty("私聊用户成本") - private BigDecimal chatCostAmount = BigDecimal.ZERO; - - /** - * 是否固定 - */ - @ApiModelProperty("是否固定") - private Integer isFixed = 0; -} diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/params/ActCallBattleItemSaveReqParams.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/params/ActCallBattleItemSaveReqParams.java deleted file mode 100644 index bb6c0f478..000000000 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/params/ActCallBattleItemSaveReqParams.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 文 件 名: LuckySeaItemSaveReqParams - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/9/26 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.admin.params; - -import com.accompany.business.model.callbattle.ActCallBattleItem; -import lombok.Data; - -import java.util.List; - -/** - *
类描述: - *
功能详细描述: - * - * @author H1 - * @date [2021/9/26] - */ -@Data -public class ActCallBattleItemSaveReqParams { - private List items; -} diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/params/LuckySeaItemSaveReqParams.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/params/LuckySeaItemSaveReqParams.java deleted file mode 100644 index bb76b60f5..000000000 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/params/LuckySeaItemSaveReqParams.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 文 件 名: LuckySeaItemSaveReqParams - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/9/26 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.admin.params; - -import com.accompany.business.model.activity.luckysea.LuckySeaItem; -import lombok.Data; - -import java.util.List; - -/** - *
类描述: - *
功能详细描述: - * - * @author H1 - * @date [2021/9/26] - */ -@Data -public class LuckySeaItemSaveReqParams { - private List items; -} diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/OperationSmsRecordVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/OperationSmsRecordVo.java deleted file mode 100644 index 8d0de7880..000000000 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/OperationSmsRecordVo.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.accompany.admin.vo; - -import java.util.Date; - -public class OperationSmsRecordVo { - private Long recordId; - - private Long uid; - - private Long erbanNo; - - private String phone; - - private Integer templateId; - - private String templateName; - - private Integer sendStatus; - - private Date createTime; - - private Date sendTime; - - private String errorMsg; - - private Integer operator; - - private String operatorName; - - public Long getRecordId() { - return recordId; - } - - public void setRecordId(Long recordId) { - this.recordId = recordId; - } - - public Long getUid() { - return uid; - } - - public void setUid(Long uid) { - this.uid = uid; - } - - public String getPhone() { - return phone; - } - - public void setPhone(String phone) { - this.phone = phone == null ? null : phone.trim(); - } - - public Integer getTemplateId() { - return templateId; - } - - public void setTemplateId(Integer templateId) { - this.templateId = templateId; - } - - public Integer getSendStatus() { - return sendStatus; - } - - public void setSendStatus(Integer sendStatus) { - this.sendStatus = sendStatus; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Date getSendTime() { - return sendTime; - } - - public void setSendTime(Date sendTime) { - this.sendTime = sendTime; - } - - public String getErrorMsg() { - return errorMsg; - } - - public void setErrorMsg(String errorMsg) { - this.errorMsg = errorMsg == null ? null : errorMsg.trim(); - } - - public Integer getOperator() { - return operator; - } - - public void setOperator(Integer operator) { - this.operator = operator; - } - - public Long getErbanNo() { - return erbanNo; - } - - public void setErbanNo(Long erbanNo) { - this.erbanNo = erbanNo; - } - - public String getTemplateName() { - return templateName; - } - - public void setTemplateName(String templateName) { - this.templateName = templateName; - } - - public String getOperatorName() { - return operatorName; - } - - public void setOperatorName(String operatorName) { - this.operatorName = operatorName; - } -} \ No newline at end of file diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/PhoneAuthApplyRecordExcelVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/PhoneAuthApplyRecordExcelVo.java deleted file mode 100644 index 3965605d8..000000000 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/PhoneAuthApplyRecordExcelVo.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.accompany.admin.vo; - -import com.accompany.common.annotation.FieldComment; -import com.accompany.core.vo.BaseVo; -import lombok.Data; - -import java.util.Date; - -@Data -public class PhoneAuthApplyRecordExcelVo extends BaseVo { - private static final long serialVersionUID = 1L; - - @FieldComment("id") - public Long id; - @FieldComment("申请区号") - public String phoneAreaCode; - @FieldComment("申请手机号") - public String phone; - @FieldComment("授权码") - public String authCode; - @FieldComment("授权状态") - public Byte status; - @FieldComment("申请时间") - public Date createTime; - @FieldComment("备注") - public String remark; - @FieldComment("操作人") - public String operator; - @FieldComment("更新授权时间") - public Date updateTime; -} diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/UserCertifyRecordVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/UserCertifyRecordVo.java deleted file mode 100644 index 957691380..000000000 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/UserCertifyRecordVo.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.accompany.admin.vo; - -import java.util.Date; - -/** - * ｛这里添加描述｝ - * - * @author fangchengyan - * @date 2019-05-20 14:49 - */ -public class UserCertifyRecordVo { - - private Long recordId; - - private Long uid; - - private String name; - - private String idCardNum; - - private String phone; - - private Byte bindStatus; - - private String certifyType; - - private Date createTime; - - private Long erbanNo; - - public Long getRecordId() { - return recordId; - } - - public void setRecordId(Long recordId) { - this.recordId = recordId; - } - - public Long getUid() { - return uid; - } - - public void setUid(Long uid) { - this.uid = uid; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getIdCardNum() { - return idCardNum; - } - - public void setIdCardNum(String idCardNum) { - this.idCardNum = idCardNum; - } - - public String getPhone() { - return phone; - } - - public void setPhone(String phone) { - this.phone = phone; - } - - public Byte getBindStatus() { - return bindStatus; - } - - public void setBindStatus(Byte bindStatus) { - this.bindStatus = bindStatus; - } - - public String getCertifyType() { - return certifyType; - } - - public void setCertifyType(String certifyType) { - this.certifyType = certifyType; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Long getErbanNo() { - return erbanNo; - } - - public void setErbanNo(Long erbanNo) { - this.erbanNo = erbanNo; - } -} diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/apply/PhoneAuthApplyRecordAdminVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/apply/PhoneAuthApplyRecordAdminVo.java deleted file mode 100644 index 20ccf9412..000000000 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/apply/PhoneAuthApplyRecordAdminVo.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.accompany.admin.vo.apply; - -import com.accompany.core.model.phone.PhoneAuthApplyRecord; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -/** - * @author: liaozetao - * @date: 2023/11/20 17:40 - * @description: - */ -@Data -@ApiModel -public class PhoneAuthApplyRecordAdminVo extends PhoneAuthApplyRecord { - - /** - * 用户ID - */ - @ApiModelProperty("用户ID") - private Long erbanNo; - - /** - * 昵称 - */ - @ApiModelProperty("昵称") - private String nick; - - /** - * 注册时间 - */ - @ApiModelProperty("注册时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date signTime; -} diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/batch/FlowDataBatchSearchAdminVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/batch/FlowDataBatchSearchAdminVo.java deleted file mode 100644 index 53b2be66a..000000000 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/batch/FlowDataBatchSearchAdminVo.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.accompany.admin.vo.batch; - -import com.accompany.admin.model.batch.FlowDataBatchSearch; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author: liaozetao - * @date: 2023/9/22 15:40 - * @description: - */ -@Data -@ApiModel -public class FlowDataBatchSearchAdminVo extends FlowDataBatchSearch { - - /** - * 房间名称 - */ - @ApiModelProperty("归因房间名称") - private String roomName; - -} diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/batch/FlowDataBatchSearchGrowAdminVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/batch/FlowDataBatchSearchGrowAdminVo.java deleted file mode 100644 index ee904370c..000000000 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/batch/FlowDataBatchSearchGrowAdminVo.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.accompany.admin.vo.batch; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author: liaozetao - * @date: 2023/9/22 18:00 - * @description: - */ -@Data -@ApiModel -public class FlowDataBatchSearchGrowAdminVo { - - /** - * 统计项 - */ - @ApiModelProperty("统计项") - private String countItem; - - /** - * 是否百分比 - */ - @ApiModelProperty("是否百分比") - private Boolean isPercentage = false; - - /** - * 当天情况 - */ - @ApiModelProperty("当天情况") - private Double currCondition = 0D; - - /** - * 次日情况 - */ - @ApiModelProperty("次日情况") - private Double nextCondition = 0D; - - /** - * 3日情况 - */ - @ApiModelProperty("3日情况") - private Double threeCondition = 0D; - - /** - * 7日情况 - */ - @ApiModelProperty("7日情况") - private Double sevenCondition = 0D; - - /** - * 15日情况 - */ - @ApiModelProperty("15日情况") - private Double fifteenCondition = 0D; - - /** - * 30日情况 - */ - @ApiModelProperty("30日情况") - private Double thirtyCondition = 0D; - - /** - * 累计到目前 - */ - @ApiModelProperty("累计到目前") - private Double totalCondition = 0D; -} diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/callbattle/ActCallBattleAdminRecordVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/callbattle/ActCallBattleAdminRecordVo.java deleted file mode 100644 index d7641c68f..000000000 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/callbattle/ActCallBattleAdminRecordVo.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * 文 件 名: LuckySeaActAdminRecordVo - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/12 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.admin.vo.callbattle; - -import lombok.Data; - -import java.util.Date; - -/** - *
类描述: - *
功能详细描述: - * - * @author H1 - * @date [2021/1/12] - */ -@Data -public class ActCallBattleAdminRecordVo { - private String roundId; - private Date startTime; - private Date endTime; - private Integer memberNum; - private Long userInputPieceNum; - private Long prizePieceNum; - private Double ticket; - private String prizeName; - private String restraintName; -} diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/callbattle/ActCallBattleAdminRoundDetailVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/callbattle/ActCallBattleAdminRoundDetailVo.java deleted file mode 100644 index 8c720e002..000000000 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/callbattle/ActCallBattleAdminRoundDetailVo.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * 文 件 名: LuckySeaActAdminRoundDetailVo - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/12 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.admin.vo.callbattle; - -import lombok.Data; - -/** - *
类描述: - *
功能详细描述: - * - * @author H1 - * @date [2021/1/12] - */ -@Data -public class ActCallBattleAdminRoundDetailVo { - private Long uid; - private Long erbanNo; - private String nick; - private Long costPieceNum; - private Long prizePieceNum; -} diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/callbattle/ActCallBattleAdminUserDrawRecord.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/callbattle/ActCallBattleAdminUserDrawRecord.java deleted file mode 100644 index 496bcd8a6..000000000 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/callbattle/ActCallBattleAdminUserDrawRecord.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 文 件 名: LuckySeaActAdminUserDrawRecord - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/12 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.admin.vo.callbattle; - -import lombok.Data; - -import java.util.Date; - -/** - *
类描述: - *
功能详细描述: - * - * @author H1 - * @date [2021/1/12] - */ -@Data -public class ActCallBattleAdminUserDrawRecord { - private Long uid; - private Long erbanNo; - private String nick; - private String roundId; - private Date endTime; - private Long costPieceNum; - private Long prizePieceNum; -} diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/callbattle/ActCallBattlePlatformStatVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/callbattle/ActCallBattlePlatformStatVo.java deleted file mode 100644 index 577f857d8..000000000 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/callbattle/ActCallBattlePlatformStatVo.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * 文 件 名: LuckySeaActPlatformStatVo - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/11 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.admin.vo.callbattle; - -import lombok.Data; - -import java.util.Date; - -/** - *
类描述: 召唤战斗活动平台数据统计vo - *
功能详细描述: - * - * @author H1 - * @date [2021/1/11] - */ -@Data -public class ActCallBattlePlatformStatVo { - - private Date queryDate; - private Integer memberNum; - private Integer totalPlayTimes; - private Integer roundNum; - private Long totalPiece; - private Long totalPlatformValue; - private Double totalTicket; -} diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/gamepartner/GamePartnerOrderDayAdminVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/gamepartner/GamePartnerOrderDayAdminVo.java deleted file mode 100644 index d3f48b1cd..000000000 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/gamepartner/GamePartnerOrderDayAdminVo.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.accompany.admin.vo.gamepartner; - -import com.alibaba.excel.annotation.ExcelProperty; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.math.BigDecimal; - -/** - * @author: liaozetao - * @date: 2023/8/24 14:53 - * @description: - */ -@Data -public class GamePartnerOrderDayAdminVo { - - /** - * 日期 - */ - @ApiModelProperty("日期") - @ExcelProperty("日期") - private String orderTime; - - /** - * 下单用户数 - */ - @ApiModelProperty("下单用户数") - @ExcelProperty("下单用户数") - private Integer orderNum; - - /** - * 累积下单局数 - */ - @ApiModelProperty("累积下单局数") - @ExcelProperty("累积下单局数") - private Integer totalInning; - - /** - * 累积下单次数 - */ - @ApiModelProperty("累积下单次数") - @ExcelProperty("累积下单次数") - private Integer orderCount; - - /** - * 累积下单金额（钻） - */ - @ApiModelProperty("累积下单金额（钻）") - @ExcelProperty("累积下单金额（钻）") - private BigDecimal totalAmount; - -} diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/gamepartner/GamePartnerOrderDayDetailAdminVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/gamepartner/GamePartnerOrderDayDetailAdminVo.java deleted file mode 100644 index 0fea00268..000000000 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/gamepartner/GamePartnerOrderDayDetailAdminVo.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.accompany.admin.vo.gamepartner; - -import com.alibaba.excel.annotation.ExcelProperty; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author: liaozetao - * @date: 2023/8/24 15:39 - * @description: - */ -@Data -public class GamePartnerOrderDayDetailAdminVo { - - /** - * 下单用户id - */ - @ApiModelProperty("下单用户id") - @ExcelProperty("下单用户id") - private String fromErBanNo; - - /** - * 下单用户昵称 - */ - @ApiModelProperty("下单用户昵称") - @ExcelProperty("下单用户昵称") - private String fromNick; - - /** - * 接单用户id - */ - @ApiModelProperty("接单用户id") - @ExcelProperty("接单用户id") - private String toErBanNo; - - /** - * 接单用户昵称 - */ - @ApiModelProperty("接单用户昵称") - @ExcelProperty("接单用户昵称") - private String toNick; - - /** - * 房主id - */ - @ApiModelProperty("房主id") - @ExcelProperty("房主id") - private String hallErBanNo; - - /** - * 房间名称 - */ - @ApiModelProperty("房间名称") - @ExcelProperty("房间名称") - private String hallRoomName; - - /** - * 下单游戏 - */ - @ApiModelProperty("下单游戏") - @ExcelProperty("下单游戏") - private String gameName; - - /** - * 下单金额（钻） - */ - @ApiModelProperty("下单金额（钻）") - @ExcelProperty("下单金额（钻）") - private String amount; - - /** - * 下单时间 - */ - @ApiModelProperty("下单时间") - @ExcelProperty("下单时间") - private String orderTime; -} diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/gamepartner/UserGamePartnerInfoAdminVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/gamepartner/UserGamePartnerInfoAdminVo.java deleted file mode 100644 index f5c0460e4..000000000 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/gamepartner/UserGamePartnerInfoAdminVo.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.accompany.admin.vo.gamepartner; - -import com.accompany.business.model.gamepartner.UserGamePartner; -import com.accompany.business.vo.gamepartner.UserGamePartnerInfoVo; -import com.accompany.common.constant.Constant; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.model.Users; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.springframework.util.CollectionUtils; -import org.springframework.util.StringUtils; - -import java.util.List; - -@ApiModel -@Data -public class UserGamePartnerInfoAdminVo { - - @ApiModelProperty("uid") - private Long uid; - @ApiModelProperty("id") - private Long erbanNo; - @ApiModelProperty("昵称") - private String nick; - @ApiModelProperty("游戏信息") - private List games; - @ApiModelProperty("状态") - private Boolean status; - @ApiModelProperty("更新时间") - private String updateTime; - @ApiModelProperty("操作人") - private String adminName; - - public UserGamePartnerInfoAdminVo(){ - - } - - public UserGamePartnerInfoAdminVo(UserGamePartner db, Users u, List games, String adminName) { - this.uid = db.getUid(); - if (null != u){ - this.erbanNo = u.getErbanNo(); - this.nick = u.getNick(); - } - if (!CollectionUtils.isEmpty(games)){ - this.games = games; - } - this.status = Constant.StatusV2.valid.equals(db.getStatus()); - this.updateTime = DateTimeUtil.convertDate(db.getUpdateTime()); - if (StringUtils.hasText(adminName)){ - this.adminName = adminName; - } - } -} diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/luckysea/LuckySeaActAdminRecordVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/luckysea/LuckySeaActAdminRecordVo.java deleted file mode 100644 index 3441c17ee..000000000 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/luckysea/LuckySeaActAdminRecordVo.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * 文 件 名: LuckySeaActAdminRecordVo - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/12 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.admin.vo.luckysea; - -import lombok.Data; - -import java.util.Date; - -/** - *
类描述: - *
功能详细描述: - * - * @author H1 - * @date [2021/1/12] - */ -@Data -public class LuckySeaActAdminRecordVo { - private String roundId; - private Date startTime; - private Date endTime; - private Integer memberNum; - private Long userInputPieceNum; - private Long prizePieceNum; - private Double ticket; - private String prizeName; -} diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/luckysea/LuckySeaActAdminRoundDetailVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/luckysea/LuckySeaActAdminRoundDetailVo.java deleted file mode 100644 index 4551bba68..000000000 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/luckysea/LuckySeaActAdminRoundDetailVo.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * 文 件 名: LuckySeaActAdminRoundDetailVo - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/12 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.admin.vo.luckysea; - -import lombok.Data; - -/** - *
类描述: - *
功能详细描述: - * - * @author H1 - * @date [2021/1/12] - */ -@Data -public class LuckySeaActAdminRoundDetailVo { - private Long uid; - private Long erbanNo; - private String nick; - private Long costPieceNum; - private Long prizePieceNum; -} diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/luckysea/LuckySeaActAdminUserDrawRecord.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/luckysea/LuckySeaActAdminUserDrawRecord.java deleted file mode 100644 index 1ffb0331d..000000000 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/luckysea/LuckySeaActAdminUserDrawRecord.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 文 件 名: LuckySeaActAdminUserDrawRecord - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/12 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.admin.vo.luckysea; - -import lombok.Data; - -import java.util.Date; - -/** - *
类描述: - *
功能详细描述: - * - * @author H1 - * @date [2021/1/12] - */ -@Data -public class LuckySeaActAdminUserDrawRecord { - private Long uid; - private Long erbanNo; - private String nick; - private String roundId; - private Date endTime; - private Long costPieceNum; - private Long prizePieceNum; -} diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/luckysea/LuckySeaActPlatformStatVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/luckysea/LuckySeaActPlatformStatVo.java deleted file mode 100644 index c1c451ff1..000000000 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/luckysea/LuckySeaActPlatformStatVo.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * 文 件 名: LuckySeaActPlatformStatVo - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/11 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.admin.vo.luckysea; - -import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; - -/** - *
类描述: 深海奇缘活动平台数据统计vo - *
功能详细描述: - * - * @author H1 - * @date [2021/1/11] - */ -@Data -public class LuckySeaActPlatformStatVo { - - @ExcelProperty("日期") - private String queryDate; - @ExcelProperty("总人数") - private Integer memberNum; - @ExcelProperty("总人次") - private Integer totalPlayTimes; - @ExcelProperty("总轮数") - private Integer roundNum; - @ExcelProperty("总投入") - private Long totalPiece; - @ExcelProperty("总平台价值") - private Long totalPlatformValue; - @ExcelProperty("门票") - private Double totalTicket; -} diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/luckysea/LuckySeaItemGroupAdminVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/luckysea/LuckySeaItemGroupAdminVo.java deleted file mode 100644 index 8f8325ffb..000000000 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/luckysea/LuckySeaItemGroupAdminVo.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.accompany.admin.vo.luckysea; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *
类描述: 深海奇缘活动奖项item - *
功能详细描述: - * - * @author H1 - * @date [2020/12/30] - */ -@Data -@ApiModel -public class LuckySeaItemGroupAdminVo { - - @ApiModelProperty("id") - private Long id; - - private String name; - - @ApiModelProperty("itemIds") - private String itemIds; - - @ApiModelProperty("itemNames") - private String itemNames; - - private Byte status; - -} diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/official/OfficialBrowseCountVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/official/OfficialBrowseCountVo.java deleted file mode 100644 index 949318f71..000000000 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/official/OfficialBrowseCountVo.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.accompany.admin.vo.official; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author: liaozetao - * @date: 2024/1/18 14:26 - * @description: - */ -@Data -public class OfficialBrowseCountVo { - - /** - * 日期 - */ - @ApiModelProperty("日期") - private String dateTime; - - /** - * 无线官网UV - */ - @ApiModelProperty("无线官网UV") - private Integer clientUv = 0; - - /** - * 无线官网PV - */ - @ApiModelProperty("无线官网PV") - private Integer clientPv = 0; - - /** - * 无线 iOS下载点击次数 - */ - @ApiModelProperty("无线 iOS下载点击次数") - private Integer iosDownloadPv = 0; - - /** - * 无线 安卓下载点击次数 - */ - @ApiModelProperty("无线 安卓下载点击次数") - private Integer androidDownloadPv = 0; - - /** - * PC官网UV - */ - @ApiModelProperty("PC官网UV") - private Integer pcUv = 0; - - /** - * PC官网PV - */ - @ApiModelProperty("PC官网PV") - private Integer pcPv = 0; - - /** - * PC iOS下载点击次数 - */ - @ApiModelProperty("PC iOS下载点击次数") - private Integer pcIosDownloadPv = 0; - - /** - * PC 安卓下载点击次数 - */ - @ApiModelProperty("PC 安卓下载点击次数") - private Integer pcAndroidDownloadPv = 0; -} diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/withdraw/WithdrawAccountAdminVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/withdraw/WithdrawAccountAdminVo.java deleted file mode 100644 index 8cb4ecd4e..000000000 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/withdraw/WithdrawAccountAdminVo.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.accompany.admin.vo.withdraw; - -import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; - -@Data -public class WithdrawAccountAdminVo { - - @ExcelProperty("用户UID") - private Long uid; - @ExcelProperty("平台ID") - private Long erbanNo; - @ExcelProperty("昵称") - private String nick; - @ExcelProperty("swift code/BIC") - private String swift; - @ExcelProperty("bank name") - private String bankName; - @ExcelProperty("account number") - private String accountNumber; - @ExcelProperty("account name") - private String accountName; - @ExcelProperty("address") - private String address; - @ExcelProperty("city") - private String city; - @ExcelProperty("province") - private String province; - @ExcelProperty("post code") - private String postCode; - @ExcelProperty("申请时间") - private String createTime; - @ExcelProperty("更新时间") - private String updateTime; -} \ No newline at end of file diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/withdraw/WithdrawBlockVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/withdraw/WithdrawBlockVo.java deleted file mode 100644 index 0f6a5c2a4..000000000 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/withdraw/WithdrawBlockVo.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.accompany.admin.vo.withdraw; - -import java.util.Date; - -/** - * Created by yuanyi on 2019/4/22. - */ -public class WithdrawBlockVo { - private Integer id; - - private Long uid; - - private Long erbanNo; - - private String nick; - - private Byte status; - - private String remark; - - private Date createTime; - - private Date updateTime; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public Long getUid() { - return uid; - } - - public void setUid(Long uid) { - this.uid = uid; - } - - public Long getErbanNo() { - return erbanNo; - } - - public void setErbanNo(Long erbanNo) { - this.erbanNo = erbanNo; - } - - public String getNick() { - return nick; - } - - public void setNick(String nick) { - this.nick = nick; - } - - public Byte getStatus() { - return status; - } - - public void setStatus(Byte status) { - this.status = status; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Date getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } -} diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/withdraw/WithdrawConfigAdminVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/withdraw/WithdrawConfigAdminVo.java deleted file mode 100644 index 907b5605c..000000000 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/withdraw/WithdrawConfigAdminVo.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.accompany.admin.vo.withdraw; - -import com.accompany.business.model.withdraw.ExchangeRate; -import com.accompany.business.model.withdraw.WithdrawAccountDtl; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -@Data -@ApiModel -public class WithdrawConfigAdminVo { - - private String role; - - private Integer times;//周提现次数 - - private Double fee; - - private Double min; - - private Double max; - - /** - * 主键 - */ - @ApiModelProperty("主键") - private Long id; - - /** - * 最小提现金币 - */ - @ApiModelProperty("最小提现金币") - private Long minValue; - - /** - * 周提现上限 - */ - @ApiModelProperty("周提现上限") - private Long weekMaxValue; - - /** - * 周提现次数 - */ - @ApiModelProperty("周提现次数") - private Integer weekLimitCount; - - /** - * 提现手续费率 - */ - @ApiModelProperty("提现手续费率") - private BigDecimal chargeRate; - - /** - * 账户 - */ - @ApiModelProperty("账户") - private List accounts; - - /** - * 汇率 - */ - @ApiModelProperty("汇率") - private List rates; - - /** - * 上次更新汇率时间 - */ - @ApiModelProperty("上次更新汇率时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date lastRateTime; - -} diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/withdraw/WithdrawRecordAdminVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/withdraw/WithdrawRecordAdminVo.java deleted file mode 100644 index bb22e1612..000000000 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/withdraw/WithdrawRecordAdminVo.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.accompany.admin.vo.withdraw; - -import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; - -@Data -public class WithdrawRecordAdminVo { - - @ExcelProperty("申请ID") - private Long id; - @ExcelProperty("用户UID") - private Long uid; - @ExcelProperty("平台ID") - private Long erbanNo; - @ExcelProperty("昵称") - private String nick; - @ExcelProperty("申请提现金币") - private Double golds; - @ExcelProperty("手续费") - private String fee; - @ExcelProperty("实际可提现金币") - private Double actualGolds; - @ExcelProperty("swift code/BIC") - private String swift; - @ExcelProperty("bank name") - private String bankName; - @ExcelProperty("account number") - private String accountNumber; - @ExcelProperty("account name") - private String accountName; - @ExcelProperty("address") - private String address; - @ExcelProperty("city") - private String city; - @ExcelProperty("province") - private String province; - @ExcelProperty("post code") - private String postCode; - @ExcelProperty("备注") - private String remark; - @ExcelProperty("状态") - private String status; - @ExcelProperty("申请时间") - private String createTime; - @ExcelProperty("更新时间") - private String updateTime; - @ExcelProperty("操作人") - private String operator; -} \ No newline at end of file diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/withdraw/WithdrawUserAdminVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/withdraw/WithdrawUserAdminVo.java deleted file mode 100644 index b49432f64..000000000 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/withdraw/WithdrawUserAdminVo.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.accompany.admin.vo.withdraw; - -import com.accompany.business.constant.withdraw.WithdrawAccountTypeConstant; -import com.accompany.business.model.withdraw.WithdrawUser; -import com.accompany.common.constant.Constant; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author: liaozetao - * @date: 2023/7/7 15:32 - * @description: - */ -@Data -@ApiModel -public class WithdrawUserAdminVo extends WithdrawUser { - - /** - * 耳伴号 - */ - @ApiModelProperty("耳伴号") - private Long erbanNo; - - /** - * 昵称 - */ - @ApiModelProperty("昵称") - private String nick; - - /** - * 中国大陆银联 - */ - @ApiModelProperty("中国大陆银联") - private Integer isChinaUnionPay = 0; - - /** - * 马来西亚银行 - */ - @ApiModelProperty("马来西亚银行") - private Integer isMayBank = 0; - - /** - * 新加坡银行 - */ - @ApiModelProperty("新加坡银行") - private Integer isBankOfSingapore = 0; - - /** - * 其它账户 - */ - @ApiModelProperty("其它账户") - private Integer isOrderAccount = 0; - - /** - * 台湾地区银行 - */ - @ApiModelProperty("台湾地区银行") - private Integer isTaiWanBank = 0; - - /** - * 提现账户 - */ - @ApiModelProperty("提现账户") - private String withdrawAccount; - - public Integer getIsChinaUnionPay() { - Integer accountFlag = this.getAccountFlag(); - if (accountFlag == null) { - accountFlag = 0; - } - if ((accountFlag & WithdrawAccountTypeConstant.CHINA_UNION_PAY) != 0) { - isChinaUnionPay = Constant.Yes1No0.YES; - } else { - isChinaUnionPay = Constant.Yes1No0.NO; - } - return isChinaUnionPay; - } - - public Integer getIsMayBank() { - Integer accountFlag = this.getAccountFlag(); - if (accountFlag == null) { - accountFlag = 0; - } - if ((accountFlag & WithdrawAccountTypeConstant.MAY_BANK) != 0) { - isMayBank = Constant.Yes1No0.YES; - } else { - isMayBank = Constant.Yes1No0.NO; - } - return isMayBank; - } - - public Integer getIsBankOfSingapore() { - Integer accountFlag = this.getAccountFlag(); - if (accountFlag == null) { - accountFlag = 0; - } - if ((accountFlag & WithdrawAccountTypeConstant.BANK_OF_SINGAPORE) != 0) { - isBankOfSingapore = Constant.Yes1No0.YES; - } else { - isBankOfSingapore = Constant.Yes1No0.NO; - } - return isBankOfSingapore; - } - - public Integer getIsOrderAccount() { - Integer accountFlag = this.getAccountFlag(); - if (accountFlag == null) { - accountFlag = 0; - } - if ((accountFlag & WithdrawAccountTypeConstant.ORDER_ACCOUNT) != 0) { - isOrderAccount = Constant.Yes1No0.YES; - } else { - isOrderAccount = Constant.Yes1No0.NO; - } - return isOrderAccount; - } - - public Integer getIsTaiWanBank() { - Integer accountFlag = this.getAccountFlag(); - if (accountFlag == null) { - accountFlag = 0; - } - if ((accountFlag & WithdrawAccountTypeConstant.TAI_WAN_BANK) != 0) { - isTaiWanBank = Constant.Yes1No0.YES; - } else { - isTaiWanBank = Constant.Yes1No0.NO; - } - return isTaiWanBank; - } -} diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/withdraw/WithdrawUserLimitAdminVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/withdraw/WithdrawUserLimitAdminVo.java deleted file mode 100644 index ad16a2056..000000000 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/withdraw/WithdrawUserLimitAdminVo.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.accompany.admin.vo.withdraw; - -import com.accompany.business.constant.withdraw.WithdrawUserLimitConstant; -import com.accompany.business.model.withdraw.WithdrawUserLimit; -import com.accompany.common.constant.Constant; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author: liaozetao - * @date: 2023/7/10 18:09 - * @description: - */ -@Data -@ApiModel -public class WithdrawUserLimitAdminVo extends WithdrawUserLimit { - - /** - * 耳伴号 - */ - @ApiModelProperty("耳伴号") - private Long erbanNo; - - /** - * 昵称 - */ - @ApiModelProperty("昵称") - private String nick; - - /** - * 提现 - */ - @ApiModelProperty("提现") - private Integer isCash = 0; - - /** - * 钻石 - */ - @ApiModelProperty("钻石") - private Integer isDiamond = 0; - - /** - * 所属房间 - */ - @ApiModelProperty("所属房间") - private String roomName; - - /** - * 所属房间ID - */ - @ApiModelProperty("所属房间ID") - private Long roomErBanNo; - - /** - * 所属公会 - */ - @ApiModelProperty("所属公会") - private String hallRoomName; - - /** - * 所属公会ID - */ - @ApiModelProperty("所属公会ID") - private Long hallErBanNo; - - /** - * 当前账户金币余额 - */ - @ApiModelProperty("当前账户金币余额") - private Double golds; - - public Integer getIsCash() { - Integer limitType = this.getLimitType(); - if (limitType == null) { - limitType = 0; - } - if ((limitType & WithdrawUserLimitConstant.LIMIT_TYPE_OF_CASH) != 0) { - isCash = Constant.Yes1No0.YES; - } else { - isCash = Constant.Yes1No0.NO; - } - return isCash; - } - - public Integer getIsDiamond() { - Integer limitType = this.getLimitType(); - if (limitType == null) { - limitType = 0; - } - if ((limitType & WithdrawUserLimitConstant.LIMIT_TYPE_OF_DIAMOND) != 0) { - isDiamond = Constant.Yes1No0.YES; - } else { - isDiamond = Constant.Yes1No0.NO; - } - return isDiamond; - } -} diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/withdraw/WithdrawUserRecordAdminVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/withdraw/WithdrawUserRecordAdminVo.java deleted file mode 100644 index 815a10bdc..000000000 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/withdraw/WithdrawUserRecordAdminVo.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.accompany.admin.vo.withdraw; - -import com.accompany.business.vo.withdraw.WithdrawUserRecordVo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author: liaozetao - * @date: 2023/7/10 15:03 - * @description: - */ -@Data -@ApiModel -public class WithdrawUserRecordAdminVo extends WithdrawUserRecordVo { - - /** - * 用户当前状态 - */ - @ApiModelProperty("用户状态名称") - private String blockStatusName; -} diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/withdraw/WithdrawVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/withdraw/WithdrawVo.java deleted file mode 100644 index 32521593a..000000000 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/withdraw/WithdrawVo.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.accompany.admin.vo.withdraw; - -import com.accompany.business.model.WithdrawRecord; - -/** - * Created by yuanyi on 2019/5/2. - */ -public class WithdrawVo extends WithdrawRecord { - - private Byte withDrawBlockStatus; // 提现黑名单状态 - - public Byte getWithDrawBlockStatus() { - return withDrawBlockStatus; - } - - public void setWithDrawBlockStatus(Byte withDrawBlockStatus) { - this.withDrawBlockStatus = withDrawBlockStatus; - } -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/AdminDictMapper.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/AdminDictMapper.java deleted file mode 100644 index 037ce4b70..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/AdminDictMapper.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.accompany.admin.mapper; - -import com.accompany.admin.model.AdminDict; -import com.accompany.admin.model.AdminDictExample; -import com.accompany.admin.model.AdminDictKey; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface AdminDictMapper { - int countByExample(AdminDictExample example); - - int deleteByExample(AdminDictExample example); - - int deleteByPrimaryKey(AdminDictKey key); - - int insert(AdminDict record); - - int insertSelective(AdminDict record); - - List selectByExample(AdminDictExample example); - - AdminDict selectByPrimaryKey(AdminDictKey key); - - int updateByExampleSelective(@Param("record") AdminDict record, @Param("example") AdminDictExample example); - - int updateByExample(@Param("record") AdminDict record, @Param("example") AdminDictExample example); - - int updateByPrimaryKeySelective(AdminDict record); - - int updateByPrimaryKey(AdminDict record); -} \ No newline at end of file diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/LuckySeaActAdminMapper.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/LuckySeaActAdminMapper.java deleted file mode 100644 index 6808c7619..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/LuckySeaActAdminMapper.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * 文 件 名: LuckySeaActAdminMapper - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/11 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.admin.mapper; - -import com.accompany.admin.vo.luckysea.LuckySeaActAdminRecordVo; -import com.accompany.admin.vo.luckysea.LuckySeaActAdminRoundDetailVo; -import com.accompany.admin.vo.luckysea.LuckySeaActAdminUserDrawRecord; -import com.accompany.admin.vo.luckysea.LuckySeaActPlatformStatVo; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *
接口描述: 深海奇缘mapper - *
功能详细描述: - * - * @author H1 - * @date [2021/1/11] - */ -public interface LuckySeaActAdminMapper { - - /** - * 分页获取游戏平台数据统计 - * @param page - * @param startTime - * @param endTime - * @return - */ - Page pagePlatformStat(Page page, @Param("startTime") String startTime, @Param("endTime")String endTime); - - /** - * 分页获取用户的游戏记录 - * @param startTime - * @param endTime - * @param erbanNoList - * @return - */ - List listUserDrawRecord(@Param("startTime") String startTime, @Param("endTime")String endTime, - @Param("erbanNoList") List erbanNoList); - - /** - * 分页获取游戏记录 - * @param startTime - * @param endTime - * @param roundId - * @return - */ - List listActRecord(@Param("startTime") String startTime, @Param("endTime")String endTime, - @Param("roundId") String roundId); - - /** - * 分页获取某轮游戏下的参与详情列表 - * @param roundId - * @return - */ - List listRoundDrawDetail(String roundId); -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/OperationSmsRecordMapperExpand.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/OperationSmsRecordMapperExpand.java deleted file mode 100644 index e2f8e1798..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/OperationSmsRecordMapperExpand.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.accompany.admin.mapper; - -import com.accompany.admin.vo.OperationSmsRecordVo; -import com.accompany.business.model.OperationSmsRecord; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author yangming - * @date 2019-04-08 - */ -public interface OperationSmsRecordMapperExpand { - - /** - * 批量保存 - * @param record - */ - void batchSave(List record); - - /** - * 分页查询 - * @param erbanNo - * @param templateId - * @param sendStatus - * @param createTime - * @param sendTime - * @param start - * @param pageSize - * @return - */ - List getList(@Param("erbanNo") Long erbanNo, @Param("templateId") Integer templateId, - @Param("sendStatus") Integer sendStatus, @Param("createTime") String createTime, - @Param("sendTime") String sendTime, @Param("start") Integer start, - @Param("pageSize") Integer pageSize); - - /** - * 统计数量 - * @param erbanNo - * @param templateId - * @param sendStatus - * @param createTime - * @param sendTime - * @return - */ - Integer count(@Param("erbanNo") Long erbanNo, @Param("templateId") Integer templateId, - @Param("sendStatus") Integer sendStatus, @Param("createTime") String createTime, - @Param("sendTime") String sendTime); - -} \ No newline at end of file diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/WithdrawBlockMapperExpand.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/WithdrawBlockMapperExpand.java deleted file mode 100644 index 108baa2c2..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/WithdrawBlockMapperExpand.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.accompany.admin.mapper; - -import com.accompany.admin.model.WithdrawBlock; -import com.accompany.admin.vo.withdraw.WithdrawBlockVo; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; - -/** - * Created by yuanyi on 2019/4/22. - */ -public interface WithdrawBlockMapperExpand { - List selectWithdrawBlockVoList(@Param("erbanNoList") List erbanNoList, @Param("status") Byte status, @Param("startDate") Date startDate, @Param("endDate") Date endDate); - - List selectWithdrawBlockUid(@Param("blockStatus") Byte blockStatus); - - int insertOrUpdate(WithdrawBlock withdrawBlock); -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/batch/FlowDataBatchSearchAdminMapper.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/batch/FlowDataBatchSearchAdminMapper.java deleted file mode 100644 index c11b7431b..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/batch/FlowDataBatchSearchAdminMapper.java +++ /dev/null @@ -1,196 +0,0 @@ -package com.accompany.admin.mapper.batch; - -import com.accompany.admin.dto.batch.FlowDataBatchSearchDetailAdminDto; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author: liaozetao - * @date: 2023/9/23 11:35 - * @description: - */ -public interface FlowDataBatchSearchAdminMapper { - - /** - * 期间新增UV - * - * @param startTime - * @param endTime - * @return - */ - Integer getTimeUv(@Param("startTime") String startTime, @Param("endTime") String endTime); - - /** - * 归因新增UV - * - * @param searchKey - * @param startTime - * @param endTime - * @return - */ - Integer getAscribeTimeUv(@Param("searchKey") String searchKey, @Param("startTime") String startTime, @Param("endTime") String endTime); - - /** - * 归因后进入归因房间UV - * - * @param roomUid - * @param startTime - * @param endTime - * @return - */ - Integer getInRoomUv(@Param("searchKey") String searchKey, @Param("roomUid") Long roomUid, @Param("startTime") String startTime, @Param("endTime") String endTime); - - /** - * 活动内私聊用户数 - * - * @param searchKey - * @param yearMonths - * @param startTime - * @param endTime - * @return - */ - Integer getChatNum(@Param("searchKey") String searchKey, @Param("yearMonths") List yearMonths, @Param("startTime") String startTime, @Param("endTime") String endTime); - - /** - * 充值UV - * - * @param searchKey - * @param startTime - * @param endTime - * @param searchStartTime - * @param searchEndTime - * @return - */ - Double getChargeUv(@Param("searchKey") String searchKey, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("searchStartTime") String searchStartTime, @Param("searchEndTime") String searchEndTime); - - /** - * 收到转赠UV - * - * @param searchKey - * @param startTime - * @param endTime - * @param searchStartTime - * @param searchEndTime - * @return - */ - Double getGiveUv(@Param("searchKey") String searchKey, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("searchStartTime") String searchStartTime, @Param("searchEndTime") String searchEndTime); - - /** - * 全量付费UV - * - * @param searchKey - * @param startTime - * @param endTime - * @param searchStartTime - * @param searchEndTime - * @return - */ - Double getPayUv(@Param("searchKey") String searchKey, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("searchStartTime") String searchStartTime, @Param("searchEndTime") String searchEndTime); - - /** - * 直充付费金额 - * - * @param searchKey - * @param startTime - * @param endTime - * @param searchStartTime - * @param searchEndTime - * @return - */ - Double getChargeAmount(@Param("searchKey") String searchKey, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("searchStartTime") String searchStartTime, @Param("searchEndTime") String searchEndTime); - - /** - * 收到转赠的数额 - * - * @param searchKey - * @param startTime - * @param endTime - * @param searchStartTime - * @param searchEndTime - * @return - */ - Double getGiveAmount(@Param("searchKey") String searchKey, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("searchStartTime") String searchStartTime, @Param("searchEndTime") String searchEndTime); - - /** - * 留存用户数 - * - * @param searchKey - * @param startTime - * @param endTime - * @param remainDay - * @return - */ - Double getRemainCount(@Param("searchKey") String searchKey, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("remainDay") Integer remainDay); - - /** - * 获取用户明细 - * - * @param searchKey - * @param startTime - * @param endTime - * @return - */ - List getUserDetail(@Param("searchKey") String searchKey, @Param("startTime") String startTime, @Param("endTime") String endTime); - - /** - * 获取设备 - * - * @param erBanNos - * @return - */ - List getDevice(@Param("erBanNos") List erBanNos); - - /** - * 获取进房 - * - * @param erBanNos - * @param roomUid - * @param startTime - * @param endTime - * @return - */ - List getInRoom(@Param("erBanNos") List erBanNos, @Param("roomUid") Long roomUid, @Param("startTime") String startTime, @Param("endTime") String endTime); - - /** - * 活动期间私聊行为数 - * - * @param uid - * @param yearMonths - * @param startTime - * @param endTime - * @return - */ - Integer getChatCount(@Param("uid") Long uid, @Param("yearMonths") List yearMonths, @Param("startTime") String startTime, @Param("endTime") String endTime); - - /** - * 充值列表 - * - * @param erBanNos - * @param startTime - * @param endTime - * @return - */ - List getChargeAmountList(@Param("erBanNos") List erBanNos, @Param("startTime") String startTime, @Param("endTime") String endTime); - - /** - * 转赠列表 - * - * @param erBanNos - * @param startTime - * @param endTime - * @return - */ - List getGiveAmountList(@Param("erBanNos") List erBanNos, @Param("startTime") String startTime, @Param("endTime") String endTime); - - /** - * 是否访问 - * - * @param erBanNos - * @param startTime - * @param endTime - * @param remainDay - * @return - */ - List getRemainCountList(@Param("erBanNos") List erBanNos, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("remainDay") Integer remainDay); -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/batch/FlowDataBatchSearchMapper.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/batch/FlowDataBatchSearchMapper.java deleted file mode 100644 index eed459ab7..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/batch/FlowDataBatchSearchMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.accompany.admin.mapper.batch; - -import com.accompany.admin.model.batch.FlowDataBatchSearch; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @author: liaozetao - * @date: 2023/9/22 15:31 - * @description: - */ -public interface FlowDataBatchSearchMapper extends BaseMapper { -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/callbattle/ActCallBattleAdminMapper.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/callbattle/ActCallBattleAdminMapper.java deleted file mode 100644 index a514f6d14..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/callbattle/ActCallBattleAdminMapper.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * 文 件 名: LuckySeaActAdminMapper - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/11 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.admin.mapper.callbattle; - -import com.accompany.admin.vo.callbattle.ActCallBattleAdminRecordVo; -import com.accompany.admin.vo.callbattle.ActCallBattleAdminRoundDetailVo; -import com.accompany.admin.vo.callbattle.ActCallBattleAdminUserDrawRecord; -import com.accompany.admin.vo.callbattle.ActCallBattlePlatformStatVo; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *
接口描述: 深海奇缘mapper - *
功能详细描述: - * - * @author H1 - * @date [2021/1/11] - */ -public interface ActCallBattleAdminMapper { - - /** - * 分页获取游戏平台数据统计 - * @param startTime - * @param endTime - * @return - */ - List listPlatformStat(@Param("startTime") String startTime, @Param("endTime")String endTime); - - /** - * 分页获取用户的游戏记录 - * @param startTime - * @param endTime - * @param erbanNoList - * @return - */ - List listUserDrawRecord(@Param("startTime") String startTime, @Param("endTime")String endTime, - @Param("erbanNoList") List erbanNoList); - - /** - * 分页获取游戏记录 - * @param startTime - * @param endTime - * @param roundId - * @return - */ - List listActRecord(@Param("startTime") String startTime, @Param("endTime")String endTime, - @Param("roundId") String roundId); - - /** - * 分页获取某轮游戏下的参与详情列表 - * @param roundId - * @return - */ - List listRoundDrawDetail(String roundId); -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/gamepartner/GamePartnerOrderAdminMapper.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/gamepartner/GamePartnerOrderAdminMapper.java deleted file mode 100644 index 6e0721e3e..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/gamepartner/GamePartnerOrderAdminMapper.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.accompany.admin.mapper.gamepartner; - -import com.accompany.admin.vo.gamepartner.GamePartnerOrderDayAdminVo; -import com.accompany.admin.vo.gamepartner.GamePartnerOrderDayDetailAdminVo; -import com.accompany.business.vo.gamepartner.GamePartnerOrderVo; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.apache.ibatis.annotations.Param; - -/** - * @author: liaozetao - * @date: 2023/8/24 14:07 - * @description: - */ -public interface GamePartnerOrderAdminMapper { - - /** - * 订单记录查询 - * - * @param page - * @param fromErBanNo - * @param toErBanNo - * @param gameId - * @param orderNo - * @param startTime - * @param endTime - * @return - */ - Page orderPage(Page page, @Param("fromErBanNo") String fromErBanNo, @Param("toErBanNo") String toErBanNo, @Param("gameId") Integer gameId, @Param("orderNo") String orderNo, @Param("startTime") String startTime, @Param("endTime") String endTime); - - /** - * 订单统计 - * - * @param page - * @param startTime - * @param endTime - * @return - */ - Page dayPage(Page page, @Param("startTime") String startTime, @Param("endTime") String endTime); - - /** - * 订单详情 - * - * @param page - * @param orderDate - * @return - */ - Page dayDetailPage(Page page, @Param("orderDate") String orderDate); -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/official/OfficialRecordAdminMapper.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/official/OfficialRecordAdminMapper.java deleted file mode 100644 index db140a5ad..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/official/OfficialRecordAdminMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.accompany.admin.mapper.official; - -import com.accompany.admin.vo.official.OfficialBrowseCountVo; - -import java.util.List; - -/** - * @author: liaozetao - * @date: 2024/1/18 12:08 - * @description: - */ -public interface OfficialRecordAdminMapper { - - List browseFor30Days(); -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/withdraw/WithdrawUserLimitAdminMapper.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/withdraw/WithdrawUserLimitAdminMapper.java deleted file mode 100644 index a7ce20900..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/withdraw/WithdrawUserLimitAdminMapper.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.accompany.admin.mapper.withdraw; - -import com.accompany.admin.vo.withdraw.WithdrawUserLimitAdminVo; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.apache.ibatis.annotations.Param; - -/** - * @author: liaozetao - * @date: 2023/8/3 15:47 - * @description: - */ -public interface WithdrawUserLimitAdminMapper { - - /** - * - * @param page - * @param erBanNo - * @param limitType - * @param roomErBanNo - * @param hallErBanNo - * @return - */ - - Page selectPage(Page page, - @Param("erBanNo") String erBanNo, - @Param("limitType") Integer limitType, - @Param("roomErBanNo") String roomErBanNo, - @Param("hallErBanNo") String hallErBanNo); -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/ChannelDistributeAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/ChannelDistributeAdminService.java deleted file mode 100644 index c829976cf..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/ChannelDistributeAdminService.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.accompany.admin.service; - -import com.accompany.admin.dto.ChannelDistributeSearchDto; -import com.accompany.business.model.ChannelDistribute; -import com.accompany.business.model.ChannelDistributeExample; -import com.accompany.business.mybatismapper.ChannelDistributeMapper; -import com.accompany.business.mybatismapper.ChannelDistributeMapperExpand; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -/** - * ｛这里添加描述｝ - * - * @author fangchengyan - * @date 2020-02-20 2:20 下午 - */ -@Service -public class ChannelDistributeAdminService { - - @Autowired - private ChannelDistributeMapper channelDistributeMapper; - @Autowired - private ChannelDistributeMapperExpand channelDistributeMapperExpand; - - public int save(ChannelDistribute record) { - if (record.getId() == null) { - Date now = new Date(); - record.setCreateTime(now); - record.setUpdateTime(now); - - String[] channels = record.getChannel().split(","); - List list = new ArrayList<>(channels.length); - for(String channel : channels) { - if(StringUtils.isBlank(channel)) { - continue; - } - ChannelDistribute newOne = new ChannelDistribute(); - BeanUtils.copyProperties(record, newOne); - newOne.setChannel(channel); - list.add(newOne); - } - return channelDistributeMapperExpand.insertOrUpdateBatch(list); - } else { - record.setUpdateTime(new Date()); - return channelDistributeMapperExpand.updateValue(record); - } - } - - public ChannelDistribute getById(Long id) { - return channelDistributeMapper.selectByPrimaryKey(id); - } - - public PageInfo queryForPages(ChannelDistributeSearchDto searchDto, Integer pageNumber, Integer pageSize) { - PageHelper.startPage(pageNumber, pageSize); - return new PageInfo<>(queryList(searchDto)); - } - - public List queryList(ChannelDistributeSearchDto searchDto) { - ChannelDistributeExample example = new ChannelDistributeExample(); - ChannelDistributeExample.Criteria criteria = example.createCriteria(); - if(StringUtils.isNotBlank(searchDto.getAppId())) { - criteria.andAppIdEqualTo(searchDto.getAppId()); - } - if(StringUtils.isNotBlank(searchDto.getChannel())) { - criteria.andChannelLike("%" + searchDto.getChannel() + "%"); - } - if(null != searchDto.getStartTime()) { - criteria.andCreateTimeGreaterThanOrEqualTo(searchDto.getStartTime()); - } - if(null != searchDto.getEndTime()) { - criteria.andCreateTimeLessThanOrEqualTo(searchDto.getEndTime()); - } - List chargeActivityList = channelDistributeMapper.selectByExample(example); - return chargeActivityList; - } - - public int deleteById(long id) { - return channelDistributeMapper.deleteByPrimaryKey(id); - } -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/ActCallBattleAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/ActCallBattleAdminService.java deleted file mode 100644 index e24c387ec..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/ActCallBattleAdminService.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * 文 件 名: LuckySeaActAdminService - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/11 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.admin.service.activity; - - -import com.accompany.admin.params.ActCallBattleItemSaveReqParams; -import com.accompany.business.model.callbattle.ActCallBattleItem; - -import java.util.Map; - -/** - *
类描述: 召唤战斗活动 - *
功能详细描述: - * - * @author H1 - * @date [2021/1/11] - */ -public interface ActCallBattleAdminService { - /** - * 新增或者编辑奖品配置 - * @param item - */ - void addActItem(ActCallBattleItem item); - - /** - * 编辑奖品 - * @param params - */ - void saveActItems(ActCallBattleItemSaveReqParams params); - - /** - * 分页获取配置列表 - * - * @param name - * @param pageNum - * @param pageSize - * @return - */ - Map listItem(String name, Integer pageNum, Integer pageSize); - - /** - * 分页获取平台数据 - * @param startTime - * @param endTime - * @param page - * @param pageSize - * @return - */ - Map listPlatformStat(String startTime, String endTime, Integer page, Integer pageSize); - - /** - * 分页获取用户游戏记录列表 - * @param startTime - * @param endTime - * @param erbanNoStr - * @param page - * @param pageSize - * @return - */ - Map listUserDrawRecordList(String startTime, String endTime, String erbanNoStr, Integer page, Integer pageSize); - - /** - * 分页获取游戏记录列表 - * @param startTime - * @param endTime - * @param roundId - * @param page - * @param pageSize - * @return - */ - Map listActRecord(String startTime, String endTime, String roundId, Integer page, Integer pageSize); - - /** - * 分页获取某轮游戏用户参与情况 - * @param roundId - * @param page - * @param pageSize - * @return - */ - Map listRoundDrawDetail(String roundId, Integer page, Integer pageSize); -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/LuckySeaActAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/LuckySeaActAdminService.java deleted file mode 100644 index 38e0883c1..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/LuckySeaActAdminService.java +++ /dev/null @@ -1,101 +0,0 @@ -/* - * 文 件 名: LuckySeaActAdminService - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/11 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.admin.service.activity; - - - -import com.accompany.admin.params.LuckySeaItemSaveReqParams; -import com.accompany.admin.vo.luckysea.LuckySeaActPlatformStatVo; -import com.accompany.admin.vo.luckysea.LuckySeaItemGroupAdminVo; -import com.accompany.business.model.activity.luckysea.LuckySeaItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import java.util.List; -import java.util.Map; - -/** - *
类描述: 深海奇缘活动 - *
功能详细描述: - * - * @author H1 - * @date [2021/1/11] - */ -public interface LuckySeaActAdminService { - /** - * 新增或者编辑深海奖品配置 - * @param item - */ - void addLuckySeaActItem(LuckySeaItem item); - - /** - * 编辑奖品 - * @param params - */ - void saveLuckySeaActItems(LuckySeaItemSaveReqParams params); - - /** - * 分页获取配置列表 - * - * @param name - * @param pageNum - * @param pageSize - * @return - */ - Map listLuckySeaItem(String name, Integer pageNum, Integer pageSize); - - /** - * 分页获取平台数据 - * @param startTime - * @param endTime - * @param page - * @param pageSize - * @return - */ - Page pagePlatformStat(String startTime, String endTime, Integer page, Integer pageSize); - - /** - * 分页获取用户游戏记录列表 - * @param startTime - * @param endTime - * @param erbanNoStr - * @param page - * @param pageSize - * @return - */ - Map listUserDrawRecordList(String startTime, String endTime, String erbanNoStr, Integer page, Integer pageSize); - - /** - * 分页获取游戏记录列表 - * @param startTime - * @param endTime - * @param roundId - * @param page - * @param pageSize - * @return - */ - Map listActRecord(String startTime, String endTime, String roundId, Integer page, Integer pageSize); - - /** - * 分页获取某轮游戏用户参与情况 - * @param roundId - * @param page - * @param pageSize - * @return - */ - Map listRoundDrawDetail(String roundId, Integer page, Integer pageSize); - - List listLuckySeaItemGroup(); - - void delLuckySeaItemGroup(Long id); - - void saveLuckySeaItemGroup(Long id, String name, String itemIds, Byte status); - -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/OperationActAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/OperationActAdminService.java deleted file mode 100644 index 4788749b2..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/OperationActAdminService.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.accompany.admin.service.activity; - -import com.accompany.admin.service.base.BaseService; -import com.accompany.business.model.OperationAct; -import com.accompany.business.model.OperationActExample; -import com.accompany.business.mybatismapper.OperationActMapper; -import com.accompany.common.constant.Constant; -import com.accompany.common.redis.RedisKey; -import com.accompany.core.service.common.JedisService; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * Created by yuanyi on 2018/10/5. - */ -@Service -public class OperationActAdminService extends BaseService { - - @Autowired - private OperationActMapper operationActMapper; - @Autowired - private JedisService jedisService; - - /** - * 获取列表 - * @param pageNum - * @param pageSize - * @return - */ - public PageInfo queryList(Integer pageNum, Integer pageSize){ - OperationActExample example = new OperationActExample(); - OperationActExample.Criteria criteria = example.createCriteria(); - criteria.andStatusEqualTo(Constant.status.valid); - example.setOrderByClause("id"); - PageHelper.startPage(pageNum,pageSize); - List list = operationActMapper.selectByExample(example); - return new PageInfo(list); - } - - public void saveOperationAct(OperationAct operationAct){ - Integer id = operationAct.getId(); - if(id == null){ - operationActMapper.insertSelective(operationAct); - }else{ - operationActMapper.updateByPrimaryKeySelective(operationAct); - } - jedisService.hset(RedisKey.oper_act.getKey(),operationAct.getId().toString(),gson.toJson(operationAct)); - } - - /** - * 删除运营活动，此处只是修改状态量，并不是真正的删除 - */ - public void delOperationAct(Integer id){ - OperationAct operationAct = operationActMapper.selectByPrimaryKey(id); - if(operationAct == null){ - return; - } - operationAct.setStatus(Constant.status.invalid); - operationActMapper.updateByPrimaryKey(operationAct); - jedisService.hdel(RedisKey.oper_act.getKey(),id.toString()); - } - -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/StaticActivityPageService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/StaticActivityPageService.java deleted file mode 100644 index 518ec201d..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/StaticActivityPageService.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.accompany.admin.service.activity; - -import com.accompany.business.model.activity.PageActivity; -import com.accompany.business.service.activity.PageActivityService; -import com.accompany.business.vo.activities.PageActivityVO; -import com.accompany.core.util.BeanUtils; -import com.baomidou.mybatisplus.core.metadata.IPage; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Calendar; - - -/** - * 页面静态活动配置 service - * - * @author linuxea - * @date 2019/10/9 11:01 - */ -@Service -@Slf4j -@Transactional(rollbackFor = Exception.class) -public class StaticActivityPageService { - private final PageActivityService pageActivityService; - - @Autowired - public StaticActivityPageService(PageActivityService pageActivityService) { - this.pageActivityService = pageActivityService; - } - - public IPage queryList(Integer pageNumber, Integer pageSize) { - return pageActivityService.pageList(null, pageNumber, pageSize); - } - - public void save(PageActivityVO pageActivityVo) { - PageActivity pageActivity = BeanUtils.map(pageActivityVo, PageActivity.class); - pageActivity.setCreateTime(Calendar.getInstance().getTime()); - pageActivity.setUpdateTime(Calendar.getInstance().getTime()); - pageActivityService.save(pageActivity); - } - - public void deleteByActivityId(Integer id) { - pageActivityService.removeById(id); - } - - public Boolean existByCode(String actCode) { - return pageActivityService.countByCode(actCode) > 0; - } -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/impl/ActCallBattleAdminServiceImpl.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/impl/ActCallBattleAdminServiceImpl.java deleted file mode 100644 index b92bbd99f..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/impl/ActCallBattleAdminServiceImpl.java +++ /dev/null @@ -1,270 +0,0 @@ -/* - * 文 件 名: LuckySeaActAdminServiceImpl - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/11 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.admin.service.activity.impl; - -import cn.hutool.core.collection.CollectionUtil; -import com.accompany.admin.mapper.callbattle.ActCallBattleAdminMapper; -import com.accompany.admin.params.ActCallBattleItemSaveReqParams; -import com.accompany.admin.service.activity.ActCallBattleAdminService; -import com.accompany.admin.vo.callbattle.ActCallBattleAdminRecordVo; -import com.accompany.admin.vo.callbattle.ActCallBattleAdminRoundDetailVo; -import com.accompany.admin.vo.callbattle.ActCallBattleAdminUserDrawRecord; -import com.accompany.admin.vo.callbattle.ActCallBattlePlatformStatVo; -import com.accompany.business.model.callbattle.ActCallBattleItem; -import com.accompany.business.service.callbattle.ActCallBattleItemService; -import com.accompany.common.constant.Constant; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.ServiceException; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.google.common.collect.Maps; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; - -import java.util.*; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import java.util.stream.Collectors; - -; - -/** - *
类描述: 深海奇缘 - *
功能详细描述: - * - * @author H1 - * @date [2021/1/11] - */ -@Service -@Slf4j -@Transactional(rollbackFor = Exception.class) -public class ActCallBattleAdminServiceImpl implements ActCallBattleAdminService { - @Autowired - private ActCallBattleItemService actCallBattleItemService; - @Autowired - private ActCallBattleAdminMapper actCallBattleAdminMapper; - //@Autowired - //private SysConfService sysConfService; - - @Override - public void addActItem(ActCallBattleItem item) { - checkItemName(item.getName(), item.getRestraintName()); - if (null == item.getId()) { - // 新增 - if (StringUtils.isBlank(item.getName())) { - throw new ServiceException("名称不能为空"); - } - if (StringUtils.isBlank(item.getImgUrl())) { - throw new ServiceException("图片不能为空"); - } - if (null == item.getMultiple()) { - throw new ServiceException("倍数不能为空"); - } - if (StringUtils.isBlank(item.getRestraintName())) { - throw new ServiceException("克制物名称不能为空"); - } - if (StringUtils.isBlank(item.getRestraintImageUrl())) { - throw new ServiceException("克制物图片不能为空"); - } - if (item.getMultiple() < 1) { - throw new ServiceException("倍数需要大于等于1"); - } - item.setCreateTime(new Date()); - item.setStatus(Constant.status.valid); - } else { - if (null != item.getMultiple() && item.getMultiple() < 1) { - throw new ServiceException("倍数需要大于等于1"); - } - } - item.setUpdateTime(new Date()); - actCallBattleItemService.saveOrUpdate(item); - } - - private void checkItemInfo(ActCallBattleItem item) { - if (StringUtils.isBlank(item.getName())) { - throw new ServiceException("名称不能为空"); - } - if (StringUtils.isBlank(item.getImgUrl())) { - throw new ServiceException("图片不能为空"); - } - if (null == item.getMultiple()) { - throw new ServiceException("倍数不能为空"); - } - if (item.getMultiple() < 1) { - throw new ServiceException("倍数需要大于等于1"); - } - if (StringUtils.isBlank(item.getRestraintName())) { - throw new ServiceException("克制物名称不能为空"); - } - if (StringUtils.isBlank(item.getRestraintImageUrl())) { - throw new ServiceException("克制物图片不能为空"); - } - checkItemName(item.getName(), item.getRestraintName()); - } - - @Override - public void saveActItems(ActCallBattleItemSaveReqParams params) { - List items = params.getItems(); - if (CollectionUtils.isEmpty(items)) { - throw new ServiceException(BusiStatus.PARAMERROR, "配置不能为空"); - } - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(ActCallBattleItem::getStatus, Constant.status.valid); - List oldItems = actCallBattleItemService.list(queryWrapper); - List oldIds; - if (CollectionUtil.isNotEmpty(oldItems)) { - oldIds = oldItems.stream().map(ActCallBattleItem::getId).collect(Collectors.toList()); - } else { - oldIds = Collections.emptyList(); - } - List newItems = new ArrayList<>(); - List updateItems = new ArrayList<>(); - - - // 检查倍数配置是否合理 - /*String ticketRateStr = sysConfService.getSysConfValueById(Constant.SysConfId.CALL_BATTLE_TICKET); - double ticketRate = Double.parseDouble(ticketRateStr); - ActCallBattleItem minMultipleItem = items.stream().min(Comparator.comparing(ActCallBattleItem::getMultiple)).get(); - log.info("配置中，倍数最小的是 {}", JSON.toJSONString(minMultipleItem)); - if (items.size() * (1 - ticketRate) <= minMultipleItem.getMultiple()) { - throw new ServiceException(BusiStatus.SERVERERROR, "当前配置不符合要求，请检查组数、门票和最小倍数的关系是否合理"); - }*/ - items.forEach(item -> { - checkItemInfo(item); - if (item.getId() == null || !oldIds.contains(item.getId())) { - item.setStatus(Constant.status.valid); - item.setCreateTime(new Date()); - item.setUpdateTime(new Date()); - newItems.add(item); - } else { - updateItems.add(item); - // 从原id列表中移除 - oldIds.remove(item.getId()); - } - }); - - if (CollectionUtil.isNotEmpty(newItems)) { - log.info("新增配置列表: {}", JSONObject.toJSONString(newItems)); - actCallBattleItemService.saveBatch(newItems); - } - if (CollectionUtil.isNotEmpty(updateItems)) { - log.info("更新配置列表: {}", JSONObject.toJSONString(updateItems)); - actCallBattleItemService.updateBatchById(updateItems); - } - if (CollectionUtil.isNotEmpty(oldIds)) { - log.info("移除的配置列表: {}", JSONObject.toJSONString(oldIds)); - actCallBattleItemService.removeByIds(oldIds); - } - - } - - @Override - public Map listItem(String name, Integer pageNum, Integer pageSize) { - Map data = Maps.newHashMap(); - pageNum = pageNum != null ? pageNum : Constant.DEFAULT_PAGE; - pageSize = pageSize != null ? pageSize : Constant.DEFAULT_PAGE_SIZE; - PageHelper.startPage(pageNum, pageSize); - QueryWrapper wrapper = new QueryWrapper<>(); - LambdaQueryWrapper lambda = wrapper.lambda(); - lambda.eq(ActCallBattleItem::getStatus, Constant.status.valid); - if (StringUtils.isNotBlank(name)) { - lambda.eq(ActCallBattleItem::getName, name); - } - lambda.orderByDesc(ActCallBattleItem::getId); - List list = actCallBattleItemService.list(wrapper); - PageInfo pageInfo = new PageInfo<>(list); - data.put("rows", pageInfo.getList()); - data.put("total", pageInfo.getTotal()); - return data; - } - - @Override - public Map listPlatformStat(String startTime, String endTime, Integer page, Integer pageSize) { - Map data = Maps.newHashMap(); - page = page != null ? page : Constant.DEFAULT_PAGE; - pageSize = pageSize != null ? pageSize : Constant.DEFAULT_PAGE_SIZE; - PageHelper.startPage(page, pageSize); - List statList = actCallBattleAdminMapper.listPlatformStat(startTime, endTime); - PageInfo pageInfo = new PageInfo<>(statList); - data.put("rows", pageInfo.getList()); - data.put("total", pageInfo.getTotal()); - return data; - } - - @Override - public Map listUserDrawRecordList(String startTime, String endTime, String erbanNoStr, Integer page, Integer pageSize) { - Map data = Maps.newHashMap(); - page = page != null ? page : Constant.DEFAULT_PAGE; - pageSize = pageSize != null ? pageSize : Constant.DEFAULT_PAGE_SIZE; - PageHelper.startPage(page, pageSize); - List erbanNoList = new ArrayList<>(); - if (StringUtils.isNotBlank(erbanNoStr)) { - erbanNoList = Arrays.asList(erbanNoStr.trim().replaceAll("，", ",").split(",")); - } - List recordList = actCallBattleAdminMapper.listUserDrawRecord(startTime, endTime, erbanNoList); - PageInfo pageInfo = new PageInfo<>(recordList); - data.put("rows", pageInfo.getList()); - data.put("total", pageInfo.getTotal()); - return data; - } - - @Override - public Map listActRecord(String startTime, String endTime, String roundId, Integer page, Integer pageSize) { - Map data = Maps.newHashMap(); - page = page != null ? page : Constant.DEFAULT_PAGE; - pageSize = pageSize != null ? pageSize : Constant.DEFAULT_PAGE_SIZE; - PageHelper.startPage(page, pageSize); - List recordList = actCallBattleAdminMapper.listActRecord(startTime, endTime, roundId); - PageInfo pageInfo = new PageInfo<>(recordList); - data.put("rows", pageInfo.getList()); - data.put("total", pageInfo.getTotal()); - return data; - } - - @Override - public Map listRoundDrawDetail(String roundId, Integer page, Integer pageSize) { - Map data = Maps.newHashMap(); - page = page != null ? page : Constant.DEFAULT_PAGE; - pageSize = pageSize != null ? pageSize : Constant.DEFAULT_PAGE_SIZE; - PageHelper.startPage(page, pageSize); - List recordList = actCallBattleAdminMapper.listRoundDrawDetail(roundId); - PageInfo pageInfo = new PageInfo<>(recordList); - data.put("rows", pageInfo.getList()); - data.put("total", pageInfo.getTotal()); - return data; - } - /** - * 校验配置的名称 - * @param itemName - */ - private void checkItemName(String itemName, String restraintName) { - Pattern r = Pattern.compile("^[\\u4E00-\\u9FA5A-Za-z0-9_]+$"); - if (StringUtils.isNotBlank(itemName)) { - Matcher m = r.matcher(itemName); - if (!m.matches()) { - throw new ServiceException("配置名称只能为中文，数字，大小写英文与下划线"); - } - } - if (StringUtils.isNotBlank(restraintName)) { - Matcher rMatcher = r.matcher(restraintName); - if (!rMatcher.matches()) { - throw new ServiceException("配置名称只能为中文，数字，大小写英文与下划线"); - } - } - } -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/impl/LuckySeaActAdminServiceImpl.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/impl/LuckySeaActAdminServiceImpl.java deleted file mode 100644 index 6f36c8c2a..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/impl/LuckySeaActAdminServiceImpl.java +++ /dev/null @@ -1,319 +0,0 @@ -/* - * 文 件 名: LuckySeaActAdminServiceImpl - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/11 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.admin.service.activity.impl; - -import cn.hutool.core.collection.CollectionUtil; -import com.accompany.admin.mapper.LuckySeaActAdminMapper; -import com.accompany.admin.params.LuckySeaItemSaveReqParams; -import com.accompany.admin.service.activity.LuckySeaActAdminService; -import com.accompany.admin.vo.luckysea.*; -import com.accompany.business.model.activity.luckysea.LuckySeaItem; -import com.accompany.business.model.activity.luckysea.LuckySeaItemGroup; -import com.accompany.business.service.activities.luckySea.LuckySeaActInfoService; -import com.accompany.business.service.activities.luckySea.LuckySeaItemGroupService; -import com.accompany.business.service.activities.luckySea.LuckySeaItemService; -import com.accompany.common.constant.Constant; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.StringUtils; -import com.accompany.core.exception.AdminServiceException; -import com.accompany.core.service.SysConfService; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.google.common.collect.Maps; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; - -import java.util.*; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import java.util.stream.Collectors; - -/** - *
类描述: 深海奇缘 - *
功能详细描述: - * - * @author H1 - * @date [2021/1/11] - */ -@Service -@Slf4j -@Transactional(rollbackFor = Exception.class) -public class LuckySeaActAdminServiceImpl implements LuckySeaActAdminService { - - @Autowired - private LuckySeaItemGroupService luckySeaItemGroupService; - @Autowired - private LuckySeaItemService luckySeaItemService; - @Autowired - private LuckySeaActAdminMapper luckySeaActAdminMapper; - @Autowired - private LuckySeaActInfoService luckySeaActInfoService; - @Autowired - private SysConfService sysConfService; - - @Override - public void addLuckySeaActItem(LuckySeaItem item) { - if (null == item.getId()) { - // 新增 - if (StringUtils.isBlank(item.getName())) { - throw new AdminServiceException("名称不能为空"); - } - if (StringUtils.isBlank(item.getImgUrl())) { - throw new AdminServiceException("图片不能为空"); - } - if (null == item.getMultiple()) { - throw new AdminServiceException("倍数不能为空"); - } - if (item.getMultiple() < 1) { - throw new AdminServiceException("倍数需要大于等于1"); - } - checkItemName(item.getName()); - item.setCreateTime(new Date()); - item.setStatus(Constant.status.valid); - } else { - // 编辑 - if (StringUtils.isNotBlank(item.getName())) { - checkItemName(item.getName()); - } - if (null != item.getMultiple() && item.getMultiple() < 1) { - throw new AdminServiceException("倍数需要大于等于1"); - } - } - item.setUpdateTime(new Date()); - luckySeaItemService.saveOrUpdate(item); - } - - private void checkItemInfo(LuckySeaItem item) { - if (StringUtils.isBlank(item.getName())) { - throw new AdminServiceException("名称不能为空"); - } - if (StringUtils.isBlank(item.getImgUrl())) { - throw new AdminServiceException("图片不能为空"); - } - if (null == item.getMultiple()) { - throw new AdminServiceException("倍数不能为空"); - } - if (item.getMultiple() < 1) { - throw new AdminServiceException("倍数需要大于等于1"); - } - } - - @Override - public void saveLuckySeaActItems(LuckySeaItemSaveReqParams params) { - List items = params.getItems(); - if (CollectionUtils.isEmpty(items)) { - throw new AdminServiceException(BusiStatus.PARAMERROR, "配置不能为空"); - } - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(LuckySeaItem::getStatus, Constant.status.valid); - List oldItems = luckySeaItemService.list(queryWrapper); - - List oldIds; - if (CollectionUtil.isNotEmpty(oldItems)) { - oldIds = oldItems.stream().map(LuckySeaItem::getId).collect(Collectors.toList()); - } else { - oldIds = Collections.emptyList(); - } - List newItems = new ArrayList<>(); - List updateItems = new ArrayList<>(); - - // 检查倍数配置是否合理 - String ticketRateStr = sysConfService.getSysConfValueById(Constant.SysConfId.LUCKY_SEA_TICKET); - Double ticketRate = Double.valueOf(ticketRateStr); - LuckySeaItem minMultipleItem = items.stream().min(Comparator.comparing(LuckySeaItem::getMultiple)).get(); - log.info("配置中，倍数最小的是 {}", JSON.toJSONString(minMultipleItem)); - if (items.size() * (1 - ticketRate) <= minMultipleItem.getMultiple()) { - throw new AdminServiceException(BusiStatus.SERVERERROR, "当前配置不符合要求，请检查组数、门票和最小倍数的关系是否合理"); - } - items.forEach(item -> { - checkItemInfo(item); - if (item.getId() == null || !oldIds.contains(item.getId())) { - item.setStatus(Constant.status.valid); - item.setCreateTime(new Date()); - item.setUpdateTime(new Date()); - newItems.add(item); - } else { - updateItems.add(item); - // 从原id列表中移除 - oldIds.remove(item.getId()); - } - }); - - if (CollectionUtil.isNotEmpty(newItems)) { - if (oldItems.size() + newItems.size() > 8){ - throw new AdminServiceException(BusiStatus.SERVERERROR, "最多只能存在 8 个档位"); - } - - log.info("新增配置列表: {}", JSONObject.toJSONString(newItems)); - luckySeaItemService.saveBatch(newItems); - } - if (CollectionUtil.isNotEmpty(updateItems)) { - log.info("更新配置列表: {}", JSONObject.toJSONString(updateItems)); - luckySeaItemService.updateBatchById(updateItems); - } - if (CollectionUtil.isNotEmpty(oldIds)) { - log.info("移除的配置列表: {}", JSONObject.toJSONString(oldIds)); - luckySeaItemService.removeByIds(oldIds); - } - - } - - @Override - public Map listLuckySeaItem(String name, Integer pageNum, Integer pageSize) { - Map data = Maps.newHashMap(); - pageNum = pageNum != null ? pageNum : Constant.DEFAULT_PAGE; - pageSize = pageSize != null ? pageSize : Constant.DEFAULT_PAGE_SIZE; - PageHelper.startPage(pageNum, pageSize); - QueryWrapper wrapper = new QueryWrapper<>(); - LambdaQueryWrapper lambda = wrapper.lambda(); - lambda.eq(LuckySeaItem::getStatus, Constant.status.valid); - if (StringUtils.isNotBlank(name)) { - lambda.eq(LuckySeaItem::getName, name); - } - lambda.orderByDesc(LuckySeaItem::getId); - List list = luckySeaItemService.list(wrapper); - PageInfo pageInfo = new PageInfo<>(list); - data.put("rows", pageInfo.getList()); - data.put("total", pageInfo.getTotal()); - return data; - } - - @Override - public Page pagePlatformStat(String startTime, String endTime, Integer page, Integer pageSize) { - page = page != null ? page : Constant.DEFAULT_PAGE; - pageSize = pageSize != null ? pageSize : Constant.DEFAULT_PAGE_SIZE; - Page pageInfo = new Page<>(page, pageSize); - return luckySeaActAdminMapper.pagePlatformStat(pageInfo, startTime, endTime); - } - - @Override - public Map listUserDrawRecordList(String startTime, String endTime, String erbanNoStr, Integer page, Integer pageSize) { - Map data = Maps.newHashMap(); - page = page != null ? page : Constant.DEFAULT_PAGE; - pageSize = pageSize != null ? pageSize : Constant.DEFAULT_PAGE_SIZE; - PageHelper.startPage(page, pageSize); - List erbanNoList = new ArrayList<>(); - if (StringUtils.isNotBlank(erbanNoStr)) { - erbanNoList = Arrays.asList(erbanNoStr.trim().replaceAll("，", ",").split(",")); - } - List recordList = luckySeaActAdminMapper.listUserDrawRecord(startTime, endTime, erbanNoList); - PageInfo pageInfo = new PageInfo<>(recordList); - data.put("rows", pageInfo.getList()); - data.put("total", pageInfo.getTotal()); - return data; - } - - @Override - public Map listActRecord(String startTime, String endTime, String roundId, Integer page, Integer pageSize) { - Map data = Maps.newHashMap(); - page = page != null ? page : Constant.DEFAULT_PAGE; - pageSize = pageSize != null ? pageSize : Constant.DEFAULT_PAGE_SIZE; - PageHelper.startPage(page, pageSize); - List recordList = luckySeaActAdminMapper.listActRecord(startTime, endTime, roundId); - PageInfo pageInfo = new PageInfo<>(recordList); - data.put("rows", pageInfo.getList()); - data.put("total", pageInfo.getTotal()); - return data; - } - - @Override - public Map listRoundDrawDetail(String roundId, Integer page, Integer pageSize) { - Map data = Maps.newHashMap(); - page = page != null ? page : Constant.DEFAULT_PAGE; - pageSize = pageSize != null ? pageSize : Constant.DEFAULT_PAGE_SIZE; - PageHelper.startPage(page, pageSize); - List recordList = luckySeaActAdminMapper.listRoundDrawDetail(roundId); - PageInfo pageInfo = new PageInfo<>(recordList); - data.put("rows", pageInfo.getList()); - data.put("total", pageInfo.getTotal()); - return data; - } - - @Override - public List listLuckySeaItemGroup() { - List voList = new ArrayList<>(); - List doList = luckySeaItemGroupService.list(); - if (!CollectionUtils.isEmpty(doList)){ - List itemList = luckySeaItemService.listItem(); - Map itemNameMap = itemList.stream().collect(Collectors.toMap(LuckySeaItem::getId, LuckySeaItem::getName)); - - for (LuckySeaItemGroup group: doList) { - LuckySeaItemGroupAdminVo vo = new LuckySeaItemGroupAdminVo(); - BeanUtils.copyProperties(group, vo); - vo.setItemIds(group.getItemIds().stream().map(Object::toString).collect(Collectors.joining(","))); - vo.setItemNames(group.getItemIds().stream().map(itemNameMap::get).collect(Collectors.joining(","))); - voList.add(vo); - } - } - return voList; - } - - @Override - public void delLuckySeaItemGroup(Long id) { - luckySeaItemGroupService.removeById(id); - } - - @Override - public void saveLuckySeaItemGroup(Long id, String name, String itemIdsStr, Byte status) { - Date now = new Date(); - List itemIds = Arrays.stream(itemIdsStr.split(",")) - .map(Long::parseLong).sorted().collect(Collectors.toList()); - if (itemIds.stream().distinct().count() < itemIds.size()){ - throw new AdminServiceException("该组合存在相同ID"); - } - - List allList = luckySeaItemGroupService.list(); - if (allList.stream().anyMatch(g->g.getName().equals(name) && !g.getId().equals(id))){ - throw new AdminServiceException("已经有相同名称的组合"); - } - - if (allList.stream().anyMatch(g->g.getItemIds().equals(itemIds) && !g.getId().equals(id))){ - throw new AdminServiceException("已经有相同开奖ID组合"); - } - - List itemList = luckySeaItemService.listItem(); - Set itemIdSet = itemList.stream().map(LuckySeaItem::getId).collect(Collectors.toSet()); - Optional optional = itemIds.stream().filter(i->!itemIdSet.contains(i)).findAny(); - if (optional.isPresent()){ - throw new AdminServiceException(String.format("开奖ID %d 不存在", optional.get())); - } - - LuckySeaItemGroup db = new LuckySeaItemGroup(); - db.setId(id); - db.setName(name); - db.setItemIds(itemIds); - db.setStatus(status); - db.setCreateTime(now); - db.setUpdateTime(now); - luckySeaItemGroupService.saveOrUpdate(db); - } - - /** - * 校验配置的名称 - * @param itemName - */ - private void checkItemName(String itemName) { - Pattern r = Pattern.compile("^[\\u4E00-\\u9FA5A-Za-z0-9_]+$"); - Matcher m = r.matcher(itemName); - if (!m.matches()) { - throw new AdminServiceException("配置名称只能为中文，数字，大小写英文与下划线"); - } - } -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/api/MyApiService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/api/MyApiService.java index 00fce0158..ee51feafd 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/api/MyApiService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/api/MyApiService.java @@ -10,7 +10,6 @@ import com.accompany.business.dto.WeekActiveGuildStat; import com.accompany.business.model.*; import com.accompany.business.model.guild.Guild; import com.accompany.business.model.guild.GuildMember; -import com.accompany.business.model.relation.RelationUser; import com.accompany.business.mybatismapper.*; import com.accompany.business.service.*; import com.accompany.business.service.activity.WeekStarService; @@ -24,7 +23,6 @@ import com.accompany.business.service.guildpolicy2.GuildCrystalSettlementService import com.accompany.business.service.level.LevelService; import com.accompany.business.service.lucky.BravoRecordService; import com.accompany.business.service.lucky.Lucky24RecordService; -import com.accompany.business.service.relation.impl.RelationUserServiceImpl; import com.accompany.business.service.room.*; import com.accompany.business.service.user.UsersService; import com.accompany.business.vo.RoomVo; @@ -44,20 +42,16 @@ import com.accompany.core.mybatismapper.UsersMapper; import com.accompany.core.service.account.AccountService; import com.accompany.core.service.common.JedisService; import com.accompany.core.service.region.RegionService; -import com.accompany.core.vo.UserLevelVo; import com.accompany.payment.apple.ApplePublisher; import com.accompany.payment.iospay.JWTTranscationInfoPayload; import com.accompany.payment.model.ChargeRecord; import com.accompany.payment.service.ChargeRecordService; -import com.accompany.payment.service.RechargeUserService; import com.accompany.payment.service.UserRechargeLevelService; import com.accompany.sharding.mapper.GiftSendRecordMapperExpand; import com.accompany.sharding.model.GiftSendRecord; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.google.common.collect.Lists; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; @@ -123,16 +117,8 @@ public class MyApiService { @Autowired private GiftSendRecordMapperExpand giftSendRecordMapperExpand; @Autowired - private UserGiftWallMapperMgr userGiftWallMapperMgr; - @Autowired - private RechargeUserService rechargeUserService; - @Autowired private DiamondGiveHistoryMapper diamondGiveHistoryMapper; @Autowired - private RelationUserServiceImpl relationUserService; - @Autowired - private UserYearReportMapper userYearReportMapper; - @Autowired private DiamondStatService diamondStatService; @Autowired private DnuStatService dnuStatService; @@ -565,60 +551,6 @@ public class MyApiService { } } - public void calUserYearReport() { - Date limitDate = DateTimeUtil.convertStrToDate("2025-01-01 00:00:00"); - UsersExample example = new UsersExample(); - example.createCriteria().andCreateTimeLessThan(limitDate); - List userList = usersMapper.selectByExample(example); - if (CollectionUtils.isEmpty(userList)){ - return; - } - - userList.parallelStream().forEach(u->{ - UserYearReport userYearReport = new UserYearReport(); - userYearReport.setUid(u.getUid()); - userYearReport.setCreateTime(u.getCreateTime()); - - UserLevelVo levelVo = levelService.getUserLevelVo(u.getUid()); - userYearReport.setExperienceValue(levelVo.getExperAmount()); - userYearReport.setExperienceLevel(levelVo.getExperLevelSeq()); - userYearReport.setCharmValue(levelVo.getCharmAmount()); - userYearReport.setCharmLevel(levelVo.getCharmLevelSeq()); - - List wallList = userGiftWallMapperMgr.getUserWallListByUidOrderByCount(u.getUid()); - if (CollectionUtils.isEmpty(wallList)){ - userYearReport.setGiftWallCount(0); - } else { - userYearReport.setGiftWallCount(wallList.size()); - userYearReport.setGiftId(wallList.get(0).getGiftId()); - userYearReport.setGiftName(wallList.get(0).getGiftName()); - } - - List relationUserList = relationUserService.getOrgCPList(u.getUid(), 0, 1); - if (!CollectionUtils.isEmpty(relationUserList)){ - RelationUser relationUser = relationUserList.get(0); - userYearReport.setCpUid(relationUser.getLoverUid()); - userYearReport.setCpCreateTime(relationUser.getCreateTime()); - userYearReport.setCpValue(relationUser.getIntimacy()); - } - - boolean isRechargeUser = rechargeUserService.isRechargeUser(u.getUid()); - if (isRechargeUser){ - Wrapper wrapper = Wrappers.query() - .select("diamond_num", "sum(diamond_num) `diamond_num`") - .eq("from_uid", u.getUid()) - .lt("create_time", limitDate) - .groupBy("from_uid"); - DiamondGiveHistory history = diamondGiveHistoryMapper.selectOne(wrapper); - if (null !=history){ - userYearReport.setGiveDiamond(history.getDiamondNum()); - } - } - - log.info(JSON.toJSONString(userYearReport)); - userYearReportMapper.insertOrUpdate(userYearReport); - }); - } public void diamondStatAr(String date) { List partitionIds = List.of(PartitionEnum.ARAB.getId(), PartitionEnum.TURKEY.getId()); diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/batch/FlowDataBatchSearchAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/batch/FlowDataBatchSearchAdminService.java deleted file mode 100644 index f4881a4b5..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/batch/FlowDataBatchSearchAdminService.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.accompany.admin.service.batch; - -import com.accompany.admin.model.batch.FlowDataBatchSearch; -import com.accompany.admin.vo.batch.FlowDataBatchSearchAdminVo; -import com.accompany.admin.vo.batch.FlowDataBatchSearchGrowAdminVo; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.springframework.web.context.request.ServletWebRequest; - -import java.util.List; - -/** - * @author: liaozetao - * @date: 2023/9/22 15:35 - * @description: - */ -public interface FlowDataBatchSearchAdminService { - - /** - * 分页 - * - * @param searchKey - * @param batchId - * @param currentPage - * @param pageSize - * @return - */ - Page page(String searchKey, Long batchId, Integer currentPage, Integer pageSize); - - /** - * 列表 - * - * @return - */ - List list(); - - /** - * 删除 - * - * @param batchId - */ - void del(Long batchId); - - /** - * 保存 - * - * @param param - */ - void save(FlowDataBatchSearch param); - - /** - * 付费成长 - * - * @param batchId - * @return - */ - List growList(Long batchId); - - /** - * 付费成长导出 - * - * @param batchId - * @param servletWebRequest - */ - void growExport(Long batchId, ServletWebRequest servletWebRequest); - - /** - * 导出用户明细 - * - * @param batchId - * @param servletWebRequest - */ - void detailExport(Long batchId, ServletWebRequest servletWebRequest); - -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/batch/FlowDataBatchSearchService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/batch/FlowDataBatchSearchService.java deleted file mode 100644 index 16ecfe323..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/batch/FlowDataBatchSearchService.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.accompany.admin.service.batch; - -import com.accompany.admin.model.batch.FlowDataBatchSearch; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * @author: liaozetao - * @date: 2023/9/22 15:32 - * @description: - */ -public interface FlowDataBatchSearchService extends IService { -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/batch/impl/FlowDataBatchSearchAdminServiceImpl.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/batch/impl/FlowDataBatchSearchAdminServiceImpl.java deleted file mode 100644 index c2b57ff53..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/batch/impl/FlowDataBatchSearchAdminServiceImpl.java +++ /dev/null @@ -1,704 +0,0 @@ -package com.accompany.admin.service.batch.impl; - -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.date.DatePattern; -import cn.hutool.core.util.StrUtil; -import com.accompany.admin.dto.batch.FlowDataBatchSearchDetailAdminDto; -import com.accompany.admin.dto.batch.FlowDataBatchSearchGrowAdminDto; -import com.accompany.admin.mapper.batch.FlowDataBatchSearchAdminMapper; -import com.accompany.admin.model.batch.FlowDataBatchSearch; -import com.accompany.admin.service.batch.FlowDataBatchSearchAdminService; -import com.accompany.admin.service.batch.FlowDataBatchSearchService; -import com.accompany.admin.vo.batch.FlowDataBatchSearchAdminVo; -import com.accompany.admin.vo.batch.FlowDataBatchSearchGrowAdminVo; -import com.accompany.business.model.room.RoomSearchLog; -import com.accompany.business.mybatismapper.RoomSearchLogMapper; -import com.accompany.business.service.room.RoomService; -import com.accompany.common.constant.Constant; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.exception.AdminServiceException; -import com.accompany.core.model.Room; -import com.accompany.core.model.Users; -import com.accompany.core.service.common.JedisService; -import com.accompany.core.service.user.UsersBaseService; -import com.alibaba.excel.EasyExcel; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.web.context.request.ServletWebRequest; - -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.net.URLEncoder; -import java.time.YearMonth; -import java.time.format.DateTimeFormatter; -import java.util.*; -import java.util.stream.Collectors; - -/** - * @author: liaozetao - * @date: 2023/9/22 15:35 - * @description: - */ -@Slf4j -@Service -public class FlowDataBatchSearchAdminServiceImpl implements FlowDataBatchSearchAdminService { - - @Autowired - private FlowDataBatchSearchAdminMapper flowDataBatchSearchAdminMapper; - - @Autowired - private RoomSearchLogMapper roomSearchLogMapper; - - @Autowired - private UsersBaseService usersBaseService; - - @Autowired - private RoomService roomService; - - @Autowired - private FlowDataBatchSearchService flowDataBatchSearchService; - - @Autowired - private JedisService jedisService; - - @Override - public Page page(String searchKey, Long batchId, Integer currentPage, Integer pageSize) { - IPage page = flowDataBatchSearchService.page(new Page<>(currentPage, pageSize), Wrappers.lambdaQuery() - .eq(StrUtil.isNotEmpty(searchKey), FlowDataBatchSearch::getSearchKey, searchKey) - .eq(batchId != null && batchId != 0, FlowDataBatchSearch::getId, batchId) - .orderByDesc(FlowDataBatchSearch::getCreateTime)); - List admins = new ArrayList<>(); - Page iPage = new Page<>(currentPage, pageSize); - List records = page.getRecords(); - if (CollectionUtil.isNotEmpty(records)) { - List roomUidList = records.stream().map(FlowDataBatchSearch::getRoomUid).filter(Objects::nonNull).distinct().collect(Collectors.toList()); - Map roomMap = roomService.getRoomMap(roomUidList); - Date now = new Date(); - for (FlowDataBatchSearch record : records) { - Date startTime = record.getStartTime(); - Date endTime = record.getEndTime(); - BigDecimal amount = record.getAmount(); - Integer isFixed = record.getIsFixed(); - FlowDataBatchSearchAdminVo admin = null; - String objStr = jedisService.hget(RedisKey.flow_data_batch_search_hash.getKey(), String.valueOf(record.getId())); - if (StrUtil.isNotEmpty(objStr)) { - admin = JSONObject.parseObject(objStr, FlowDataBatchSearchAdminVo.class); - BeanUtils.copyProperties(record, admin); - } else { - admin = new FlowDataBatchSearchAdminVo(); - BeanUtils.copyProperties(record, admin); - String key = record.getSearchKey(); - Long roomUid = record.getRoomUid(); - if (roomMap.containsKey(roomUid)) { - Room room = roomMap.get(roomUid); - admin.setRoomName(room.getTitle()); - } - if (isFixed != null && (isFixed == Constant.Yes1No0.NO || endTime.after(now))) { - if (amount == null) { - amount = BigDecimal.ZERO; - } - String startTimeStr = DateTimeUtil.convertDate(startTime, DatePattern.NORM_DATETIME_PATTERN); - String endTimeStr = DateTimeUtil.convertDate(endTime, DatePattern.NORM_DATETIME_PATTERN); - //期间新增UV - Integer timeUv = flowDataBatchSearchAdminMapper.getTimeUv(startTimeStr, endTimeStr); - admin.setTimeUv(timeUv); - //新增成本 - BigDecimal costAmount = BigDecimal.ZERO; - if (timeUv != null && timeUv > 0) { - costAmount = amount.divide(BigDecimal.valueOf(timeUv), 2, RoundingMode.HALF_UP); - } - admin.setCostAmount(costAmount); - //归因新增UV - Integer ascribeTimeUv = flowDataBatchSearchAdminMapper.getAscribeTimeUv(key, startTimeStr, endTimeStr); - admin.setAscribeTimeUv(ascribeTimeUv); - //归因后进入归因房间UV - Integer inRoomUv = flowDataBatchSearchAdminMapper.getInRoomUv(key, record.getRoomUid(), startTimeStr, endTimeStr); - admin.setInRoomUv(inRoomUv); - //归因新增成本 - BigDecimal ascribeCostAmount = BigDecimal.ZERO; - if (ascribeTimeUv != null && ascribeTimeUv > 0) { - ascribeCostAmount = amount.divide(BigDecimal.valueOf(ascribeTimeUv), 2, RoundingMode.HALF_UP); - } - admin.setAscribeCostAmount(ascribeCostAmount); - List yearMonths = DateTimeUtil.getYearMonths(startTimeStr, endTimeStr); - //活动内私聊用户数 - Integer chatNum = flowDataBatchSearchAdminMapper.getChatNum(key, yearMonths, startTimeStr, endTimeStr); - admin.setChatNum(chatNum); - //私聊用户成本 - BigDecimal chatCostAmount = BigDecimal.ZERO; - if (chatNum != null && chatNum > 0) { - chatCostAmount = amount.divide(BigDecimal.valueOf(chatNum), 2, RoundingMode.HALF_UP); - } - admin.setChatCostAmount(chatCostAmount); - //更新是否固定标识 - if (now.after(endTime)) { - admin.setIsFixed(Constant.Yes1No0.YES); - } - //实时更新 - flowDataBatchSearchService.updateById(admin); - } - jedisService.hset(RedisKey.flow_data_batch_search_hash.getKey(), String.valueOf(record.getId()), JSONObject.toJSONString(admin)); - jedisService.expire(RedisKey.flow_data_batch_search_hash.getKey(), 10 * 60); - } - admins.add(admin); - } - } - iPage.setTotal(page.getTotal()); - iPage.setRecords(admins); - return iPage; - } - - @Override - public List list() { - return flowDataBatchSearchService.list(Wrappers.lambdaQuery() - .orderByDesc(FlowDataBatchSearch::getCreateTime)); - } - - @Override - public void del(Long batchId) { - flowDataBatchSearchService.removeById(batchId); - } - - @Override - public void save(FlowDataBatchSearch param) { - Date now = new Date(); - Long id = param.getId(); - String searchKey = param.getSearchKey(); - Date startTime = param.getStartTime(); - Date endTime = param.getEndTime(); - String startYearMonthStr = DateTimeUtil.convertDate(startTime, DateTimeUtil.DATE_FORMAT_YEAR_MONTH); - String endYearMonthStr = DateTimeUtil.convertDate(endTime, DateTimeUtil.DATE_FORMAT_YEAR_MONTH); - assert startYearMonthStr != null; - YearMonth startMonth = YearMonth.parse(startYearMonthStr, DateTimeFormatter.ofPattern(DateTimeUtil.DATE_FORMAT_YEAR_MONTH)); - assert endYearMonthStr != null; - YearMonth endMonth = YearMonth.parse(endYearMonthStr, DateTimeFormatter.ofPattern(DateTimeUtil.DATE_FORMAT_YEAR_MONTH)); - if (startMonth.getMonthValue() != endMonth.getMonthValue()) { - throw new AdminServiceException("归因场次不允许跨月"); - } - List roomSearchLogs = roomSearchLogMapper.selectList(Wrappers.lambdaQuery() - .eq(RoomSearchLog::getSearchType, Constant.SearchType.total) - .eq(RoomSearchLog::getSearchKey, searchKey) - .ge(RoomSearchLog::getCreateTime, startTime) - .le(RoomSearchLog::getCreateTime, endTime)); - if (CollectionUtil.isNotEmpty(roomSearchLogs)) { - Optional any = roomSearchLogs.stream().filter(v -> CollectionUtil.isNotEmpty(v.getResultUids()) && v.getResultUids().size() == 1).findAny(); - if (any.isPresent()) { - RoomSearchLog roomSearchLog = any.get(); - List resultUidList = roomSearchLog.getResultUids(); - if (CollectionUtil.isNotEmpty(resultUidList)) { - param.setRoomUid(resultUidList.get(0)); - } - } - } - if (param.getRoomUid() == null) { - Users users = usersBaseService.getUsersByErBanNo(Long.valueOf(searchKey)); - if (users != null) { - param.setRoomUid(users.getUid()); - } - } - if (param.getRoomUid() == null) { - throw new AdminServiceException("未找到归因房间"); - } - if (id == null) { - param.setCreateTime(now); - } - param.setUpdateTime(now); - param.setIsFixed(Constant.Yes1No0.NO); - flowDataBatchSearchService.saveOrUpdate(param); - } - - @Override - public List growList(Long batchId) { - List admins = new ArrayList<>(); - FlowDataBatchSearch search = flowDataBatchSearchService.getById(batchId); - if (search == null) { - return admins; - } - //预算 - BigDecimal amount = search.getAmount(); - if (amount == null) { - amount = BigDecimal.ZERO; - } - //关键字 - String searchKey = search.getSearchKey(); - Date startTime = search.getStartTime(); - Date endTime = search.getEndTime(); - String startTimeStr = DateTimeUtil.convertDate(startTime, DatePattern.NORM_DATETIME_PATTERN); - String endTimeStr = DateTimeUtil.convertDate(endTime, DatePattern.NORM_DATETIME_PATTERN); - Date beginTimeOfDay = DateTimeUtil.getEndTimeOfDay(DateTimeUtil.getBeginTimeOfDay(startTime)); - Date endTimeOfDay = DateTimeUtil.getEndTimeOfDay(endTime); - Date now = new Date(); - String objStr = jedisService.hget(RedisKey.flow_data_batch_search_detail_hash.getKey(), String.valueOf(batchId)); - if (StrUtil.isNotEmpty(objStr)) { - admins = JSONArray.parseArray(objStr, FlowDataBatchSearchGrowAdminVo.class); - } else { - //本场归因到的UV - Integer ascribeTimeUv = flowDataBatchSearchAdminMapper.getAscribeTimeUv(searchKey, startTimeStr, endTimeStr); - if (ascribeTimeUv == null) { - ascribeTimeUv = 0; - } - //充值UV - FlowDataBatchSearchGrowAdminVo chargeUv = new FlowDataBatchSearchGrowAdminVo(); - chargeUv.setCountItem("充值UV"); - chargeUv.setCurrCondition(flowDataBatchSearchAdminMapper.getChargeUv(searchKey, startTimeStr, endTimeStr, startTimeStr, DateTimeUtil.convertDate(endTimeOfDay, DatePattern.NORM_DATETIME_PATTERN))); - chargeUv.setNextCondition(flowDataBatchSearchAdminMapper.getChargeUv(searchKey, startTimeStr, endTimeStr, DateTimeUtil.convertDate(DateTimeUtil.getBeginTimeOfDay(DateTimeUtil.addDays(beginTimeOfDay, 1)), DatePattern.NORM_DATETIME_PATTERN), DateTimeUtil.convertDate(DateTimeUtil.addDays(beginTimeOfDay, 1), DatePattern.NORM_DATETIME_PATTERN))); - chargeUv.setThreeCondition(flowDataBatchSearchAdminMapper.getChargeUv(searchKey, startTimeStr, endTimeStr, startTimeStr, DateTimeUtil.convertDate(DateTimeUtil.addDays(beginTimeOfDay, 2), DatePattern.NORM_DATETIME_PATTERN))); - chargeUv.setSevenCondition(flowDataBatchSearchAdminMapper.getChargeUv(searchKey, startTimeStr, endTimeStr, startTimeStr, DateTimeUtil.convertDate(DateTimeUtil.addDays(beginTimeOfDay, 6), DatePattern.NORM_DATETIME_PATTERN))); - chargeUv.setFifteenCondition(flowDataBatchSearchAdminMapper.getChargeUv(searchKey, startTimeStr, endTimeStr, startTimeStr, DateTimeUtil.convertDate(DateTimeUtil.addDays(beginTimeOfDay, 14), DatePattern.NORM_DATETIME_PATTERN))); - chargeUv.setThirtyCondition(flowDataBatchSearchAdminMapper.getChargeUv(searchKey, startTimeStr, endTimeStr, startTimeStr, DateTimeUtil.convertDate(DateTimeUtil.addDays(beginTimeOfDay, 29), DatePattern.NORM_DATETIME_PATTERN))); - chargeUv.setTotalCondition(flowDataBatchSearchAdminMapper.getChargeUv(searchKey, startTimeStr, endTimeStr, startTimeStr, DateTimeUtil.convertDate(now, DatePattern.NORM_DATETIME_PATTERN))); - admins.add(chargeUv); - //收到转赠UV - FlowDataBatchSearchGrowAdminVo giveUv = new FlowDataBatchSearchGrowAdminVo(); - giveUv.setCountItem("收到转赠UV"); - giveUv.setCurrCondition(flowDataBatchSearchAdminMapper.getGiveUv(searchKey, startTimeStr, endTimeStr, startTimeStr, DateTimeUtil.convertDate(endTimeOfDay, DatePattern.NORM_DATETIME_PATTERN))); - giveUv.setNextCondition(flowDataBatchSearchAdminMapper.getGiveUv(searchKey, startTimeStr, endTimeStr, DateTimeUtil.convertDate(DateTimeUtil.getBeginTimeOfDay(DateTimeUtil.addDays(beginTimeOfDay, 1)), DatePattern.NORM_DATETIME_PATTERN), DateTimeUtil.convertDate(DateTimeUtil.addDays(beginTimeOfDay, 1), DatePattern.NORM_DATETIME_PATTERN))); - giveUv.setThreeCondition(flowDataBatchSearchAdminMapper.getGiveUv(searchKey, startTimeStr, endTimeStr, startTimeStr, DateTimeUtil.convertDate(DateTimeUtil.addDays(beginTimeOfDay, 2), DatePattern.NORM_DATETIME_PATTERN))); - giveUv.setSevenCondition(flowDataBatchSearchAdminMapper.getGiveUv(searchKey, startTimeStr, endTimeStr, startTimeStr, DateTimeUtil.convertDate(DateTimeUtil.addDays(beginTimeOfDay, 6), DatePattern.NORM_DATETIME_PATTERN))); - giveUv.setFifteenCondition(flowDataBatchSearchAdminMapper.getGiveUv(searchKey, startTimeStr, endTimeStr, startTimeStr, DateTimeUtil.convertDate(DateTimeUtil.addDays(beginTimeOfDay, 14), DatePattern.NORM_DATETIME_PATTERN))); - giveUv.setThirtyCondition(flowDataBatchSearchAdminMapper.getGiveUv(searchKey, startTimeStr, endTimeStr, startTimeStr, DateTimeUtil.convertDate(DateTimeUtil.addDays(beginTimeOfDay, 29), DatePattern.NORM_DATETIME_PATTERN))); - giveUv.setTotalCondition(flowDataBatchSearchAdminMapper.getGiveUv(searchKey, startTimeStr, endTimeStr, startTimeStr, DateTimeUtil.convertDate(now, DatePattern.NORM_DATETIME_PATTERN))); - admins.add(giveUv); - //全量付费UV - FlowDataBatchSearchGrowAdminVo payUv = new FlowDataBatchSearchGrowAdminVo(); - payUv.setCountItem("全量付费UV"); - payUv.setCurrCondition(flowDataBatchSearchAdminMapper.getPayUv(searchKey, startTimeStr, endTimeStr, startTimeStr, DateTimeUtil.convertDate(endTimeOfDay, DatePattern.NORM_DATETIME_PATTERN))); - payUv.setNextCondition(flowDataBatchSearchAdminMapper.getPayUv(searchKey, startTimeStr, endTimeStr, DateTimeUtil.convertDate(DateTimeUtil.getBeginTimeOfDay(DateTimeUtil.addDays(beginTimeOfDay, 1)), DatePattern.NORM_DATETIME_PATTERN), DateTimeUtil.convertDate(DateTimeUtil.addDays(beginTimeOfDay, 1), DatePattern.NORM_DATETIME_PATTERN))); - payUv.setThreeCondition(flowDataBatchSearchAdminMapper.getPayUv(searchKey, startTimeStr, endTimeStr, startTimeStr, DateTimeUtil.convertDate(DateTimeUtil.addDays(beginTimeOfDay, 2), DatePattern.NORM_DATETIME_PATTERN))); - payUv.setSevenCondition(flowDataBatchSearchAdminMapper.getPayUv(searchKey, startTimeStr, endTimeStr, startTimeStr, DateTimeUtil.convertDate(DateTimeUtil.addDays(beginTimeOfDay, 6), DatePattern.NORM_DATETIME_PATTERN))); - payUv.setFifteenCondition(flowDataBatchSearchAdminMapper.getPayUv(searchKey, startTimeStr, endTimeStr, startTimeStr, DateTimeUtil.convertDate(DateTimeUtil.addDays(beginTimeOfDay, 14), DatePattern.NORM_DATETIME_PATTERN))); - payUv.setThirtyCondition(flowDataBatchSearchAdminMapper.getPayUv(searchKey, startTimeStr, endTimeStr, startTimeStr, DateTimeUtil.convertDate(DateTimeUtil.addDays(beginTimeOfDay, 29), DatePattern.NORM_DATETIME_PATTERN))); - payUv.setTotalCondition(flowDataBatchSearchAdminMapper.getPayUv(searchKey, startTimeStr, endTimeStr, startTimeStr, DateTimeUtil.convertDate(now, DatePattern.NORM_DATETIME_PATTERN))); - admins.add(payUv); - //直充付费率 - FlowDataBatchSearchGrowAdminVo chargeRate = new FlowDataBatchSearchGrowAdminVo(); - chargeRate.setCountItem("直充付费率"); - chargeRate.setIsPercentage(true); - chargeRate.setCurrCondition(ascribeTimeUv != 0 ? chargeUv.getCurrCondition() / ascribeTimeUv : 0); - chargeRate.setNextCondition(ascribeTimeUv != 0 ? chargeUv.getNextCondition() / ascribeTimeUv : 0); - chargeRate.setThreeCondition(ascribeTimeUv != 0 ? chargeUv.getThreeCondition() / ascribeTimeUv : 0); - chargeRate.setSevenCondition(ascribeTimeUv != 0 ? chargeUv.getSevenCondition() / ascribeTimeUv : 0); - chargeRate.setFifteenCondition(ascribeTimeUv != 0 ? chargeUv.getFifteenCondition() / ascribeTimeUv : 0); - chargeRate.setThirtyCondition(ascribeTimeUv != 0 ? chargeUv.getThirtyCondition() / ascribeTimeUv : 0); - chargeRate.setTotalCondition(ascribeTimeUv != 0 ? chargeUv.getTotalCondition() / ascribeTimeUv : 0); - admins.add(chargeRate); - //直充付费成本 - FlowDataBatchSearchGrowAdminVo chargeCost = new FlowDataBatchSearchGrowAdminVo(); - chargeCost.setCountItem("直充付费成本"); - chargeCost.setCurrCondition(chargeUv.getCurrCondition() != 0 ? amount.divide(BigDecimal.valueOf(chargeUv.getCurrCondition()), 2, RoundingMode.HALF_UP).doubleValue() : 0); - chargeCost.setNextCondition(chargeUv.getNextCondition() != 0 ? amount.divide(BigDecimal.valueOf(chargeUv.getNextCondition()), 2, RoundingMode.HALF_UP).doubleValue() : 0); - chargeCost.setThreeCondition(chargeUv.getThreeCondition() != 0 ? amount.divide(BigDecimal.valueOf(chargeUv.getThreeCondition()), 2, RoundingMode.HALF_UP).doubleValue() : 0); - chargeCost.setSevenCondition(chargeUv.getSevenCondition() != 0 ? amount.divide(BigDecimal.valueOf(chargeUv.getSevenCondition()), 2, RoundingMode.HALF_UP).doubleValue() : 0); - chargeCost.setFifteenCondition(chargeUv.getFifteenCondition() != 0 ? amount.divide(BigDecimal.valueOf(chargeUv.getFifteenCondition()), 2, RoundingMode.HALF_UP).doubleValue() : 0); - chargeCost.setThirtyCondition(chargeUv.getThirtyCondition() != 0 ? amount.divide(BigDecimal.valueOf(chargeUv.getThirtyCondition()), 2, RoundingMode.HALF_UP).doubleValue() : 0); - chargeCost.setTotalCondition(chargeUv.getTotalCondition() != 0 ? amount.divide(BigDecimal.valueOf(chargeUv.getTotalCondition()), 2, RoundingMode.HALF_UP).doubleValue() : 0); - admins.add(chargeCost); - //直充付费金额 - FlowDataBatchSearchGrowAdminVo chargeAmount = new FlowDataBatchSearchGrowAdminVo(); - chargeAmount.setCountItem("直充付费金额"); - chargeAmount.setCurrCondition(flowDataBatchSearchAdminMapper.getChargeAmount(searchKey, startTimeStr, endTimeStr, startTimeStr, DateTimeUtil.convertDate(endTimeOfDay, DatePattern.NORM_DATETIME_PATTERN))); - chargeAmount.setNextCondition(flowDataBatchSearchAdminMapper.getChargeAmount(searchKey, startTimeStr, endTimeStr, DateTimeUtil.convertDate(DateTimeUtil.getBeginTimeOfDay(DateTimeUtil.addDays(beginTimeOfDay, 1)), DatePattern.NORM_DATETIME_PATTERN), DateTimeUtil.convertDate(DateTimeUtil.addDays(beginTimeOfDay, 1), DatePattern.NORM_DATETIME_PATTERN))); - chargeAmount.setThreeCondition(flowDataBatchSearchAdminMapper.getChargeAmount(searchKey, startTimeStr, endTimeStr, startTimeStr, DateTimeUtil.convertDate(DateTimeUtil.addDays(beginTimeOfDay, 2), DatePattern.NORM_DATETIME_PATTERN))); - chargeAmount.setSevenCondition(flowDataBatchSearchAdminMapper.getChargeAmount(searchKey, startTimeStr, endTimeStr, startTimeStr, DateTimeUtil.convertDate(DateTimeUtil.addDays(beginTimeOfDay, 6), DatePattern.NORM_DATETIME_PATTERN))); - chargeAmount.setFifteenCondition(flowDataBatchSearchAdminMapper.getChargeAmount(searchKey, startTimeStr, endTimeStr, startTimeStr, DateTimeUtil.convertDate(DateTimeUtil.addDays(beginTimeOfDay, 14), DatePattern.NORM_DATETIME_PATTERN))); - chargeAmount.setThirtyCondition(flowDataBatchSearchAdminMapper.getChargeAmount(searchKey, startTimeStr, endTimeStr, startTimeStr, DateTimeUtil.convertDate(DateTimeUtil.addDays(beginTimeOfDay, 29), DatePattern.NORM_DATETIME_PATTERN))); - chargeAmount.setTotalCondition(flowDataBatchSearchAdminMapper.getChargeAmount(searchKey, startTimeStr, endTimeStr, startTimeStr, DateTimeUtil.convertDate(now, DatePattern.NORM_DATETIME_PATTERN))); - admins.add(chargeAmount); - //收到转赠的数额 - FlowDataBatchSearchGrowAdminVo giveAmount = new FlowDataBatchSearchGrowAdminVo(); - giveAmount.setCountItem("收到转赠的数额"); - giveAmount.setCurrCondition(flowDataBatchSearchAdminMapper.getGiveAmount(searchKey, startTimeStr, endTimeStr, startTimeStr, DateTimeUtil.convertDate(endTimeOfDay, DatePattern.NORM_DATETIME_PATTERN))); - giveAmount.setNextCondition(flowDataBatchSearchAdminMapper.getGiveAmount(searchKey, startTimeStr, endTimeStr, DateTimeUtil.convertDate(DateTimeUtil.getBeginTimeOfDay(DateTimeUtil.addDays(beginTimeOfDay, 1)), DatePattern.NORM_DATETIME_PATTERN), DateTimeUtil.convertDate(DateTimeUtil.addDays(beginTimeOfDay, 1), DatePattern.NORM_DATETIME_PATTERN))); - giveAmount.setThreeCondition(flowDataBatchSearchAdminMapper.getGiveAmount(searchKey, startTimeStr, endTimeStr, startTimeStr, DateTimeUtil.convertDate(DateTimeUtil.addDays(beginTimeOfDay, 2), DatePattern.NORM_DATETIME_PATTERN))); - giveAmount.setSevenCondition(flowDataBatchSearchAdminMapper.getGiveAmount(searchKey, startTimeStr, endTimeStr, startTimeStr, DateTimeUtil.convertDate(DateTimeUtil.addDays(beginTimeOfDay, 6), DatePattern.NORM_DATETIME_PATTERN))); - giveAmount.setFifteenCondition(flowDataBatchSearchAdminMapper.getGiveAmount(searchKey, startTimeStr, endTimeStr, startTimeStr, DateTimeUtil.convertDate(DateTimeUtil.addDays(beginTimeOfDay, 14), DatePattern.NORM_DATETIME_PATTERN))); - giveAmount.setThirtyCondition(flowDataBatchSearchAdminMapper.getGiveAmount(searchKey, startTimeStr, endTimeStr, startTimeStr, DateTimeUtil.convertDate(DateTimeUtil.addDays(beginTimeOfDay, 29), DatePattern.NORM_DATETIME_PATTERN))); - giveAmount.setTotalCondition(flowDataBatchSearchAdminMapper.getGiveAmount(searchKey, startTimeStr, endTimeStr, startTimeStr, DateTimeUtil.convertDate(now, DatePattern.NORM_DATETIME_PATTERN))); - admins.add(giveAmount); - //全量付费率 - FlowDataBatchSearchGrowAdminVo payRate = new FlowDataBatchSearchGrowAdminVo(); - payRate.setCountItem("全量付费率"); - payRate.setIsPercentage(true); - payRate.setCurrCondition(ascribeTimeUv != 0 ? payUv.getCurrCondition() / ascribeTimeUv : 0); - payRate.setNextCondition(ascribeTimeUv != 0 ? payUv.getNextCondition() / ascribeTimeUv : 0); - payRate.setThreeCondition(ascribeTimeUv != 0 ? payUv.getThreeCondition() / ascribeTimeUv : 0); - payRate.setSevenCondition(ascribeTimeUv != 0 ? payUv.getSevenCondition() / ascribeTimeUv : 0); - payRate.setFifteenCondition(ascribeTimeUv != 0 ? payUv.getFifteenCondition() / ascribeTimeUv : 0); - payRate.setThirtyCondition(ascribeTimeUv != 0 ? payUv.getThirtyCondition() / ascribeTimeUv : 0); - payRate.setTotalCondition(ascribeTimeUv != 0 ? payUv.getTotalCondition() / ascribeTimeUv : 0); - admins.add(payRate); - //全量付费成本 - FlowDataBatchSearchGrowAdminVo payCost = new FlowDataBatchSearchGrowAdminVo(); - payCost.setCountItem("全量付费成本"); - payCost.setCurrCondition(payUv.getCurrCondition() != 0 ? amount.divide(BigDecimal.valueOf(payUv.getCurrCondition()), 2, RoundingMode.HALF_UP).doubleValue() : 0); - payCost.setNextCondition(payUv.getNextCondition() != 0 ? amount.divide(BigDecimal.valueOf(payUv.getNextCondition()), 2, RoundingMode.HALF_UP).doubleValue() : 0); - payCost.setThreeCondition(payUv.getThreeCondition() != 0 ? amount.divide(BigDecimal.valueOf(payUv.getThreeCondition()), 2, RoundingMode.HALF_UP).doubleValue() : 0); - payCost.setSevenCondition(payUv.getSevenCondition() != 0 ? amount.divide(BigDecimal.valueOf(payUv.getSevenCondition()), 2, RoundingMode.HALF_UP).doubleValue() : 0); - payCost.setFifteenCondition(payUv.getFifteenCondition() != 0 ? amount.divide(BigDecimal.valueOf(payUv.getFifteenCondition()), 2, RoundingMode.HALF_UP).doubleValue() : 0); - payCost.setThirtyCondition(payUv.getThirtyCondition() != 0 ? amount.divide(BigDecimal.valueOf(payUv.getThirtyCondition()), 2, RoundingMode.HALF_UP).doubleValue() : 0); - payCost.setTotalCondition(payUv.getTotalCondition() != 0 ? amount.divide(BigDecimal.valueOf(payUv.getTotalCondition()), 2, RoundingMode.HALF_UP).doubleValue() : 0); - admins.add(payCost); - //全量付费金额 - FlowDataBatchSearchGrowAdminVo payAmount = new FlowDataBatchSearchGrowAdminVo(); - payAmount.setCountItem("全量付费金额"); - payAmount.setCurrCondition(chargeAmount.getCurrCondition() + giveAmount.getCurrCondition()); - payAmount.setNextCondition(chargeAmount.getNextCondition() + giveAmount.getNextCondition()); - payAmount.setThreeCondition(chargeAmount.getThreeCondition() + giveAmount.getThreeCondition()); - payAmount.setSevenCondition(chargeAmount.getSevenCondition() + giveAmount.getSevenCondition()); - payAmount.setFifteenCondition(chargeAmount.getFifteenCondition() + giveAmount.getFifteenCondition()); - payAmount.setThirtyCondition(chargeAmount.getThirtyCondition() + giveAmount.getThirtyCondition()); - payAmount.setTotalCondition(chargeAmount.getTotalCondition() + giveAmount.getTotalCondition()); - admins.add(payAmount); - //直充ROI - FlowDataBatchSearchGrowAdminVo chargeRoi = new FlowDataBatchSearchGrowAdminVo(); - chargeRoi.setCountItem("直充ROI"); - chargeRoi.setCurrCondition(amount.doubleValue() != 0 ? chargeAmount.getCurrCondition() / amount.doubleValue() : 0); - chargeRoi.setNextCondition(amount.doubleValue() != 0 ? chargeAmount.getNextCondition() / amount.doubleValue() : 0); - chargeRoi.setThreeCondition(amount.doubleValue() != 0 ? chargeAmount.getThreeCondition() / amount.doubleValue() : 0); - chargeRoi.setSevenCondition(amount.doubleValue() != 0 ? chargeAmount.getSevenCondition() / amount.doubleValue() : 0); - chargeRoi.setFifteenCondition(amount.doubleValue() != 0 ? chargeAmount.getFifteenCondition() / amount.doubleValue() : 0); - chargeRoi.setThirtyCondition(amount.doubleValue() != 0 ? chargeAmount.getThirtyCondition() / amount.doubleValue() : 0); - chargeRoi.setTotalCondition(amount.doubleValue() != 0 ? chargeAmount.getTotalCondition() / amount.doubleValue() : 0); - admins.add(chargeRoi); - //全量付费ROI - FlowDataBatchSearchGrowAdminVo payRoi = new FlowDataBatchSearchGrowAdminVo(); - payRoi.setCountItem("全量付费ROI"); - payRoi.setCurrCondition(amount.doubleValue() != 0 ? payAmount.getCurrCondition() / amount.doubleValue() : 0); - payRoi.setNextCondition(amount.doubleValue() != 0 ? payAmount.getNextCondition() / amount.doubleValue() : 0); - payRoi.setThreeCondition(amount.doubleValue() != 0 ? payAmount.getThreeCondition() / amount.doubleValue() : 0); - payRoi.setSevenCondition(amount.doubleValue() != 0 ? payAmount.getSevenCondition() / amount.doubleValue() : 0); - payRoi.setFifteenCondition(amount.doubleValue() != 0 ? payAmount.getFifteenCondition() / amount.doubleValue() : 0); - payRoi.setThirtyCondition(amount.doubleValue() != 0 ? payAmount.getThirtyCondition() / amount.doubleValue() : 0); - payRoi.setTotalCondition(amount.doubleValue() != 0 ? payAmount.getTotalCondition() / amount.doubleValue() : 0); - admins.add(payRoi); - //留存用户数 - Double nextRemainCount = flowDataBatchSearchAdminMapper.getRemainCount(searchKey, startTimeStr, endTimeStr, 1); - Double threeRemainCount = flowDataBatchSearchAdminMapper.getRemainCount(searchKey, startTimeStr, endTimeStr, 2); - Double sevenRemainCount = flowDataBatchSearchAdminMapper.getRemainCount(searchKey, startTimeStr, endTimeStr, 6); - Double fifteenRemainCount = flowDataBatchSearchAdminMapper.getRemainCount(searchKey, startTimeStr, endTimeStr, 14); - Double thirtyRemainCount = flowDataBatchSearchAdminMapper.getRemainCount(searchKey, startTimeStr, endTimeStr, 29); - Double totalRemainCount = flowDataBatchSearchAdminMapper.getRemainCount(searchKey, startTimeStr, endTimeStr, -1); - FlowDataBatchSearchGrowAdminVo remainCount = new FlowDataBatchSearchGrowAdminVo(); - remainCount.setCountItem("留存用户数"); - remainCount.setNextCondition(nextRemainCount != null ? nextRemainCount : 0); - remainCount.setThreeCondition(threeRemainCount != null ? threeRemainCount : 0); - remainCount.setSevenCondition(sevenRemainCount != null ? sevenRemainCount : 0); - remainCount.setFifteenCondition(fifteenRemainCount != null ? fifteenRemainCount : 0); - remainCount.setThirtyCondition(thirtyRemainCount != null ? thirtyRemainCount : 0); - remainCount.setTotalCondition(totalRemainCount != null ? totalRemainCount : 0); - admins.add(remainCount); - //留存率 - FlowDataBatchSearchGrowAdminVo remainRate = new FlowDataBatchSearchGrowAdminVo(); - remainRate.setCountItem("留存率"); - remainRate.setIsPercentage(true); - remainRate.setNextCondition(ascribeTimeUv != 0 ? remainCount.getNextCondition() / ascribeTimeUv : 0); - remainRate.setThreeCondition(ascribeTimeUv != 0 ? remainCount.getThreeCondition() / ascribeTimeUv : 0); - remainRate.setSevenCondition(ascribeTimeUv != 0 ? remainCount.getSevenCondition() / ascribeTimeUv : 0); - remainRate.setFifteenCondition(ascribeTimeUv != 0 ? remainCount.getFifteenCondition() / ascribeTimeUv : 0); - remainRate.setThirtyCondition(ascribeTimeUv != 0 ? remainCount.getThirtyCondition() / ascribeTimeUv : 0); - remainRate.setTotalCondition(ascribeTimeUv != 0 ? remainCount.getTotalCondition() / ascribeTimeUv : 0); - admins.add(remainRate); - //留存成本 - FlowDataBatchSearchGrowAdminVo remainCost = new FlowDataBatchSearchGrowAdminVo(); - remainCost.setCountItem("留存成本"); - remainCost.setNextCondition(remainCount.getNextCondition() != 0 ? amount.divide(BigDecimal.valueOf(remainCount.getNextCondition()), 2, RoundingMode.HALF_UP).doubleValue() : 0); - remainCost.setThreeCondition(remainCount.getThreeCondition() != 0 ? amount.divide(BigDecimal.valueOf(remainCount.getThreeCondition()), 2, RoundingMode.HALF_UP).doubleValue() : 0); - remainCost.setSevenCondition(remainCount.getSevenCondition() != 0 ? amount.divide(BigDecimal.valueOf(remainCount.getSevenCondition()), 2, RoundingMode.HALF_UP).doubleValue() : 0); - remainCost.setFifteenCondition(remainCount.getFifteenCondition() != 0 ? amount.divide(BigDecimal.valueOf(remainCount.getFifteenCondition()), 2, RoundingMode.HALF_UP).doubleValue() : 0); - remainCost.setThirtyCondition(remainCount.getThirtyCondition() != 0 ? amount.divide(BigDecimal.valueOf(remainCount.getThirtyCondition()), 2, RoundingMode.HALF_UP).doubleValue() : 0); - remainCost.setTotalCondition(remainCount.getTotalCondition() != 0 ? amount.divide(BigDecimal.valueOf(remainCount.getTotalCondition()), 2, RoundingMode.HALF_UP).doubleValue() : 0); - admins.add(remainCost); - jedisService.hset(RedisKey.flow_data_batch_search_detail_hash.getKey(), String.valueOf(batchId), JSONArray.toJSONString(admins)); - jedisService.expire(RedisKey.flow_data_batch_search_detail_hash.getKey(), 10 * 60); - } - return admins; - } - - @Override - public void growExport(Long batchId, ServletWebRequest servletWebRequest) { - List datas = new ArrayList<>(); - List records = growList(batchId); - if (CollectionUtil.isNotEmpty(records)) { - for (FlowDataBatchSearchGrowAdminVo record : records) { - FlowDataBatchSearchGrowAdminDto admin = new FlowDataBatchSearchGrowAdminDto(); - Boolean isPercentage = record.getIsPercentage(); - admin.setCountItem(record.getCountItem()); - if (isPercentage) { - admin.setCurrCondition(BigDecimal.valueOf(record.getCurrCondition() * 100).setScale(2, RoundingMode.HALF_UP) + "%"); - admin.setNextCondition(BigDecimal.valueOf(record.getNextCondition() * 100).setScale(2, RoundingMode.HALF_UP) + "%"); - admin.setThreeCondition(BigDecimal.valueOf(record.getThreeCondition() * 100).setScale(2, RoundingMode.HALF_UP) + "%"); - admin.setSevenCondition(BigDecimal.valueOf(record.getSevenCondition() * 100).setScale(2, RoundingMode.HALF_UP) + "%"); - admin.setFifteenCondition(BigDecimal.valueOf(record.getFifteenCondition() * 100).setScale(2, RoundingMode.HALF_UP) + "%"); - admin.setThirtyCondition(BigDecimal.valueOf(record.getThirtyCondition() * 100).setScale(2, RoundingMode.HALF_UP) + "%"); - admin.setTotalCondition(BigDecimal.valueOf(record.getTotalCondition() * 100).setScale(2, RoundingMode.HALF_UP) + "%"); - } else { - admin.setCurrCondition(String.valueOf(BigDecimal.valueOf(record.getCurrCondition()).setScale(2, RoundingMode.HALF_UP))); - admin.setNextCondition(String.valueOf(BigDecimal.valueOf(record.getNextCondition()).setScale(2, RoundingMode.HALF_UP))); - admin.setThreeCondition(String.valueOf(BigDecimal.valueOf(record.getThreeCondition()).setScale(2, RoundingMode.HALF_UP))); - admin.setSevenCondition(String.valueOf(BigDecimal.valueOf(record.getSevenCondition()).setScale(2, RoundingMode.HALF_UP))); - admin.setFifteenCondition(String.valueOf(BigDecimal.valueOf(record.getFifteenCondition()).setScale(2, RoundingMode.HALF_UP))); - admin.setThirtyCondition(String.valueOf(BigDecimal.valueOf(record.getThirtyCondition()).setScale(2, RoundingMode.HALF_UP))); - admin.setTotalCondition(String.valueOf(BigDecimal.valueOf(record.getTotalCondition()).setScale(2, RoundingMode.HALF_UP))); - } - datas.add(admin); - } - } - if (servletWebRequest.getResponse() != null) { - try { - //这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman - servletWebRequest.getResponse().setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); - servletWebRequest.getResponse().setCharacterEncoding("utf-8"); - //这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系 - String fileName = URLEncoder.encode("付费成长数据", "UTF-8").replaceAll("\\+", "%20"); - servletWebRequest.getResponse().setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); - EasyExcel.write(servletWebRequest.getResponse().getOutputStream(), FlowDataBatchSearchGrowAdminDto.class).sheet("付费成长数据").doWrite(datas); - } catch (Exception e) { - log.error(e.getMessage(), e); - } - } - } - - private List getDetailList(Long batchId) { - FlowDataBatchSearch search = flowDataBatchSearchService.getById(batchId); - if (search == null) { - return Collections.emptyList(); - } - String searchKey = search.getSearchKey(); - Long roomUid = search.getRoomUid(); - Date startTime = search.getStartTime(); - Date endTime = search.getEndTime(); - String startTimeStr = DateTimeUtil.convertDate(startTime, DatePattern.NORM_DATETIME_PATTERN); - String endTimeStr = DateTimeUtil.convertDate(endTime, DatePattern.NORM_DATETIME_PATTERN); - Date beginTimeOfDay = DateTimeUtil.getEndTimeOfDay(DateTimeUtil.getBeginTimeOfDay(startTime)); - Date endTimeOfDay = DateTimeUtil.getEndTimeOfDay(endTime); - Date now = new Date(); - List yearMonths = DateTimeUtil.getYearMonths(startTimeStr, endTimeStr); - //用户 - List userDetails = flowDataBatchSearchAdminMapper.getUserDetail(searchKey, startTimeStr, endTimeStr); - if (CollectionUtil.isEmpty(userDetails)) { - return Collections.emptyList(); - } - Users roomUsers = usersBaseService.getUsersByUid(roomUid); - if (roomUsers == null) { - return Collections.emptyList(); - } - List erBanNos = userDetails.stream().map(FlowDataBatchSearchDetailAdminDto::getErBanNo).collect(Collectors.toList()); - //设备 - List userDevices = flowDataBatchSearchAdminMapper.getDevice(erBanNos); - //进房 - List inRooms = flowDataBatchSearchAdminMapper.getInRoom(erBanNos, roomUid, startTimeStr, endTimeStr); - //当天充值 - List currChargeAmounts = flowDataBatchSearchAdminMapper.getChargeAmountList(erBanNos, startTimeStr, DateTimeUtil.convertDate(endTimeOfDay, DatePattern.NORM_DATETIME_PATTERN)); - //3天充值 - List threeChargeAmounts = flowDataBatchSearchAdminMapper.getChargeAmountList(erBanNos, startTimeStr, DateTimeUtil.convertDate(DateTimeUtil.addDays(beginTimeOfDay, 2), DatePattern.NORM_DATETIME_PATTERN)); - //7天充值 - List sevenChargeAmounts = flowDataBatchSearchAdminMapper.getChargeAmountList(erBanNos, startTimeStr, DateTimeUtil.convertDate(DateTimeUtil.addDays(beginTimeOfDay, 6), DatePattern.NORM_DATETIME_PATTERN)); - //15天充值 - List fifteenChargeAmounts = flowDataBatchSearchAdminMapper.getChargeAmountList(erBanNos, startTimeStr, DateTimeUtil.convertDate(DateTimeUtil.addDays(beginTimeOfDay, 14), DatePattern.NORM_DATETIME_PATTERN)); - //30天充值 - List thirtyChargeAmounts = flowDataBatchSearchAdminMapper.getChargeAmountList(erBanNos, startTimeStr, DateTimeUtil.convertDate(DateTimeUtil.addDays(beginTimeOfDay, 29), DatePattern.NORM_DATETIME_PATTERN)); - //累计充值 - List totalChargeAmounts = flowDataBatchSearchAdminMapper.getChargeAmountList(erBanNos, startTimeStr, DateTimeUtil.convertDate(now, DatePattern.NORM_DATETIME_PATTERN)); - //当天转赠 - List currGiveDiamondNums = flowDataBatchSearchAdminMapper.getGiveAmountList(erBanNos, startTimeStr, DateTimeUtil.convertDate(endTimeOfDay, DatePattern.NORM_DATETIME_PATTERN)); - //3天转赠 - List threeGiveDiamondNums = flowDataBatchSearchAdminMapper.getGiveAmountList(erBanNos, startTimeStr, DateTimeUtil.convertDate(DateTimeUtil.addDays(beginTimeOfDay, 2), DatePattern.NORM_DATETIME_PATTERN)); - //7天转赠 - List sevenGiveDiamondNums = flowDataBatchSearchAdminMapper.getGiveAmountList(erBanNos, startTimeStr, DateTimeUtil.convertDate(DateTimeUtil.addDays(beginTimeOfDay, 6), DatePattern.NORM_DATETIME_PATTERN)); - //15天转赠 - List fifteenGiveDiamondNums = flowDataBatchSearchAdminMapper.getGiveAmountList(erBanNos, startTimeStr, DateTimeUtil.convertDate(DateTimeUtil.addDays(beginTimeOfDay, 14), DatePattern.NORM_DATETIME_PATTERN)); - //30天转赠 - List thirtyGiveDiamondNums = flowDataBatchSearchAdminMapper.getGiveAmountList(erBanNos, startTimeStr, DateTimeUtil.convertDate(DateTimeUtil.addDays(beginTimeOfDay, 29), DatePattern.NORM_DATETIME_PATTERN)); - //累计转赠 - List totalGiveDiamondNums = flowDataBatchSearchAdminMapper.getGiveAmountList(erBanNos, startTimeStr, DateTimeUtil.convertDate(now, DatePattern.NORM_DATETIME_PATTERN)); - //次日是否访问 - List twoRemainCounts = flowDataBatchSearchAdminMapper.getRemainCountList(erBanNos, startTimeStr, endTimeStr, 1); - //第3日是否访问 - List threeRemainCounts = flowDataBatchSearchAdminMapper.getRemainCountList(erBanNos, startTimeStr, endTimeStr, 2); - //第7日是否访问 - List sevenRemainCounts = flowDataBatchSearchAdminMapper.getRemainCountList(erBanNos, startTimeStr, endTimeStr, 6); - //第15日是否访问 - List fifteenRemainCounts = flowDataBatchSearchAdminMapper.getRemainCountList(erBanNos, startTimeStr, endTimeStr, 14); - //第30日是否访问 - List thirtyRemainCounts = flowDataBatchSearchAdminMapper.getRemainCountList(erBanNos, startTimeStr, endTimeStr, 29); - for (FlowDataBatchSearchDetailAdminDto userDetail : userDetails) { - Long erBanNo = userDetail.getErBanNo(); - String deviceId = userDetail.getDeviceId(); - Users users = usersBaseService.getUsersByErBanNo(erBanNo); - if (users == null) { - continue; - } - Long uid = users.getUid(); - if (StrUtil.isNotEmpty(deviceId) && CollectionUtil.isNotEmpty(userDevices)) { - userDevices.stream() - .filter(v -> deviceId.equals(v.getDeviceId())) - .findAny() - .ifPresent(v -> userDetail.setIsNewDevice(v.getIsNewDevice())); - } - if (CollectionUtil.isNotEmpty(inRooms)) { - inRooms.stream() - .filter(v -> erBanNo.equals(v.getErBanNo())) - .findAny() - .ifPresent(v -> userDetail.setIsInRoomStr(v.getIsInRoomStr())); - } - //活动期间私聊行为数 - userDetail.setChatCount(flowDataBatchSearchAdminMapper.getChatCount(uid, yearMonths, startTimeStr, endTimeStr)); - //当天充值 - if (CollectionUtil.isNotEmpty(currChargeAmounts)) { - currChargeAmounts.stream() - .filter(v -> erBanNo.equals(v.getErBanNo())) - .findAny() - .ifPresent(v -> userDetail.setChargeAmount(v.getChargeAmount())); - } - //3天充值 - if (CollectionUtil.isNotEmpty(threeChargeAmounts)) { - threeChargeAmounts.stream() - .filter(v -> erBanNo.equals(v.getErBanNo())) - .findAny() - .ifPresent(v -> userDetail.setThreeChargeAmount(v.getChargeAmount())); - } - //7天充值 - if (CollectionUtil.isNotEmpty(sevenChargeAmounts)) { - sevenChargeAmounts.stream() - .filter(v -> erBanNo.equals(v.getErBanNo())) - .findAny() - .ifPresent(v -> userDetail.setSevenChargeAmount(v.getChargeAmount())); - } - //15天充值 - if (CollectionUtil.isNotEmpty(fifteenChargeAmounts)) { - fifteenChargeAmounts.stream() - .filter(v -> erBanNo.equals(v.getErBanNo())) - .findAny() - .ifPresent(v -> userDetail.setFifteenChargeAmount(v.getChargeAmount())); - } - //30天充值 - if (CollectionUtil.isNotEmpty(thirtyChargeAmounts)) { - thirtyChargeAmounts.stream() - .filter(v -> erBanNo.equals(v.getErBanNo())) - .findAny() - .ifPresent(v -> userDetail.setThirtyChargeAmount(v.getChargeAmount())); - } - //累计充值 - if (CollectionUtil.isNotEmpty(totalChargeAmounts)) { - totalChargeAmounts.stream() - .filter(v -> erBanNo.equals(v.getErBanNo())) - .findAny() - .ifPresent(v -> userDetail.setTotalChargeAmount(v.getChargeAmount())); - } - //当天转赠 - if (CollectionUtil.isNotEmpty(currGiveDiamondNums)) { - currGiveDiamondNums.stream() - .filter(v -> erBanNo.equals(v.getErBanNo())) - .findAny() - .ifPresent(v -> userDetail.setGiveDiamondNum(v.getGiveDiamondNum())); - } - //3天转赠 - if (CollectionUtil.isNotEmpty(threeGiveDiamondNums)) { - threeGiveDiamondNums.stream() - .filter(v -> erBanNo.equals(v.getErBanNo())) - .findAny() - .ifPresent(v -> userDetail.setThreeGiveDiamondNum(v.getGiveDiamondNum())); - } - //7天转赠 - if (CollectionUtil.isNotEmpty(sevenGiveDiamondNums)) { - sevenGiveDiamondNums.stream() - .filter(v -> erBanNo.equals(v.getErBanNo())) - .findAny() - .ifPresent(v -> userDetail.setSevenGiveDiamondNum(v.getGiveDiamondNum())); - } - //15天转赠 - if (CollectionUtil.isNotEmpty(fifteenGiveDiamondNums)) { - fifteenGiveDiamondNums.stream() - .filter(v -> erBanNo.equals(v.getErBanNo())) - .findAny() - .ifPresent(v -> userDetail.setFifteenGiveDiamondNum(v.getGiveDiamondNum())); - } - //30天转赠 - if (CollectionUtil.isNotEmpty(thirtyGiveDiamondNums)) { - thirtyGiveDiamondNums.stream() - .filter(v -> erBanNo.equals(v.getErBanNo())) - .findAny() - .ifPresent(v -> userDetail.setThirtyGiveDiamondNum(v.getGiveDiamondNum())); - } - //累计转赠 - if (CollectionUtil.isNotEmpty(totalGiveDiamondNums)) { - totalGiveDiamondNums.stream() - .filter(v -> erBanNo.equals(v.getErBanNo())) - .findAny() - .ifPresent(v -> userDetail.setTotalGiveDiamondNum(v.getGiveDiamondNum())); - } - //次日是否访问 - if (CollectionUtil.isNotEmpty(twoRemainCounts)) { - twoRemainCounts.stream() - .filter(v -> erBanNo.equals(v.getErBanNo())) - .findAny() - .ifPresent(v -> userDetail.setIsRemain(v.getIsRemain())); - } - //第3日是否访问 - if (CollectionUtil.isNotEmpty(threeRemainCounts)) { - threeRemainCounts.stream() - .filter(v -> erBanNo.equals(v.getErBanNo())) - .findAny() - .ifPresent(v -> userDetail.setIsThreeRemain(v.getIsRemain())); - } - //第7日是否访问 - if (CollectionUtil.isNotEmpty(sevenRemainCounts)) { - sevenRemainCounts.stream() - .filter(v -> erBanNo.equals(v.getErBanNo())) - .findAny() - .ifPresent(v -> userDetail.setIsSevenRemain(v.getIsRemain())); - } - //第15日是否访问 - if (CollectionUtil.isNotEmpty(fifteenRemainCounts)) { - fifteenRemainCounts.stream() - .filter(v -> erBanNo.equals(v.getErBanNo())) - .findAny() - .ifPresent(v -> userDetail.setIsFifteenRemain(v.getIsRemain())); - } - //第30日是否访问 - if (CollectionUtil.isNotEmpty(thirtyRemainCounts)) { - thirtyRemainCounts.stream() - .filter(v -> erBanNo.equals(v.getErBanNo())) - .findAny() - .ifPresent(v -> userDetail.setIsThirtyRemain(v.getIsRemain())); - } - } - return userDetails; - } - - @Override - public void detailExport(Long batchId, ServletWebRequest servletWebRequest) { - List datas = null; - String objStr = jedisService.hget(RedisKey.flow_data_batch_search_export_hash.getKey(), String.valueOf(batchId)); - if (StrUtil.isNotEmpty(objStr)) { - datas = JSONArray.parseArray(objStr, FlowDataBatchSearchDetailAdminDto.class); - } else { - datas = getDetailList(batchId); - if (CollectionUtil.isNotEmpty(datas)) { - jedisService.hset(RedisKey.flow_data_batch_search_export_hash.getKey(), String.valueOf(batchId), JSONArray.toJSONString(datas)); - jedisService.expire(RedisKey.flow_data_batch_search_export_hash.getKey(), 10 * 60); - } - } - if (servletWebRequest.getResponse() != null) { - try { - //这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman - servletWebRequest.getResponse().setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); - servletWebRequest.getResponse().setCharacterEncoding("utf-8"); - //这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系 - String fileName = URLEncoder.encode("用户明细", "UTF-8").replaceAll("\\+", "%20"); - servletWebRequest.getResponse().setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); - EasyExcel.write(servletWebRequest.getResponse().getOutputStream(), FlowDataBatchSearchDetailAdminDto.class).sheet("用户明细").doWrite(datas); - } catch (Exception e) { - log.error(e.getMessage(), e); - } - } - } -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/batch/impl/FlowDataBatchSearchServiceImpl.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/batch/impl/FlowDataBatchSearchServiceImpl.java deleted file mode 100644 index 8c92b8574..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/batch/impl/FlowDataBatchSearchServiceImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.accompany.admin.service.batch.impl; - -import com.accompany.admin.mapper.batch.FlowDataBatchSearchMapper; -import com.accompany.admin.model.batch.FlowDataBatchSearch; -import com.accompany.admin.service.batch.FlowDataBatchSearchService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -/** - * @author: liaozetao - * @date: 2023/9/22 15:32 - * @description: - */ -@Slf4j -@Service -public class FlowDataBatchSearchServiceImpl extends ServiceImpl implements FlowDataBatchSearchService { -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/charge/impl/ChargeRegionAdminServiceImpl.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/charge/impl/ChargeRegionAdminServiceImpl.java index 0739f1a76..2b5e22376 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/charge/impl/ChargeRegionAdminServiceImpl.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/charge/impl/ChargeRegionAdminServiceImpl.java @@ -2,7 +2,6 @@ package com.accompany.admin.service.charge.impl; import cn.hutool.core.collection.CollectionUtil; import com.accompany.admin.service.charge.ChargeRegionAdminService; -import com.accompany.business.service.withdraw.ExchangeRateService; import com.accompany.common.redis.RedisKey; import com.accompany.payment.model.ChargeRegion; import com.accompany.payment.service.ChargeRegionService; @@ -32,8 +31,6 @@ public class ChargeRegionAdminServiceImpl implements ChargeRegionAdminService { @Autowired private ChargeRegionService chargeRegionService; - @Autowired - private ExchangeRateService exchangeRateService; @Override public List list() { @@ -59,11 +56,6 @@ public class ChargeRegionAdminServiceImpl implements ChargeRegionAdminService { public void save(ChargeRegion chargeRegion) { chargeRegion.setUpdateTime(new Date()); chargeRegionService.updateById(chargeRegion); - //货币 - //String currency = chargeRegion.getCurrency(); - //BigDecimal rate = chargeRegion.getRate(); - //更新汇率 - //exchangeRateService.updateRate(currency, rate); RMap rMap = redissonClient.getMap(RedisKey.charge_region.getKey()); if (CollectionUtil.isNotEmpty(rMap)) { rMap.delete(); diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/finance/FinanceAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/finance/FinanceAdminService.java deleted file mode 100644 index 57cd61fc8..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/finance/FinanceAdminService.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.accompany.admin.service.finance; - -import com.accompany.admin.mapper.UserPurseAdminMapperExpand; -import com.accompany.admin.service.base.BaseService; -import com.accompany.business.model.FinanceGoldDiamond; -import com.accompany.business.model.FinanceGoldDiamondDetail; -import com.accompany.business.model.FinanceGoldDiamondDetailExample; -import com.accompany.business.model.FinanceGoldDiamondExample; -import com.accompany.business.mybatismapper.*; -import com.accompany.business.service.record.BillRecordService; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.common.utils.StringUtils; -import com.accompany.core.service.common.JedisService; -import com.alibaba.fastjson.JSONObject; -import com.github.pagehelper.PageHelper; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Date; -import java.util.List; - -/** - * Created by yanpengcheng on 2019/2/19 - */ -@Service -public class FinanceAdminService extends BaseService { - @Autowired - JedisService jedisService; - @Autowired - FinanceTypeConfigMapper financeTypeConfigMapper; - @Autowired - FinanceGoldDiamondDetailMapperExpand financeGoldDiamondDetailMapperExpand; - @Autowired - FinanceGoldDiamondDetailMapper financeGoldDiamondDetailMapper; - @Autowired - DrawLotteryRecordMapperWebExpand drawLotteryRecordMapperExpand; - @Autowired - UserPurseAdminMapperExpand userPurseAdminMapperExpand; - @Autowired - FinanceGoldDiamondMapper financeGoldDiamondMapper; - @Autowired - BillRecordService billRecordService; - - public BusiResult statistics(String beginDateStr, String endDateStr, Integer pageNum, - Integer pageSize) { - BusiResult busiResult = new BusiResult(BusiStatus.SUCCESS); - JSONObject data = new JSONObject(); - FinanceGoldDiamondExample financeGoldDiamondExample = new FinanceGoldDiamondExample(); - FinanceGoldDiamondExample.Criteria criteria = financeGoldDiamondExample.createCriteria(); - if (StringUtils.isNotEmpty(beginDateStr)) { - Date beginDate = DateTimeUtil.convertStrToDate(beginDateStr,DateTimeUtil.DEFAULT_DATE_PATTERN); - criteria.andBillTimeGreaterThanOrEqualTo(beginDate); - } - if (StringUtils.isNotEmpty(endDateStr)) { - Date endDate = DateTimeUtil.getEndTimeOfDay(DateTimeUtil.convertStrToDate(endDateStr,DateTimeUtil.DEFAULT_DATE_PATTERN)); - criteria.andBillTimeLessThanOrEqualTo(endDate); - } - financeGoldDiamondExample.setOrderByClause("create_time desc"); - PageHelper.startPage(pageNum, pageSize); - List financeGoldDiamondList = - financeGoldDiamondMapper.selectByExample(financeGoldDiamondExample); - int count = financeGoldDiamondMapper.countByExample(financeGoldDiamondExample); - data.put("rows", financeGoldDiamondList); - data.put("total", count); - String updateTime = ""; - String updateTimeRedis = jedisService.get(RedisKey.finance_date_update_time.getKey()); - if (StringUtils.isNotEmpty(updateTimeRedis)) { - updateTime = updateTimeRedis; - } - if (StringUtils.isEmpty(updateTime)) { - updateTime = "暂无更新时间记录"; - } - data.put("updateTime", updateTime); - busiResult.setData(data); - return busiResult; - } - - public BusiResult exportDetail(String beginStr, String endStr) { - BusiResult busiResult = new BusiResult(BusiStatus.SUCCESS); - FinanceGoldDiamondDetailExample financeGoldDiamondDetailExample = new FinanceGoldDiamondDetailExample(); - Date beginDate = DateTimeUtil.convertStrToDate(beginStr,DateTimeUtil.DEFAULT_DATE_PATTERN); - Date endDate = DateTimeUtil.getEndTimeOfDay(DateTimeUtil.convertStrToDate(endStr,DateTimeUtil.DEFAULT_DATE_PATTERN)); - financeGoldDiamondDetailExample.createCriteria().andBillTimeGreaterThanOrEqualTo(beginDate).andBillTimeLessThanOrEqualTo(endDate); - financeGoldDiamondDetailExample.setOrderByClause("bill_time asc,big_obj_type asc,obj_type asc"); - PageHelper.startPage(1, 5000); - List financeGoldDiamondList = - financeGoldDiamondDetailMapper.selectByExample(financeGoldDiamondDetailExample); - busiResult.setData(financeGoldDiamondList); - return busiResult; - } - - public BusiResult exportTotal(String beginStr, String endStr) { - BusiResult busiResult = new BusiResult(BusiStatus.SUCCESS); - FinanceGoldDiamondExample financeGoldDiamondExample = new FinanceGoldDiamondExample(); - Date beginDate = DateTimeUtil.convertStrToDate(beginStr,DateTimeUtil.DEFAULT_DATE_PATTERN); - Date endDate = DateTimeUtil.getEndTimeOfDay(DateTimeUtil.convertStrToDate(endStr,DateTimeUtil.DEFAULT_DATE_PATTERN)); - financeGoldDiamondExample.createCriteria().andBillTimeGreaterThanOrEqualTo(beginDate).andBillTimeLessThanOrEqualTo(endDate); - financeGoldDiamondExample.setOrderByClause("id asc"); - PageHelper.startPage(1, 5000); - List financeGoldDiamondList = - financeGoldDiamondMapper.selectByExample(financeGoldDiamondExample); - busiResult.setData(financeGoldDiamondList); - return busiResult; - } -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gamepartner/GamePartnerOrderAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gamepartner/GamePartnerOrderAdminService.java deleted file mode 100644 index 70a29b766..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gamepartner/GamePartnerOrderAdminService.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.accompany.admin.service.gamepartner; - -import com.accompany.admin.vo.gamepartner.GamePartnerOrderDayAdminVo; -import com.accompany.admin.vo.gamepartner.GamePartnerOrderDayDetailAdminVo; -import com.accompany.business.vo.gamepartner.GamePartnerOrderVo; -import com.accompany.common.model.PageReq; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.springframework.web.context.request.ServletWebRequest; - -/** - * @author: liaozetao - * @date: 2023/8/22 11:18 - * @description: - */ -public interface GamePartnerOrderAdminService { - - /** - * 订单记录查询 - * - * @param fromErBanNo - * @param toErBanNo - * @param gameId - * @param orderNo - * @param startTime - * @param endTime - * @param req - * @return - */ - Page orderPage(String fromErBanNo, String toErBanNo, Integer gameId, String orderNo, String startTime, String endTime, PageReq req); - - /** - * 订单统计 - * - * @param startTime - * @param endTime - * @param req - * @return - */ - Page dayPage(String startTime, String endTime, PageReq req); - - /** - * 订单详情 - * - * @param orderDate - * @param req - * @return - */ - Page dayDetailPage(String orderDate, PageReq req); - - /** - * 订单记录导出 - * - * @param fromErBanNo - * @param toErBanNo - * @param gameId - * @param orderNo - * @param startTime - * @param endTime - * @param servletWebRequest - */ - void orderExport(String fromErBanNo, String toErBanNo, Integer gameId, String orderNo, String startTime, String endTime, ServletWebRequest servletWebRequest); - - /** - * 订单统计导出 - * - * @param startTime - * @param endTime - * @param servletWebRequest - */ - void dayExport(String startTime, String endTime, ServletWebRequest servletWebRequest); - - /** - * 订单详情导出 - * - * @param orderDate - * @param servletWebRequest - */ - void dayDetailExport(String orderDate, ServletWebRequest servletWebRequest); - -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gamepartner/UserGamePartnerInfoAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gamepartner/UserGamePartnerInfoAdminService.java deleted file mode 100644 index 69076c474..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gamepartner/UserGamePartnerInfoAdminService.java +++ /dev/null @@ -1,251 +0,0 @@ -package com.accompany.admin.service.gamepartner; - -import com.accompany.admin.model.AdminUser; -import com.accompany.admin.service.system.AdminUserService; -import com.accompany.admin.vo.gamepartner.UserGamePartnerInfoAdminVo; -import com.accompany.business.model.gamepartner.UserGamePartner; -import com.accompany.business.model.gamepartner.UserGamePartnerInfo; -import com.accompany.business.model.gamepartner.UserGamePartnerInfoTag; -import com.accompany.business.mybatismapper.gamepartner.UserGamePartnerMapper; -import com.accompany.business.service.gamepartner.UserGamePartnerInfoService; -import com.accompany.business.service.gamepartner.UserGamePartnerService; -import com.accompany.business.service.user.UsersService; -import com.accompany.business.vo.gamepartner.UserGamePartnerInfoVo; -import com.accompany.common.constant.Constant; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.AdminServiceException; -import com.accompany.core.model.Users; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; -import org.springframework.util.StringUtils; - -import java.util.*; -import java.util.stream.Collectors; - -@Service -public class UserGamePartnerInfoAdminService { - - @Autowired - private UserGamePartnerService service; - @Autowired - private UserGamePartnerInfoService infoService; - @Autowired - private UserGamePartnerMapper mapper; - @Autowired - private UsersService usersService; - @Autowired - private AdminUserService adminUserService; - - public Page pageUserGamePartnerInfo(Integer pageNum, Integer pageSize, - Long erbanNo, Integer gameId, - String startTime, String endTime) { - Page voPage = new Page<>(pageNum, pageSize); - - QueryWrapper queryWrapper = getQueryWrapper(erbanNo, gameId, startTime, endTime); - Page page = new Page<>(pageNum, pageSize); - mapper.selectPage(page, queryWrapper); - - voPage.setTotal(page.getTotal()); - - if (CollectionUtils.isEmpty(page.getRecords())){ - return voPage; - } - - List dbList = page.getRecords(); - List uidList = dbList.stream().map(UserGamePartner::getUid).collect(Collectors.toList()); - List adminIdList = dbList.stream().map(UserGamePartner::getAdminId).distinct().collect(Collectors.toList()); - - Map usersMap = usersService.getUsersMapByUids(uidList); - - List userInfoList = infoService.listUserGamePartnerInfo(uidList); - Map> userInfoMap = null == userInfoList? - Collections.EMPTY_MAP: - userInfoList.stream().collect(Collectors.groupingBy(UserGamePartnerInfoVo::getUid)); - - List adminUserList = adminUserService.listAdminUser(adminIdList); - Map adminUserMap = null == adminUserList? - Collections.EMPTY_MAP: - adminUserList.stream().collect(Collectors.toMap(AdminUser::getId, AdminUser::getUsername)); - - List voList = dbList.stream().map(d->{ - Users u = usersMap.get(d.getUid()); - List userInfo = userInfoMap.get(d.getUid()); - String adminName = adminUserMap.get(d.getAdminId()); - return new UserGamePartnerInfoAdminVo(d, u, userInfo, adminName); - }).collect(Collectors.toList()); - - voPage.setRecords(voList); - - return voPage; - } - - private QueryWrapper getQueryWrapper(Long erbanNo, Integer gameId, - String startTime, String endTime){ - Long uid = null; - List queryUidList = new ArrayList<>(); - if (null != erbanNo){ - Users u = usersService.getUserByErbanNo(erbanNo); - if (null == u){ - return null; - } - uid = u.getUid(); - queryUidList.add(u.getUid()); - } - - if (null != gameId){ - QueryWrapper queryWrapper = Wrappers.query(); - queryWrapper.lambda().select(UserGamePartnerInfo::getUid) - .eq(null != uid, UserGamePartnerInfo::getUid, uid) - .eq(UserGamePartnerInfo::getGameId, gameId); - List gameUidList = infoService.list(queryWrapper); - if (CollectionUtils.isEmpty(gameUidList)){ - return null; - } - queryUidList = gameUidList.stream().map(UserGamePartnerInfo::getUid).distinct().collect(Collectors.toList()); - } - - - QueryWrapper queryWrapper = Wrappers.query(); - queryWrapper.lambda().in(!CollectionUtils.isEmpty(queryUidList), UserGamePartner::getUid, queryUidList) - .gt(StringUtils.hasText(startTime), UserGamePartner::getUpdateTime, startTime) - .lt(StringUtils.hasText(endTime), UserGamePartner::getUpdateTime, endTime) - .orderByDesc(UserGamePartner::getUpdateTime); - return queryWrapper; - } - - @Transactional(rollbackFor = Exception.class) - public void save(UserGamePartnerInfoAdminVo param, Integer adminId) { - vaildSaveParam(param); - - Long uid = param.getUid(); - QueryWrapper queryWrapper = Wrappers.query(); - queryWrapper.lambda().eq(UserGamePartner::getUid, uid); - UserGamePartner ugp = mapper.selectOne(queryWrapper); - if (null == ugp){ - ugp = new UserGamePartner(); - ugp.setUid(uid); - ugp.setStatus(Constant.StatusV2.valid); - ugp.setUpdateTime(new Date()); - ugp.setAdminId(adminId); - mapper.insert(ugp); - } else { - ugp.setUpdateTime(new Date()); - ugp.setAdminId(adminId); - - UpdateWrapper updateWrapper = Wrappers.update(); - updateWrapper.lambda().eq(UserGamePartner::getUid, ugp.getUid()); - mapper.update(ugp, updateWrapper); - } - - List gameList = param.getGames(); - List gameIdList = gameList.stream().map(UserGamePartnerInfoVo::getGameId).distinct().collect(Collectors.toList()); - - QueryWrapper infoQueryWrapper = Wrappers.query(); - infoQueryWrapper.lambda().eq(UserGamePartnerInfo::getUid, uid).in(UserGamePartnerInfo::getGameId, gameIdList); - Map dbMap = infoService.list(infoQueryWrapper).stream().collect(Collectors.toMap(UserGamePartnerInfo::getGameId, i->i)); - - List insertList = new ArrayList<>(); - List updateList = new ArrayList<>(); - - for (UserGamePartnerInfoVo vo: gameList){ - UserGamePartnerInfo db = dbMap.get(vo.getGameId()); - if (null == db){ - db = new UserGamePartnerInfo(); - db.setUid(uid); - db.setGameId(vo.getGameId()); - db.setPrice(vo.getPrice()); - db.setProficiency(vo.getProficiency()); - db.setFinishNum(0); - db.setSeq(vo.getSeq()); - db.setTags(vo.getTags()); - insertList.add(db); - } else { - db.setPrice(vo.getPrice()); - db.setProficiency(vo.getProficiency()); - db.setTags(vo.getTags()); - updateList.add(db); - } - } - - if (!CollectionUtils.isEmpty(insertList)){ - infoService.saveBatch(insertList); - } - - if (!CollectionUtils.isEmpty(updateList)){ - for (UserGamePartnerInfo info: updateList) { - UpdateWrapper updateWrapper = Wrappers.update(); - updateWrapper.lambda().eq(UserGamePartnerInfo::getUid, info.getUid()).eq(UserGamePartnerInfo::getGameId, info.getGameId()); - infoService.update(info, updateWrapper); - } - } - - service.freshCache(); - } - - private void vaildSaveParam(UserGamePartnerInfoAdminVo param) { - Long erbanNo = param.getErbanNo(); - if (null == erbanNo){ - throw new AdminServiceException(BusiStatus.PARAMERROR, "用户不存在"); - } - Users u = usersService.getUserByErbanNo(erbanNo); - if (null == u){ - throw new AdminServiceException(BusiStatus.PARAMERROR, "用户不存在"); - } - - if (null == param.getUid()){ - UserGamePartner userGamePartner = mapper.selectById(u.getUid()); - if (null != userGamePartner){ - throw new AdminServiceException(BusiStatus.PARAMERROR, u.getErbanNo() + "已是陪玩用户，不能重复添加"); - } - } - - param.setUid(u.getUid()); - - List gameList = param.getGames(); - if (CollectionUtils.isEmpty(gameList)){ - throw new AdminServiceException(BusiStatus.PARAMERROR, "没有配置游戏"); - } - List gameIdList = gameList.stream().map(UserGamePartnerInfoVo::getGameId).distinct().collect(Collectors.toList()); - if (gameIdList.size() < gameList.size()){ - throw new AdminServiceException(BusiStatus.PARAMERROR, "不能重复配置同一个游戏"); - } - for (UserGamePartnerInfoVo game: gameList) { - for (UserGamePartnerInfoTag tag: game.getTags()) { - if ("区服".equals(tag.getTagName()) && tag.getTagVal().length() > 12){ - throw new AdminServiceException(BusiStatus.PARAMERROR, "区服不可超过12个字符"); - } else if ("段位".equals(tag.getTagName()) && tag.getTagVal().length() > 6) { - throw new AdminServiceException(BusiStatus.PARAMERROR, "段位不可超过6个字符"); - } else if ("擅长".equals(tag.getTagName()) && tag.getTagVal().length() > 6) { - throw new AdminServiceException(BusiStatus.PARAMERROR, "擅长不可超过6个字符"); - } - } - } - } - - public void changeStatus(String uidStr, Byte status, Integer adminId) { - List uidList = Arrays.stream(uidStr.split(",")) - .map(Long::parseLong).sorted() - .collect(Collectors.toList()); - if (CollectionUtils.isEmpty(uidList)){ - throw new AdminServiceException(BusiStatus.PARAMERROR); - } - - UpdateWrapper updateWrapper = Wrappers.update(); - updateWrapper.lambda().in(UserGamePartner::getUid, uidList); - - UserGamePartner updateEntity = new UserGamePartner(); - updateEntity.setStatus(status); - updateEntity.setAdminId(adminId); - updateEntity.setUpdateTime(new Date()); - - mapper.update(updateEntity, updateWrapper); - - service.freshCache(); - } -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gamepartner/impl/GamePartnerOrderAdminServiceImpl.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gamepartner/impl/GamePartnerOrderAdminServiceImpl.java deleted file mode 100644 index d9d86e499..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gamepartner/impl/GamePartnerOrderAdminServiceImpl.java +++ /dev/null @@ -1,124 +0,0 @@ -package com.accompany.admin.service.gamepartner.impl; - -import cn.hutool.core.collection.CollectionUtil; -import com.accompany.admin.dto.gamepartner.GamePartnerOrderAdminDto; -import com.accompany.admin.mapper.gamepartner.GamePartnerOrderAdminMapper; -import com.accompany.admin.service.gamepartner.GamePartnerOrderAdminService; -import com.accompany.admin.vo.gamepartner.GamePartnerOrderDayAdminVo; -import com.accompany.admin.vo.gamepartner.GamePartnerOrderDayDetailAdminVo; -import com.accompany.business.vo.gamepartner.GamePartnerOrderVo; -import com.accompany.common.model.PageReq; -import com.alibaba.excel.EasyExcel; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.web.context.request.ServletWebRequest; - -import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.List; - -/** - * @author: liaozetao - * @date: 2023/8/22 11:18 - * @description: - */ -@Slf4j -@Service -public class GamePartnerOrderAdminServiceImpl implements GamePartnerOrderAdminService { - - @Autowired - private GamePartnerOrderAdminMapper gamePartnerOrderAdminMapper; - - @Override - public Page orderPage(String fromErBanNo, String toErBanNo, Integer gameId, String orderNo, String startTime, String endTime, PageReq req) { - return gamePartnerOrderAdminMapper.orderPage(new Page<>(req.getPage(), req.getPageSize()), fromErBanNo, toErBanNo, gameId, orderNo, startTime, endTime); - } - - @Override - public Page dayPage(String startTime, String endTime, PageReq req) { - return gamePartnerOrderAdminMapper.dayPage(new Page<>(req.getPage(), req.getPageSize()), startTime, endTime); - } - - @Override - public Page dayDetailPage(String orderDate, PageReq req) { - return gamePartnerOrderAdminMapper.dayDetailPage(new Page<>(req.getPage(), req.getPageSize()), orderDate); - } - - @Override - public void orderExport(String fromErBanNo, String toErBanNo, Integer gameId, String orderNo, String startTime, String endTime, ServletWebRequest servletWebRequest) { - PageReq req = new PageReq(); - req.setPage(1); - req.setPageSize(100000000); - List datas = new ArrayList<>(); - Page page = orderPage(fromErBanNo, toErBanNo, gameId, orderNo, startTime, endTime, req); - List records = page.getRecords(); - if (CollectionUtil.isNotEmpty(records)) { - for (GamePartnerOrderVo record : records) { - GamePartnerOrderAdminDto admin = new GamePartnerOrderAdminDto(); - BeanUtils.copyProperties(record, admin); - datas.add(admin); - } - } - if (servletWebRequest.getResponse() != null) { - try { - //这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman - servletWebRequest.getResponse().setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); - servletWebRequest.getResponse().setCharacterEncoding("utf-8"); - //这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系 - String fileName = URLEncoder.encode("订单记录", "UTF-8").replaceAll("\\+", "%20"); - servletWebRequest.getResponse().setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); - EasyExcel.write(servletWebRequest.getResponse().getOutputStream(), GamePartnerOrderAdminDto.class).sheet("订单记录").doWrite(datas); - } catch (Exception e) { - log.error(e.getMessage(), e); - } - } - } - - @Override - public void dayExport(String startTime, String endTime, ServletWebRequest servletWebRequest) { - PageReq req = new PageReq(); - req.setPage(1); - req.setPageSize(100000000); - Page page = dayPage(startTime, endTime, req); - List records = page.getRecords(); - if (servletWebRequest.getResponse() != null) { - try { - //这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman - servletWebRequest.getResponse().setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); - servletWebRequest.getResponse().setCharacterEncoding("utf-8"); - //这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系 - String fileName = URLEncoder.encode("订单统计", "UTF-8").replaceAll("\\+", "%20"); - servletWebRequest.getResponse().setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); - EasyExcel.write(servletWebRequest.getResponse().getOutputStream(), GamePartnerOrderDayAdminVo.class).sheet("订单统计").doWrite(records); - } catch (Exception e) { - log.error(e.getMessage(), e); - } - } - } - - @Override - public void dayDetailExport(String orderDate, ServletWebRequest servletWebRequest) { - PageReq req = new PageReq(); - req.setPage(1); - req.setPageSize(100000000); - Page page = dayDetailPage(orderDate, req); - List records = page.getRecords(); - if (servletWebRequest.getResponse() != null) { - try { - //这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman - servletWebRequest.getResponse().setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); - servletWebRequest.getResponse().setCharacterEncoding("utf-8"); - //这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系 - String fileName = URLEncoder.encode("订单详情", "UTF-8").replaceAll("\\+", "%20"); - servletWebRequest.getResponse().setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); - EasyExcel.write(servletWebRequest.getResponse().getOutputStream(), GamePartnerOrderDayDetailAdminVo.class).sheet("订单详情").doWrite(records); - } catch (Exception e) { - log.error(e.getMessage(), e); - } - } - } - -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/official/OfficialBrowseRecordAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/official/OfficialBrowseRecordAdminService.java deleted file mode 100644 index b65320cf7..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/official/OfficialBrowseRecordAdminService.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.accompany.admin.service.official; - -import com.accompany.admin.vo.official.OfficialBrowseCountVo; - -import java.util.List; - -/** - * @author: liaozetao - * @date: 2024/1/17 10:41 - * @description: - */ -public interface OfficialBrowseRecordAdminService { - - /** - * 官网访问数据-最近30天 - * - * @return - */ - List browseFor30Days(); -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/official/OfficialConfigAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/official/OfficialConfigAdminService.java deleted file mode 100644 index 4b7222545..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/official/OfficialConfigAdminService.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.accompany.admin.service.official; - -import com.accompany.business.model.official.OfficialConfig; - -import java.util.List; - -/** - * @author: liaozetao - * @date: 2024/1/17 10:20 - * @description: - */ -public interface OfficialConfigAdminService { - - /** - * 列表 - * - * @return - */ - List list(); - - /** - * 保存 - * - * @param config - */ - void save(OfficialConfig config); - -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/official/impl/OfficialBrowseRecordAdminServiceImpl.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/official/impl/OfficialBrowseRecordAdminServiceImpl.java deleted file mode 100644 index 59e77eca3..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/official/impl/OfficialBrowseRecordAdminServiceImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.accompany.admin.service.official.impl; - -import com.accompany.admin.mapper.official.OfficialRecordAdminMapper; -import com.accompany.admin.service.official.OfficialBrowseRecordAdminService; -import com.accompany.admin.vo.official.OfficialBrowseCountVo; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @author: liaozetao - * @date: 2024/1/17 10:41 - * @description: - */ -@Slf4j -@Service -public class OfficialBrowseRecordAdminServiceImpl implements OfficialBrowseRecordAdminService { - - @Autowired - private OfficialRecordAdminMapper officialRecordAdminMapper; - - @Override - public List browseFor30Days() { - return officialRecordAdminMapper.browseFor30Days(); - } -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/official/impl/OfficialConfigAdminServiceImpl.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/official/impl/OfficialConfigAdminServiceImpl.java deleted file mode 100644 index de7c78501..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/official/impl/OfficialConfigAdminServiceImpl.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.accompany.admin.service.official.impl; - -import com.accompany.admin.service.official.OfficialConfigAdminService; -import com.accompany.business.model.official.OfficialConfig; -import com.accompany.business.service.official.OfficialConfigService; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Date; -import java.util.List; - -/** - * @author: liaozetao - * @date: 2024/1/17 10:20 - * @description: - */ -@Slf4j -@Service -public class OfficialConfigAdminServiceImpl implements OfficialConfigAdminService { - - @Autowired - private OfficialConfigService officialConfigService; - - @Override - public List list() { - return officialConfigService.list(Wrappers.lambdaQuery() - .orderByDesc(OfficialConfig::getUpdateTime)); - } - - @Override - public void save(OfficialConfig config) { - Date now = new Date(); - Long id = config.getId(); - if (id != null) { - config.setUpdateTime(now); - } else { - config.setCreateTime(now); - } - officialConfigService.saveOrUpdate(config); - } -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/record/OfficialGoldRecordService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/record/OfficialGoldRecordService.java index d548d4f45..7effd0c55 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/record/OfficialGoldRecordService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/record/OfficialGoldRecordService.java @@ -218,18 +218,8 @@ public class OfficialGoldRecordService extends BaseService { public void giveDiamond(Map usersMap, OfficalSendTypeEnum type, BigDecimal num, int adminId, String remark, Integer busType, BigDecimal actualAmount) { - // AdminDict adminDict = adminDictService.getOneAdminDict("official_gold_limit_" + type, "limit_time"); - // AdminDict adminDict2 = adminDictService.getOneAdminDict("official_gold_limit_" + type, "limit_count"); - // int limitTime = Integer.valueOf(adminDict.getDictval()); - // int limitCount = Integer.valueOf(adminDict2.getDictval()); - // 分隔耳伴号，多个耳伴号用换行分隔 for (Users users : usersMap.values()) { - // if (!isCanGiveGold(users, type, num, limitTime, limitCount)) { - // busiResult.setCode(-1); - // busiResult.setMessage("兔兔号为" + erNo + "的用户被赠送的次数大于" + limitTime + "或者金币余额大于" + limitCount); - // return busiResult; - // } // 增加官方赠送活动记录 long recordId = DefaultIdentifierGenerator.getInstance().nextId(null); String recordIdStr = String.valueOf(recordId); diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/sms/OperationSmsAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/sms/OperationSmsAdminService.java deleted file mode 100644 index cacb19d37..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/sms/OperationSmsAdminService.java +++ /dev/null @@ -1,316 +0,0 @@ -package com.accompany.admin.service.sms; - -import com.accompany.admin.mapper.OperationSmsRecordMapperExpand; -import com.accompany.admin.service.base.BaseService; -import com.accompany.admin.vo.OperationSmsRecordVo; -import com.accompany.business.model.OperationSmsRecord; -import com.accompany.business.model.OperationSmsRecordExample; -import com.accompany.business.model.SmsTemplate; -import com.accompany.business.model.SmsTemplateExample; -import com.accompany.business.mybatismapper.OperationSmsRecordMapper; -import com.accompany.business.mybatismapper.SmsTemplateMapper; -import com.accompany.business.service.user.UsersService; -import com.accompany.common.constant.Constant; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.common.utils.StringUtils; -import com.accompany.core.exception.AdminServiceException; -import com.accompany.core.model.Users; -import com.accompany.core.service.account.NetEaseService; -import com.accompany.core.service.common.JedisService; -import com.github.pagehelper.PageInfo; -import com.google.common.collect.Lists; -import com.google.gson.reflect.TypeToken; -import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.Sheet; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.*; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; - -@Service -public class OperationSmsAdminService extends BaseService { - - @Autowired - private UsersService usersService; - @Autowired - private OperationSmsRecordMapperExpand operationSmsRecordMapperExpand; - @Autowired - private SmsTemplateMapper smsTemplateMapper; - @Autowired - private JedisService jedisService; - @Autowired - private OperationSmsRecordMapper operationSmsRecordMapper; - @Autowired - private NetEaseService netEaseService; - - - // 一次性批量保存数量 - private static final Integer BATCH_SIZE = 1000; - - /** - * 解析EXCLE数据，并插入数据库 - * @param templateId - * @param sheet - * @param adminId - * @return - * @throws Exception - */ - public BusiResult insertFileDate(Integer templateId, Sheet sheet, Integer adminId) throws Exception{ - - //从第二行开始读，第一行是列名 - int firstRow = sheet.getFirstRowNum()+1; - int lastRow = sheet.getLastRowNum(); - if(lastRow > 10000){ - return new BusiResult(BusiStatus.FILE_SIZE_TOO_LARGE); - } - Vector list = new Vector<>(); - final CountDownLatch latch = new CountDownLatch(lastRow); - ExecutorService executorService = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors() * 4 - 1); - //遍历列 - for(int i = firstRow; i<=lastRow; i++) { - final int j = i; - executorService.execute(() -> { - try { - Row row = sheet.getRow(j); - if (row == null) { - throw new AdminServiceException(BusiStatus.ROW_IS_EMPTY); - } - OperationSmsRecord record = new OperationSmsRecord(); - //第一列为平台号，第二列为手机号码 - Cell firstCell = row.getCell(row.getFirstCellNum()); - Cell secondCell = row.getCell(row.getFirstCellNum() + 1); - if (firstCell != null) { - Long erbanNo = Double.valueOf(firstCell.getNumericCellValue()).longValue(); - Users users = usersService.getUserByErbanNo(erbanNo); - Long uid = users == null ? null : users.getUid(); - String phone = users == null ? "" : users.getPhone(); - record.setUid(uid); - record.setPhone(phone); - } - //如果填写了手机号码，以填写的手机号码为准 - if (secondCell != null) { - Long phone = Double.valueOf(secondCell.getNumericCellValue()).longValue(); - record.setPhone(phone.toString()); - } - - record.setTemplateId(templateId); - record.setCreateTime(Calendar.getInstance().getTime()); - record.setSendStatus(Constant.OperationSmsStatus.PENDING); - record.setOperator(adminId); - list.add(record); - }catch (Exception e){ - logger.error("scan excel error,e:{}",e.getMessage()); - }finally { - latch.countDown(); - } - }); - } - //等待数据解析完成，批量保存 - latch.await(); - batchSaveData(list); - return new BusiResult(BusiStatus.SUCCESS); - } - - /** - * 批量插入数据库 - * @param vector - */ - public void batchSaveData(Vector vector){ - int count = vector.size(); - long times = count % BATCH_SIZE == 0 ? (count / BATCH_SIZE) : (count / BATCH_SIZE) + 1; - for (int i = 0; i < times; i++) { - Integer fromIndex = i * BATCH_SIZE; - Integer toIndex = fromIndex + BATCH_SIZE >= count ? count : fromIndex + BATCH_SIZE; - List list = vector.subList(fromIndex,toIndex); - operationSmsRecordMapperExpand.batchSave(list); - } - } - - /** - * 获取发送的短信列表 - * @param erbanNo - * @param templateId - * @param sendStatus - * @param createTime - * @param sendTime - * @param page - * @param pageSize - * @return - */ - public PageInfo getList(Long erbanNo, Integer templateId, Integer sendStatus, String createTime, - String sendTime, Integer page, Integer pageSize){ - Integer start = (page-1)*pageSize; - if(templateId ==null || templateId <= 0){ - templateId = null; - } - if(sendStatus == null || sendStatus <= 0){ - sendStatus = null; - } - if(StringUtils.isBlank(createTime)){ - createTime = null; - } - if(StringUtils.isBlank(sendTime)){ - sendTime = null; - } - List list = operationSmsRecordMapperExpand.getList(erbanNo,templateId,sendStatus, - createTime,sendTime,start,pageSize); - Integer count = operationSmsRecordMapperExpand.count(erbanNo,templateId,sendStatus, - createTime,sendTime); - - PageInfo pageInfo = new PageInfo<>(list); - pageInfo.setTotal(count); - return pageInfo; - } - - - /** - * 根据查询条件批量发送 - * @param erbanNo - * @param templateId - * @param sendStatus - * @param createTime - * @param sendTime - * @throws Exception - */ - public void batchSendByQuery(Long erbanNo, Integer templateId, Integer sendStatus, String createTime, - String sendTime) throws Exception{ - OperationSmsRecordExample example = new OperationSmsRecordExample(); - OperationSmsRecordExample.Criteria criteria = example.createCriteria(); - criteria.andSendStatusEqualTo(Constant.OperationSmsStatus.PENDING); - if(erbanNo!=null && erbanNo > 0){ - Users users = usersService.getUserByErbanNo(erbanNo); - Long uid = users == null ? 0L : users.getUid(); - criteria.andUidEqualTo(uid); - } - if(templateId != null && templateId > 0){ - criteria.andTemplateIdEqualTo(templateId); - } - if(StringUtils.isNotBlank(createTime)){ - criteria.andCreateTimeGreaterThan(DateTimeUtil.convertStrToDate(createTime,DateTimeUtil.DEFAULT_DATETIME_PATTERN)); - } - if(StringUtils.isNotBlank(sendTime)){ - criteria.andSendTimeGreaterThan(DateTimeUtil.convertStrToDate(sendTime,DateTimeUtil.DEFAULT_DATETIME_PATTERN)); - } - List smsRecords = operationSmsRecordMapper.selectByExample(example); - //一次最多推送1万条 - if(smsRecords.size()>10000){ - smsRecords.subList(0,10000); - } - - batchSendMsg(smsRecords); - } - - /** - * 根据选择的数据批量更新 - * @param recordIds - * @throws Exception - */ - public void batchSendByPage(List recordIds) throws Exception{ - OperationSmsRecordExample example = new OperationSmsRecordExample(); - example.createCriteria().andRecordIdIn(recordIds); - List operationSmsRecords = operationSmsRecordMapper.selectByExample(example); - batchSendMsg(operationSmsRecords); - - } - - /** - * 单个发送 - * @param recordId - * @throws Exception - */ - public void sendForOne(Long recordId) throws Exception{ - OperationSmsRecord record = operationSmsRecordMapper.selectByPrimaryKey(recordId); - try { - List mobiles = Arrays.asList(record.getPhone()); -// SmsRet smsRet = netEaseService.sendTemplate(JSONObject.toJSONString(mobiles), record.getTemplateId()); -// if (smsRet.getCode() == 200) { -// record.setSendStatus(Constant.OperationSmsStatus.SUCCESS); -// } else { -// record.setSendStatus(Constant.OperationSmsStatus.ERROR); -// record.setErrorMsg(smsRet.getMsg()); -// } - }catch (Exception e){ - logger.error("send msg error,uid:{},phone:{},errorMsg:{}",record.getUid(),record.getPhone(), - e.getMessage()); - record.setSendStatus(Constant.OperationSmsStatus.ERROR); - record.setErrorMsg(e.getMessage()); - } - record.setSendTime(Calendar.getInstance().getTime()); - operationSmsRecordMapper.updateByPrimaryKeySelective(record); - } - /** - * 批量发送短信 - * @param smsRecords - * @throws Exception - */ - private void batchSendMsg(List smsRecords) throws Exception{ - Vector success = new Vector<>(); - Vector fail = new Vector<>(); - final CountDownLatch latch = new CountDownLatch(smsRecords.size()); - ExecutorService executorService = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors() * 4 - 1); - for(OperationSmsRecord record : smsRecords){ - executorService.execute(() -> { - try { -// List mobiles = Arrays.asList(record.getPhone()); -// SmsRet smsRet = netEaseService.sendTemplate(JSONObject.toJSONString(mobiles),record.getTemplateId()); -// if(smsRet.getCode() == 200){ -// success.add(record.getRecordId()); -// }else{ -// fail.add(record.getRecordId()); -// logger.error("send msg error,uid:{},phone:{},errorMsg:{}",record.getUid(),record.getPhone(), -// smsRet.getMsg()); -// } - }catch (Exception e){ - fail.add(record.getRecordId()); - logger.error("send msg error,uid:{},phone:{},errorMsg:{}",record.getUid(),record.getPhone(), - e.getMessage()); - }finally { - latch.countDown(); - } - }); - } - latch.await(); - updateAllRecord(success,fail); - } - - /** - * 更新记录 - * @param success - * @param fail - */ - private void updateAllRecord(Vector success,Vector fail){ - updateRecord(success,Constant.OperationSmsStatus.SUCCESS); - updateRecord(fail,Constant.OperationSmsStatus.ERROR); - } - - /** - * 更新记录 - * @param list - * @param status - */ - private void updateRecord(Vector list,Integer status){ - if(!list.isEmpty()) { - OperationSmsRecordExample example = new OperationSmsRecordExample(); - example.createCriteria().andRecordIdIn(list); - OperationSmsRecord operationSmsRecord = new OperationSmsRecord(); - operationSmsRecord.setSendStatus(status); - operationSmsRecord.setSendTime(Calendar.getInstance().getTime()); - operationSmsRecordMapper.updateByExampleSelective(operationSmsRecord, example); - } - } - - /** - * 单条删除 - * @param recordId - */ - public void delForOne(Long recordId){ - operationSmsRecordMapper.deleteByPrimaryKey(recordId); - } -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/system/AdminDictService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/system/AdminDictService.java deleted file mode 100644 index 9cb06a750..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/system/AdminDictService.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.accompany.admin.service.system; - -import com.accompany.admin.mapper.AdminDictMapper; -import com.accompany.admin.model.AdminDict; -import com.accompany.admin.model.AdminDictExample; -import com.accompany.admin.model.AdminDictKey; -import com.accompany.common.utils.BlankUtil; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Date; -import java.util.List; - - -@Service("adminDictService") -public class AdminDictService { - @Autowired - private AdminDictMapper adminDictMapper; - - - /** - * 分页查询 - * - * @param code 名称 - * @param page - * @param size - * @return - */ - public PageInfo getDictByPage(String code, int page, int size) { - AdminDictExample example = new AdminDictExample(); - if (!BlankUtil.isBlank(code)) { - example.createCriteria().andCodeEqualTo(code); - } - PageHelper.startPage(page, size); - List list = adminDictMapper.selectByExample(example); - return new PageInfo(list); - } - - public int saveDict(AdminDict adminDict, boolean isEdit) { - if (isEdit) { - return adminDictMapper.updateByPrimaryKey(adminDict); - } else { - adminDict.setCreatetime(new Date()); - return adminDictMapper.insert(adminDict); - } - } - - public AdminDict getOneAdminDict(String code, String dictkey) { - AdminDictKey adminDictKey = new AdminDictKey(); - adminDictKey.setCode(code); - adminDictKey.setDictkey(dictkey); - return adminDictMapper.selectByPrimaryKey(adminDictKey); - } - - public void delAdminDict(String code, String dictkey) { - AdminDictKey adminDictKey = new AdminDictKey(); - adminDictKey.setCode(code); - adminDictKey.setDictkey(dictkey); - adminDictMapper.deleteByPrimaryKey(adminDictKey); - } - - public List getDictByCode(String code) { - AdminDictExample example = new AdminDictExample(); - example.createCriteria().andCodeEqualTo(code); - return adminDictMapper.selectByExample(example); - } - -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/system/AdminPictureService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/system/AdminPictureService.java deleted file mode 100644 index 4f7b3ab98..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/system/AdminPictureService.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.accompany.admin.service.system; - -import com.accompany.business.model.AdminPicture; -import com.accompany.business.model.AdminPictureExample; -import com.accompany.business.mybatismapper.AdminPictureMapper; -import com.accompany.core.util.StringUtils; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * Created by liuyang on 2019/2/21. - */ -@Service("adminPictureService") -public class AdminPictureService { - - @Autowired - private AdminPictureMapper pictureMapper; - - public PageInfo gameInfoList(String appId, Integer pageNumber, Integer pageSize) { - AdminPictureExample example = new AdminPictureExample(); - example.setOrderByClause("update_time desc"); - AdminPictureExample.Criteria criteria = example.createCriteria(); - if(StringUtils.isNotBlank(appId)) { - criteria.andAppIdEqualTo(appId); - } - PageHelper.startPage(pageNumber, pageSize); - List pictureList = pictureMapper.selectByExample(example); - PageInfo info = new PageInfo<>(pictureList); - return info; - } -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/PhoneAuthApplyRecordAdiminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/PhoneAuthApplyRecordAdiminService.java deleted file mode 100644 index 97059ddf9..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/PhoneAuthApplyRecordAdiminService.java +++ /dev/null @@ -1,228 +0,0 @@ -package com.accompany.admin.service.user; - -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.StrUtil; -import com.accompany.admin.service.base.BaseService; -import com.accompany.admin.vo.PhoneAuthApplyRecordExcelVo; -import com.accompany.admin.vo.apply.PhoneAuthApplyRecordAdminVo; -import com.accompany.business.model.ip.IpRegionWhite; -import com.accompany.business.service.ip.IpRegionWhiteService; -import com.accompany.common.constant.Constant; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.GsonUtil; -import com.accompany.common.utils.StringUtils; -import com.accompany.core.exception.AdminServiceException; -import com.accompany.core.model.Users; -import com.accompany.core.model.phone.PhoneAuthApplyRecord; -import com.accompany.core.service.common.JedisService; -import com.accompany.core.service.phone.PhoneAuthApplyRecordService; -import com.accompany.core.service.user.UsersBaseService; -import com.accompany.sms.config.AliyunSmsConfig; -import com.accompany.sms.enums.SmsAppEnum; -import com.accompany.sms.enums.SmsTypeEnum; -import com.accompany.sms.strategy.SmsContext; -import com.accompany.sms.strategy.SmsFactory; -import com.accompany.sms.strategy.SmsResponse; -import com.accompany.sms.strategy.SmsStrategy; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.github.pagehelper.PageInfo; -import org.apache.commons.collections.CollectionUtils; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.*; -import java.util.stream.Collectors; - -@Service -public class PhoneAuthApplyRecordAdiminService extends BaseService { - - @Autowired - private PhoneAuthApplyRecordService phoneAuthApplyRecordService; - @Autowired - private JedisService jedisService; - @Autowired - private AliyunSmsConfig aliyunSmsConfig; - - @Autowired - private UsersBaseService usersBaseService; - - @Autowired - private IpRegionWhiteService ipRegionWhiteService; - - public PageInfo getPageList(Integer pageNumber, Integer pageSize, String phone, String authCode, Date beginTime, Date endTime, Byte status) { - List admins = new ArrayList<>(); - IPage page = phoneAuthApplyRecordService.page(new Page<>(pageNumber, pageSize), getQueryWrapper(phone, authCode, beginTime, endTime, status)); - List records = page.getRecords(); - if (CollectionUtil.isNotEmpty(records)) { - List phones = records.stream().filter(v -> StrUtil.isNotEmpty(v.getPhoneAreaCode()) && StrUtil.isNotEmpty(v.getPhone())).map(v -> v.getPhoneAreaCode() + v.getPhone()).distinct().collect(Collectors.toList()); - List usersList = usersBaseService.getUsersByPhoneList(phones); - for (PhoneAuthApplyRecord record : records) { - PhoneAuthApplyRecordAdminVo admin = new PhoneAuthApplyRecordAdminVo(); - BeanUtils.copyProperties(record, admin); - String authPhone = record.getPhoneAreaCode() + record.getPhone(); - if (CollectionUtil.isNotEmpty(usersList)) { - Optional any = usersList.stream().filter(v -> v.getPhone().equals(authPhone)).findAny(); - if (any.isPresent()) { - Users users = any.get(); - admin.setErbanNo(users.getErbanNo()); - admin.setNick(users.getNick()); - admin.setSignTime(users.getCreateTime()); - } - } - admins.add(admin); - } - } - PageInfo pageInfo = new PageInfo<>(); - pageInfo.setPageNum(pageNumber); - pageInfo.setPageSize(pageSize); - pageInfo.setList(admins); - pageInfo.setTotal(page.getTotal()); - return pageInfo; - } - - private LambdaQueryWrapper getQueryWrapper(String phone, String authCode, Date beginTime, Date endTime, Byte status) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - if (beginTime != null) { - queryWrapper.ge(PhoneAuthApplyRecord::getCreateTime, beginTime); - } - if (endTime != null) { - queryWrapper.le(PhoneAuthApplyRecord::getCreateTime, endTime); - } - if (status != null) { - queryWrapper.eq(PhoneAuthApplyRecord::getStatus, status); - } - if (StringUtils.isNotBlank(phone)) { - queryWrapper.eq(PhoneAuthApplyRecord::getPhone, phone); - } - if (StringUtils.isNotBlank(authCode)) { - queryWrapper.eq(PhoneAuthApplyRecord::getAuthCode, authCode); - } - queryWrapper.orderByDesc(PhoneAuthApplyRecord::getCreateTime); - return queryWrapper; - } - - public int changeStatus(Long id, Byte status, String adminName) { - if (status == null || id == null) { - throw new AdminServiceException(BusiStatus.PARAMETERILLEGAL); - } - if (status < 0 || status > 3) { - throw new AdminServiceException(BusiStatus.PARAMETERILLEGAL); - } - PhoneAuthApplyRecord applyRecord = phoneAuthApplyRecordService.getById(id); - if (applyRecord == null) { - throw new AdminServiceException("该记录不存在或已删除"); - } - String lockeKey = RedisKey.phone_auth_apply_lock.getKey(applyRecord.getPhone()); - String lockVal = jedisService.lock(lockeKey); - if (StringUtils.isEmpty(lockVal)) { - throw new AdminServiceException(BusiStatus.SERVERBUSY); - } - try { - if (!Objects.equals(applyRecord.getStatus(), Constant.PhoneAuthApplyStatus.wait_audit)) { - throw new AdminServiceException("该记录已审核！请刷新后重试"); - } - PhoneAuthApplyRecord record = phoneAuthApplyRecordService.getById(id); - record.setStatus(status); - record.setOperator(adminName); - record.setUpdateTime(new Date()); - record.setHasUsed((byte) 0); - phoneAuthApplyRecordService.updateById(record); - //加入白名单 - if (Constant.PhoneAuthApplyStatus.pass.equals(status)) { - ipRegionWhiteService.addIpRegionWhite(null, applyRecord.getPhoneAreaCode() + applyRecord.getPhone(), IpRegionWhite.Source.PHONE.getSource(), null); - } - //sendSms(record); - return 1; - } finally { - jedisService.unlock(lockeKey, lockVal); - } - } - - private void sendSms(PhoneAuthApplyRecord record) { - Byte status = record.getStatus(); - String phone = record.getPhone(); - String phoneAreaCode = record.getPhoneAreaCode(); - // 区号+手机号 - String mobile = phoneAreaCode + phone; - //String smsType = sysConfService.getDefaultSysConfValueById(Constant.SysConfId.SMS_SDK_TYPE, SmsTypeEnum.TENCENT.name().toLowerCase()); - String smsType = SmsTypeEnum.ALIYUN.name(); - String appName = null; - String templateId = null; - Map params = new LinkedHashMap<>(); - if (SmsTypeEnum.ALIYUN.name().equals(smsType)) { - if (Constant.PhoneAuthApplyStatus.pass.equals(status)) { - templateId = aliyunSmsConfig.getAuthSuccessTemplateCode(); - params.put("authorization", record.getAuthCode()); - } else { - // 失败 - templateId = aliyunSmsConfig.getAuthFailTemplateCode(); - params.put("number", getEndFourNum(phone)); - } - } else { - if (Constant.PhoneAuthApplyStatus.pass.equals(status)) { - appName = SmsAppEnum.PHONE_AUTH_SUCCESS.name(); - } else { - appName = SmsAppEnum.PHONE_AUTH_FAIL.name(); - } - } - //短信发送sdk - SmsStrategy smsStrategy = SmsFactory.getInstance(smsType); - SmsContext context = new SmsContext(); - context.setMobile(mobile); - context.setApp(appName); - context.setTemplateId(templateId); - context.setParams(params); - try { - SmsResponse response = smsStrategy.sendSms(context); - logger.info("sendSms mobile : {}, appName : {}, templateId : {}, response msg : {}", mobile, appName, templateId, GsonUtil.getDefGson().toJson(response)); - } catch (Exception e) { - logger.error("发送短信出现异常", e); - } - } - - private String getEndFourNum(String str) { - // return StrUtil.sub(str, 7,11); - StringBuilder tailNum = new StringBuilder(); - if (str != null) { - int len = str.length(); - for (int i = len - 1; i >= len - 4; i--) { - tailNum.append(str.charAt(i)); - } - tailNum.reverse(); - } - return tailNum.toString(); - } - - public void remark(Long id, String message, String adminName) { - PhoneAuthApplyRecord record = phoneAuthApplyRecordService.getById(id); - if (record == null) { - throw new AdminServiceException("该记录不存在或已删除"); - } - record.setRemark(message); - record.setOperator(adminName); - phoneAuthApplyRecordService.saveOrUpdate(record); - } - - public List export(String phone, String authCode, Date beginTime, Date endTime, Byte status) { - LambdaQueryWrapper queryWrapper = getQueryWrapper(phone, authCode, beginTime, endTime, status); - - List vos = new ArrayList<>(); - List records = phoneAuthApplyRecordService.list(queryWrapper); - if (CollectionUtils.isNotEmpty(records)) { - for (PhoneAuthApplyRecord record : records) { - PhoneAuthApplyRecordExcelVo vo = new PhoneAuthApplyRecordExcelVo(); - BeanUtils.copyProperties(record, vo); - - vos.add(vo); - } - } - - return vos; - } - - -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/TopicBoxItemAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/TopicBoxItemAdminService.java deleted file mode 100644 index cd413c7d5..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/TopicBoxItemAdminService.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.accompany.admin.service.user; - -import com.accompany.admin.service.base.BaseService; -import com.accompany.business.model.TopicBoxItem; -import com.accompany.business.model.TopicBoxItemExample; -import com.accompany.business.mybatismapper.TopicBoxItemMapper; -import com.accompany.common.constant.Constant; -import com.accompany.common.redis.RedisKey; -import com.accompany.core.service.common.JedisService; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Date; -import java.util.List; - -/** - * ｛这里添加描述｝ - * - * @author fangchengyan - * @date 2019-05-30 18:59 - */ -@Service -public class TopicBoxItemAdminService extends BaseService { - - @Autowired - private TopicBoxItemMapper topicBoxItemMapper; - @Autowired - private JedisService jedisService; - - - public PageInfo queryForPages(Byte status, int pageNumber, int pageSize) { - PageHelper.startPage(pageNumber, pageSize); - return new PageInfo<>(queryList(status)); - } - - public List queryList(Byte status) { - TopicBoxItemExample example = new TopicBoxItemExample(); - example.setOrderByClause(" seq_no asc, create_time desc "); - TopicBoxItemExample.Criteria criteria = example.createCriteria(); - if(null != status) { - criteria.andStatusEqualTo(status); - } - return topicBoxItemMapper.selectByExample(example); - } - - public int save(TopicBoxItem record) { - int result = 0; - if(null == record.getId()) { - Date now = new Date(); - record.setCreateTime(now); - record.setUpdateTime(now); - result = topicBoxItemMapper.insertSelective(record); - } else { - record.setUpdateTime(new Date()); - result = topicBoxItemMapper.updateByPrimaryKeySelective(record); - } - if(result > 0) { - jedisService.del(RedisKey.topic_box_msg_items.getKey()); - } - return result; - } - - public int deleteById(Integer id) { - TopicBoxItem record = new TopicBoxItem(); - record.setId(id); - record.setUpdateTime(new Date()); - record.setStatus(Constant.status.delete); - int result = topicBoxItemMapper.updateByPrimaryKeySelective(record); - if(result > 0) { - jedisService.del(RedisKey.topic_box_msg_items.getKey()); - } - return result; - } - - public TopicBoxItem getById(Integer id) { - return topicBoxItemMapper.selectByPrimaryKey(id); - } -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/UserCertifyRecordAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/UserCertifyRecordAdminService.java deleted file mode 100644 index f49a59f9d..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/UserCertifyRecordAdminService.java +++ /dev/null @@ -1,120 +0,0 @@ -package com.accompany.admin.service.user; - -import cn.hutool.core.collection.CollectionUtil; -import com.accompany.admin.vo.UserCertifyRecordVo; -import com.accompany.business.model.UserCertifyRecord; -import com.accompany.business.model.UserCertifyRecordExample; -import com.accompany.business.mybatismapper.UserCertifyRecordMapper; -import com.accompany.business.service.certification.AbstractCertifyService; -import com.accompany.business.service.certification.RealPeopleCertifyService; -import com.accompany.business.service.user.UsersService; -import com.accompany.core.model.Users; -import com.accompany.core.util.StringUtils; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.google.common.collect.Lists; -import org.apache.commons.collections.CollectionUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Date; -import java.util.List; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.stream.Collectors; - -/** - * ｛这里添加描述｝ - * - * @author fangchengyan - * @date 2019-05-20 14:45 - */ -@Service -public class UserCertifyRecordAdminService extends AbstractCertifyService { - - @Autowired - private UserCertifyRecordMapper userCertifyRecordMapper; - @Autowired - private UsersService usersService; - @Autowired - private RealPeopleCertifyService realPeopleCertifyService; - - public PageInfo queryForPages(List uidList, String idCardNum, Byte bindStatus, int pageNumber, int pageSize) { - UserCertifyRecordExample example = new UserCertifyRecordExample(); - UserCertifyRecordExample.Criteria criteria = example.createCriteria(); - if (CollectionUtil.isNotEmpty(uidList)) { - criteria.andUidIn(uidList.stream().map(Long::new).collect(Collectors.toList())); - } - if (StringUtils.isNotBlank(idCardNum)) { - criteria.andIdCardNumEqualTo(idCardNum); - } - if (null != bindStatus) { - criteria.andBindStatusEqualTo(bindStatus); - } - example.setOrderByClause(" createTime desc "); - PageHelper.startPage(pageNumber, pageSize); - List userCertifyRecords = userCertifyRecordMapper.selectByExample(example); - if (CollectionUtils.isEmpty(userCertifyRecords)) { - return new PageInfo<>(Lists.newArrayList()); - } - long total = new PageInfo<>(userCertifyRecords).getTotal(); - List results = userCertifyRecords.stream().map(userCertifyRecord -> { - UserCertifyRecordVo vo = new UserCertifyRecordVo(); - vo.setBindStatus(userCertifyRecord.getBindStatus()); - vo.setCertifyType(userCertifyRecord.getCertifyType()); - vo.setCreateTime(userCertifyRecord.getCreatetime()); - vo.setIdCardNum(userCertifyRecord.getIdCardNum()); - vo.setName(userCertifyRecord.getName()); - vo.setPhone(userCertifyRecord.getPhone()); - vo.setRecordId(userCertifyRecord.getRecordId()); - vo.setUid(userCertifyRecord.getUid()); - Users users = usersService.getUsersByUid(userCertifyRecord.getUid()); - if (null != users) { - vo.setErbanNo(users.getErbanNo()); - } - return vo; - }).collect(Collectors.toList()); - PageInfo pageInfo = new PageInfo<>(results); - pageInfo.setTotal(total); - return pageInfo; - } - - public int deleteById(Long recordId) { - UserCertifyRecord record = userCertifyRecordMapper.selectByPrimaryKey(recordId); - if (null == record) { - return 0; - } - if (RealPeopleCertifyService.CERTIFY_RESULT_DELETE.equals(record.getBindStatus())) { - return 0; - } - //将状态设置为删除 - UserCertifyRecord updateRecord = new UserCertifyRecord(); - updateRecord.setRecordId(recordId); - updateRecord.setBindStatus(RealPeopleCertifyService.CERTIFY_RESULT_DELETE); - updateRecord.setUpdateTime(new Date()); - int result = userCertifyRecordMapper.updateByPrimaryKeySelective(updateRecord); - //删除成功后，要减去绑定的次数 - if (RealPeopleCertifyService.CERTIFY_RESULT_SUCCESS.equals(record.getBindStatus()) && result > 0) { - Users user = usersService.getUsersByUid(record.getUid()); - user.setRealName(""); - user.setIdCardNum(""); - user.setCertifyModifyTimes(0); - user.setUpdateTime(new Date()); - this.updateUsersInDBAndCache(user); - realPeopleCertifyService.decreaseBindCount(record.getIdCardNum()); - } - return result; - } - - public int deleteBatch(List ids) { - if (CollectionUtils.isEmpty(ids)) { - return 0; - } - - AtomicInteger counter = new AtomicInteger(0); - ids.forEach(id -> { - int result = deleteById(id); - counter.addAndGet(result); - }); - return counter.get(); - } -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/WithdrawAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/WithdrawAdminService.java deleted file mode 100644 index 3e338d15b..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/WithdrawAdminService.java +++ /dev/null @@ -1,198 +0,0 @@ -package com.accompany.admin.service.user; - -import com.accompany.admin.common.AdminConstants; -import com.accompany.admin.model.WithdrawBlock; -import com.accompany.admin.service.withdraw.WithdrawBlockAdminService; -import com.accompany.admin.util.PropertyUtil; -import com.accompany.admin.vo.withdraw.WithdrawVo; -import com.accompany.business.model.WithdrawRecord; -import com.accompany.business.mybatismapper.WithdrawRecordMapper; -import com.accompany.business.param.neteasepush.NeteaseSendMsgParam; -import com.accompany.business.service.SendSysMsgService; -import com.accompany.business.service.record.BillRecordService; -import com.accompany.business.service.user.UsersService; -import com.accompany.common.constant.AccountTypeEnum; -import com.accompany.common.constant.Constant; -import com.accompany.core.enumeration.BillObjTypeEnum; -import com.accompany.core.util.StringUtils; -import com.accompany.sharding.model.BillRecord; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; - -import java.util.ArrayList; -import java.util.Calendar; -import java.util.List; - -/** - * @author yangziwen - * @description - * @date 2018/1/31 21:05 - */ -@Slf4j -@Service -public class WithdrawAdminService { - - @Autowired - private UsersService usersService; - - @Autowired - private WithdrawRecordMapper withdrawMapper; - - @Autowired - private BillRecordService billRecordService; - - @Autowired - private WithdrawBlockAdminService withdrawBlockAdminService; - - @Autowired - private SendSysMsgService sendSysMsgService; - - public IPage getWithdrawList(String erbanNo, String account, String accountName, String phone, String beginDate, - String endDate, Byte status, String payStatus, Byte blockStatus, List blockUids, Byte accountType, Integer pageNum, Integer pageSize) throws Exception { - - QueryWrapper wrapper = configExample(erbanNo, account, accountName, phone, beginDate, endDate, status, payStatus, blockUids, blockStatus, accountType); - - IPage page = new Page<>(pageNum,pageSize); - return this.withdrawMapper.selectPage(page,wrapper); - } - - private QueryWrapper configExample(String erbanNo, String account, String accountName, String phone, String beginDate, String endDate, Byte status, String payStatus, List blockedUids, Byte blockStatus, Byte accountType) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.lambda() - .eq(StringUtils.isNotBlank(accountName),WithdrawRecord::getAccountName,accountName) - .ge(StringUtils.isNotBlank(beginDate),WithdrawRecord::getCreateTime,beginDate) - .le(StringUtils.isNotBlank(endDate),WithdrawRecord::getCreateTime,endDate) - .eq(status != null && status != -1,WithdrawRecord::getStatus,status) - .orderByDesc(WithdrawRecord::getCreateTime); - return wrapper; - } - - - - @Transactional(rollbackFor = Exception.class) - public String approveWithdraw(String id) { - WithdrawRecord withdraw = this.withdrawMapper.selectById(id); - if (withdraw == null) { - log.error("illegal data, withdraw record or billId not exists[id={}]", id); - return "提现申请记录不存在或者账单号为空"; - } - - if (!withdraw.getStatus().equals(Constant.WithDrawStatus.ing)) { - log.error("request is not in progress[id={}]", id); - return "该请求不是发起提现状态"; - } - Long uid = withdraw.getUid(); - WithdrawBlock withdrawBlock = this.withdrawBlockAdminService.getSingleWithdrawBlockByUid(uid); - if(withdrawBlock != null && AdminConstants.Status.VALID.equals(withdrawBlock.getStatus())){ - log.error("the user of request is in withdraw blocklist[id={}]", id); - return "账户是黑名单，无法转账"; - } - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.lambda().eq(BillRecord::getObjId,id).eq(BillRecord::getObjType,BillObjTypeEnum.WITHDRAW.getValue()); - List billRecord =billRecordService.list(wrapper); - if (CollectionUtils.isEmpty(billRecord)) { - return "找不到账单记录"; - } - - withdraw.setStatus(Constant.WithDrawStatus.APPROVED); - withdraw.setUpdateTime(Calendar.getInstance().getTime()); - this.withdrawMapper.updateById(withdraw); - return null; - } - - /** - * 驳回提现申请 - * - * @param withdrawId - * @param remark - */ - public void reject(String withdrawId, String remark) { - WithdrawRecord withdraw = this.withdrawMapper.selectById(withdrawId); - if (withdraw == null || !Constant.WithDrawStatus.APPROVED.equals(withdraw.getStatus())) { - withdraw.setStatus(Constant.WithDrawStatus.reject); - withdraw.setRemark(remark); - withdraw.setUpdateTime(Calendar.getInstance().getTime()); - this.withdrawMapper.updateById(withdraw); - } - } - - public void batchReject(List withdrawIds){ - log.info("batchTransfer(), withdrawIds={}", withdrawIds); - - StringBuilder builder = new StringBuilder(); - for (String withdrawId : withdrawIds) { - this.reject(withdrawId,null); - } - } - - public List convertToVo(List list,List blockUids,Byte blockStatus) throws Exception{ -// List uids = new ArrayList<>(); - List newList = new ArrayList<>(); -// for(WithdrawRecord withdraw:list){ -// Long uid = withdraw.getUid(); -// uids.add(uid); -// } -// List blockList = this.withdrawBlockAdminService.getBatchBlockList(uids); -// -// Map blockMap = blockList.stream().collect(Collectors.toMap(WithdrawBlock::getUid, withdrawBlock -> withdrawBlock)); - - - - for(WithdrawRecord withdraw:list){ - Long uid = withdraw.getUid(); - WithdrawVo withdrawVo = null; - if(!AdminConstants.Status.ALL.equals(blockStatus)){ - withdrawVo = this.buildWithdrawVo(withdraw,blockStatus); - }else if(CollectionUtils.isEmpty(blockUids)){ - withdrawVo = this.buildWithdrawVo(withdraw,AdminConstants.Status.INVALID); - - }else { - Boolean containBol = blockUids.contains(uid); - if(containBol){ - withdrawVo = this.buildWithdrawVo(withdraw,AdminConstants.Status.VALID); - }else{ - withdrawVo = this.buildWithdrawVo(withdraw,AdminConstants.Status.INVALID); - } - } - newList.add(withdrawVo); - } - return newList; - } - - - private WithdrawVo buildWithdrawVo(WithdrawRecord withdraw,Byte withdrawBlockStatus) throws Exception{ - WithdrawVo withdrawVo = new WithdrawVo(); - BeanUtils.copyProperties(withdraw,withdrawVo); - if(withdrawBlockStatus != null) { - withdrawVo.setWithDrawBlockStatus(withdrawBlockStatus); - }else{ - withdrawVo.setWithDrawBlockStatus(AdminConstants.Status.INVALID); - } - return withdrawVo; - } - - /** - * 小秘书通知 - * - * @param toUid - */ - private void sendWithdrawMsg(long toUid, byte accountType) { - String msg = String.format("你的提现申请已通过并发放至%s，请注意查收！", AccountTypeEnum.getNameByType(accountType)); - NeteaseSendMsgParam neteaseSendMsgParam = new NeteaseSendMsgParam(); - neteaseSendMsgParam.setType(0); - neteaseSendMsgParam.setFrom(PropertyUtil.getProperty("SECRETARY_UID")); - neteaseSendMsgParam.setOpe(0); - neteaseSendMsgParam.setTo(String.valueOf(toUid)); - neteaseSendMsgParam.setBody(msg); - sendSysMsgService.sendMsg(neteaseSendMsgParam); - } - -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/ExchangeRateAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/ExchangeRateAdminService.java deleted file mode 100644 index 1be85623f..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/ExchangeRateAdminService.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.accompany.admin.service.withdraw; - -import com.accompany.business.dto.exchange.ExchangeRateDto; -import com.accompany.business.model.withdraw.ExchangeRate; - -import java.util.List; - -/** - * @author: liaozetao - * @date: 2023/7/7 18:08 - * @description: - */ -public interface ExchangeRateAdminService { - - /** - * 保存 - * - * @param rate - */ - void save(ExchangeRateDto rate); - - /** - * 列表 - * - * @return - */ - List list(); - -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/WithdrawAccountAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/WithdrawAccountAdminService.java deleted file mode 100644 index d51f2bc4c..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/WithdrawAccountAdminService.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.accompany.admin.service.withdraw; - -import com.accompany.admin.service.base.BaseService; -import com.accompany.admin.vo.withdraw.WithdrawAccountAdminVo; -import com.accompany.business.model.WithdrawAccount; -import com.accompany.business.service.exchange.WithdrawAccountService; -import com.accompany.business.service.user.UsersService; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.model.Users; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.stream.Collectors; - -/** - * Created by yuanyi on 2019/5/4. - */ -@Service -public class WithdrawAccountAdminService extends BaseService { - - @Autowired - private WithdrawAccountService withdrawAccountService; - @Autowired - private UsersService usersService; - - public Page pageWithdrawAccount(Integer pageNum, Integer pageSize, Long erbanNo) { - Page voPage = new Page<>(pageNum, pageSize); - Page dbPage = new Page<>(pageNum, pageSize); - - Long uid = null; - if (null != erbanNo){ - Users users = usersService.getUserByErbanNo(erbanNo); - if (null != users){ - uid = users.getUid(); - } - } - - QueryWrapper wrapper = Wrappers.query(); - wrapper.lambda().eq(null != uid, WithdrawAccount::getUid, uid) - .orderByDesc(WithdrawAccount::getCreateTime); - withdrawAccountService.page(dbPage, wrapper); - if (!CollectionUtils.isEmpty(dbPage.getRecords())){ - List accounts = dbPage.getRecords(); - List uids = accounts.stream().map(WithdrawAccount::getUid).distinct().collect(Collectors.toList()); - Map usersMap = usersService.getUsersListByUids(uids).stream().collect(Collectors.toMap(Users::getUid, users -> users)); - - List voList = accounts.stream().map(account->{ - WithdrawAccountAdminVo vo = new WithdrawAccountAdminVo(); - BeanUtils.copyProperties(account, vo); - Optional.ofNullable(usersMap.get(account.getUid())).ifPresent(users -> { - vo.setErbanNo(users.getErbanNo()); - vo.setNick(users.getNick()); - }); - vo.setCreateTime(DateTimeUtil.convertDate(account.getCreateTime())); - vo.setUpdateTime(DateTimeUtil.convertDate(account.getUpdateTime())); - return vo; - }).collect(Collectors.toList()); - voPage.setRecords(voList); - voPage.setTotal(dbPage.getTotal()); - } - return voPage; - } - -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/WithdrawAccountDtlAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/WithdrawAccountDtlAdminService.java deleted file mode 100644 index 158e574c7..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/WithdrawAccountDtlAdminService.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.accompany.admin.service.withdraw; - -import com.accompany.business.model.withdraw.WithdrawAccountDtl; - -import java.util.List; - -/** - * @author: liaozetao - * @date: 2023/7/7 18:44 - * @description: - */ -public interface WithdrawAccountDtlAdminService { - - /** - * 列表 - * - * @return - */ - List list(); - -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/WithdrawApplyAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/WithdrawApplyAdminService.java deleted file mode 100644 index 926e50529..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/WithdrawApplyAdminService.java +++ /dev/null @@ -1,145 +0,0 @@ -package com.accompany.admin.service.withdraw; - -import com.accompany.admin.service.base.BaseService; -import com.accompany.admin.vo.withdraw.WithdrawRecordAdminVo; -import com.accompany.business.model.WithdrawRecord; -import com.accompany.business.service.exchange.WithdrawRecordService; -import com.accompany.business.service.purse.UserPurseService; -import com.accompany.business.service.record.BillRecordService; -import com.accompany.business.service.user.UsersService; -import com.accompany.common.constant.Constant; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.enumeration.BillObjTypeEnum; -import com.accompany.core.exception.AdminServiceException; -import com.accompany.core.model.Users; -import com.accompany.core.util.StringUtils; -import com.accompany.sharding.model.BillRecord; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; - -import java.text.NumberFormat; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.stream.Collectors; - -/** - * Created by yuanyi on 2019/5/4. - */ -@Service -public class WithdrawApplyAdminService extends BaseService { - @Autowired - private WithdrawRecordService withdrawRecordService; - @Autowired - private UsersService usersService; - @Autowired - private BillRecordService billRecordService; - @Autowired - private UserPurseService userPurseService; - - public Page pageWithdrawRecord(Integer pageNum, Integer pageSize, Long erbanNo, String beginDate, String endDate, Byte status) { - Page voPage = new Page<>(pageNum, pageSize); - Page dbPage = new Page<>(pageNum, pageSize); - - Long uid = null; - if (null != erbanNo){ - Users users = usersService.getUserByErbanNo(erbanNo); - if (null != users){ - uid = users.getUid(); - } - } - - LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); - wrapper.ge(StringUtils.isNotBlank(beginDate),WithdrawRecord::getCreateTime,beginDate) - .le(StringUtils.isNotBlank(endDate),WithdrawRecord::getCreateTime,endDate) - .eq(null != uid, WithdrawRecord::getUid, uid) - .eq(status != null && status != -1, WithdrawRecord::getStatus, status) - .orderByDesc(WithdrawRecord::getCreateTime); - withdrawRecordService.page(dbPage, wrapper); - if (!CollectionUtils.isEmpty(dbPage.getRecords())){ - List records = dbPage.getRecords(); - List uids = records.stream().map(WithdrawRecord::getUid).distinct().collect(Collectors.toList()); - Map usersMap = usersService.getUsersListByUids(uids).stream().collect(Collectors.toMap(Users::getUid, users -> users)); - - NumberFormat percent = NumberFormat.getPercentInstance(); - percent.setMaximumFractionDigits(0); - - List voList = records.stream().map(record->{ - WithdrawRecordAdminVo vo = new WithdrawRecordAdminVo(); - BeanUtils.copyProperties(record, vo); - Optional.ofNullable(usersMap.get(record.getUid())).ifPresent(users -> { - vo.setErbanNo(users.getErbanNo()); - vo.setNick(users.getNick()); - }); - vo.setFee(percent.format(record.getFee())); - vo.setStatus(translationStatus(record.getStatus())); - vo.setCreateTime(DateTimeUtil.convertDate(record.getCreateTime())); - vo.setUpdateTime(DateTimeUtil.convertDate(record.getUpdateTime())); - return vo; - }).collect(Collectors.toList()); - voPage.setRecords(voList); - voPage.setTotal(dbPage.getTotal()); - } - return voPage; - } - - private String translationStatus(Byte status){ - if (Constant.WithDrawStatus.ing.equals(status)){ - return "申请中"; - } else if (Constant.WithDrawStatus.APPROVED.equals(status)){ - return "已发放"; - } else if (Constant.WithDrawStatus.reject.equals(status)){ - return "已驳回"; - } - return StringUtils.EMPTY; - } - - @Transactional(rollbackFor = Exception.class) - public void updateWithdrawStatus(Long id, Byte status, String adminName) { - WithdrawRecord withdraw = withdrawRecordService.getById(id); - if (withdraw == null) { - throw new AdminServiceException(BusiStatus.SERVERERROR, "提现申请记录不存在或者账单号为空"); - } - - if (!withdraw.getStatus().equals(Constant.WithDrawStatus.ing)) { - throw new AdminServiceException(BusiStatus.SERVERERROR, "该记录不是发起提现状态"); - } - - Long uid = withdraw.getUid(); - Users users = usersService.getUsersByUid(uid); - if (users.getUseStatus().equals(Constant.UserStatus.FROZEN)){ - throw new AdminServiceException(BusiStatus.SERVERERROR, "账户是黑名单，无法转账"); - } - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.lambda().eq(BillRecord::getObjId,id).eq(BillRecord::getObjType,BillObjTypeEnum.WITHDRAW.getValue()); - List billRecord =billRecordService.list(wrapper); - if (CollectionUtils.isEmpty(billRecord)) { - throw new AdminServiceException(BusiStatus.SERVERERROR, "找不到账单记录"); - } - - withdraw.setStatus(status); - withdraw.setUpdateTime(new Date()); - withdraw.setOperator(adminName); - withdrawRecordService.updateById(withdraw); - - if (Constant.WithDrawStatus.APPROVED.equals(status)){ - logger.info("[提现申请] {} {} {} {} 已审批", withdraw.getId(), withdraw.getUid(), withdraw.getGolds(), withdraw.getCreateTime()); - // todo 小秘书通知 - } else if (Constant.WithDrawStatus.reject.equals(status)){ - userPurseService.addGold(withdraw.getUid(), withdraw.getGolds(), BillObjTypeEnum.REJECT_WITHDRAW, - (userPurse)-> billRecordService.insertGeneralBillRecord(uid, withdraw.getId().toString(), BillObjTypeEnum.REJECT_WITHDRAW, withdraw.getGolds(), userPurse)); - logger.info("[提现申请] {} {} {} {} 已退回", withdraw.getId(), withdraw.getUid(), withdraw.getGolds(), withdraw.getCreateTime()); - } - - } -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/WithdrawBlockAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/WithdrawBlockAdminService.java deleted file mode 100644 index 4f5776c93..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/WithdrawBlockAdminService.java +++ /dev/null @@ -1,144 +0,0 @@ -package com.accompany.admin.service.withdraw; - -import com.accompany.admin.common.AdminConstants; -import com.accompany.admin.mapper.WithdrawBlockMapper; -import com.accompany.admin.mapper.WithdrawBlockMapperExpand; -import com.accompany.admin.model.WithdrawBlock; -import com.accompany.admin.model.WithdrawBlockExample; -import com.accompany.admin.service.base.BaseService; -import com.accompany.admin.vo.withdraw.WithdrawBlockVo; -import com.accompany.business.service.user.UserQueryService; -import com.accompany.core.exception.AdminServiceException; -import com.accompany.core.model.Users; -import com.github.pagehelper.PageHelper; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.util.*; -import java.util.stream.Collectors; - -/** - * Created by yuanyi on 2019/4/22. - */ -@Service -public class WithdrawBlockAdminService extends BaseService { - @Autowired - private WithdrawBlockMapper withdrawBlockMapper; - @Autowired - private WithdrawBlockMapperExpand withdrawBlockMapperExpand; - @Autowired - private UserQueryService userQueryService; - - - /** - * 获取黑名单列表 - * @param erbanNoList - * @param status - * @param pageSize - * @param pageNo - * @return - */ - public List getBlockList(String erbanNoList, Byte status, Integer pageSize, Integer pageNo, Date startDate, Date endDate) { - List newList = null; - if(!StringUtils.isEmpty(erbanNoList)){ - List oldList = Arrays.asList(erbanNoList.split(",")); - newList = new ArrayList<>(oldList.size()); - for(String erbanNoStr:oldList){ - Long erbanNo = Long.valueOf(erbanNoStr); - newList.add(erbanNo); - } - } - if(AdminConstants.Status.ALL.equals(status)){ - status = null; - } - PageHelper.startPage(pageNo,pageSize); - List list = this.withdrawBlockMapperExpand.selectWithdrawBlockVoList(newList,status,startDate,endDate); - return list; - } - - /** - * 单个删除，恢复，批量恢复，删除 - * @param uidStr - * @param status - */ - public void batchModify(String uidStr, Byte status){ - List oldList = Arrays.asList(uidStr.split(",")); - List uidList = new ArrayList<>(oldList.size()); - for(String uids :oldList){ - Long uid = Long.valueOf(uids); - uidList.add(uid); - } - WithdrawBlockExample example = new WithdrawBlockExample(); - WithdrawBlockExample.Criteria criteria = example.createCriteria(); - criteria.andUidIn(uidList); - List list = this.withdrawBlockMapper.selectByExample(example); - - for(WithdrawBlock withdrawBlock:list){ - withdrawBlock.setStatus(status); - this.withdrawBlockMapper.updateByPrimaryKeySelective(withdrawBlock); - } - } - - public void insertBlock(String erbanNoList,String remark){ - List strList = Arrays.asList(erbanNoList.split(",")); - if(strList.size() > 500){ - throw new AdminServiceException("输入用户已超500个"); - } - List erbanNos = new ArrayList<>(); - for(String erbanNoStr:strList){ - Long erbanNo = Long.valueOf(erbanNoStr); - erbanNos.add(erbanNo); - } - List usersList = this.userQueryService.getBatchUsersByErbanNoFromDB(erbanNos); - if(CollectionUtils.isEmpty(usersList)){ - throw new AdminServiceException("不存在这批用户"); - } - - Map usersMap = usersList.stream().collect(Collectors.toMap(Users::getErbanNo, users -> users)); - - for(Long erbanNo: erbanNos){ - Users users = usersMap.get(erbanNo); - if(users != null){ - Long uid = users.getUid(); - WithdrawBlock withdrawBlock = this.buildWithdrawBlock(uid,remark); - this.withdrawBlockMapperExpand.insertOrUpdate(withdrawBlock); - } - } - } - - public WithdrawBlock getSingleWithdrawBlockByUid(Long uid){ - WithdrawBlockExample example = new WithdrawBlockExample(); - WithdrawBlockExample.Criteria criteria = example.createCriteria(); - criteria.andUidEqualTo(uid); - List list = withdrawBlockMapper.selectByExample(example); - if(CollectionUtils.isEmpty(list)){ - return null; - } - return list.get(0); - } - - public List getBatchBlockList(List uids){ - WithdrawBlockExample example = new WithdrawBlockExample(); - WithdrawBlockExample.Criteria criteria = example.createCriteria(); - criteria.andUidIn(uids); - return this.withdrawBlockMapper.selectByExample(example); - } - - public List getBlockedUidList(Byte status){ - return this.withdrawBlockMapperExpand.selectWithdrawBlockUid(status); - } - - private WithdrawBlock buildWithdrawBlock(Long uid,String remark) { - WithdrawBlock withDrawBlock = new WithdrawBlock(); - withDrawBlock.setRemark(remark); - withDrawBlock.setUid(uid); - withDrawBlock.setStatus(AdminConstants.Status.VALID); - withDrawBlock.setCreateTime(new Date()); - withDrawBlock.setUpdateTime(new Date()); - return withDrawBlock; - } - - -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/WithdrawConfigAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/WithdrawConfigAdminService.java deleted file mode 100644 index c6b9cef36..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/WithdrawConfigAdminService.java +++ /dev/null @@ -1,153 +0,0 @@ - -package com.accompany.admin.service.withdraw; - -import cn.hutool.core.collection.CollectionUtil; -import com.accompany.admin.service.base.BaseService; -import com.accompany.admin.service.system.SysConfAdminService; -import com.accompany.admin.vo.withdraw.WithdrawConfigAdminVo; -import com.accompany.business.dto.exchange.WithdrawConfigDto; -import com.accompany.business.model.withdraw.WithdrawAccountDtl; -import com.accompany.business.model.withdraw.WithdrawConfig; -import com.accompany.business.service.withdraw.ExchangeRateService; -import com.accompany.business.service.withdraw.WithdrawAccountDtlService; -import com.accompany.business.service.withdraw.WithdrawConfigService; -import com.accompany.common.constant.Constant; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.ServiceException; -import com.alibaba.nacos.api.exception.NacosException; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.io.IOException; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; - -/** - * Created by yuanyi on 2019/5/4. - */ -@Service -@Slf4j -public class WithdrawConfigAdminService extends BaseService { - - @Autowired - private ObjectMapper objectMapper; - - @Autowired - private SysConfAdminService sysConfAdminService; - - @Autowired - private WithdrawConfigService withdrawConfigService; - - @Autowired - private WithdrawAccountDtlService withdrawAccountDtlService; - - @Autowired - private ExchangeRateService exchangeRateService; - - public List list() { - List list = new ArrayList<>(); - WithdrawConfigDto configDto = getConfig(); - WithdrawConfigAdminVo vo = new WithdrawConfigAdminVo(); - BeanUtils.copyProperties(configDto, vo); - vo.setRole("全部用户"); - list.add(vo); - return list; - } - - public void save(WithdrawConfigDto params) { - boolean needSave = false; - WithdrawConfigDto configDto = getConfig(); - if (!configDto.getFee().equals(params.getFee())) { - configDto.setFee(params.getFee()); - needSave = true; - } - if (!configDto.getTimes().equals(params.getTimes())) { - configDto.setTimes(params.getTimes()); - needSave = true; - } - if (!configDto.getMin().equals(params.getMin())) { - configDto.setMin(params.getMin()); - needSave = true; - } - if (!configDto.getMax().equals(params.getMin())) { - configDto.setMax(params.getMax()); - needSave = true; - } - if (needSave) { - try { - String configStr = objectMapper.writeValueAsString(configDto); - sysConfAdminService.updateConfigValueById(Constant.SysConfId.WITHDRAWAL_CONFIG, configStr); - } catch (JsonProcessingException e) { - log.error("[金币提现] 序列化 config 异常 {}", configDto, e); - throw new ServiceException(BusiStatus.SERVERBUSY); - } catch (NacosException e) { - log.error("[金币提现] 保存到 nacos 异常 {}", configDto, e); - throw new ServiceException(BusiStatus.SERVERBUSY); - } - } - } - - private WithdrawConfigDto getConfig() { - String configStr = sysConfAdminService.getSysConfValueById(Constant.SysConfId.WITHDRAWAL_CONFIG); - if (!org.springframework.util.StringUtils.hasText(configStr)) { - log.error("[金币提现] 配置为空 {}", Constant.SysConfId.WITHDRAWAL_CONFIG); - throw new ServiceException(BusiStatus.SERVERBUSY); - } - WithdrawConfigDto config = null; - try { - config = objectMapper.readValue(configStr, WithdrawConfigDto.class); - } catch (IOException e) { - log.error("[金币提现] 获取配置异常 {}", Constant.SysConfId.WITHDRAWAL_CONFIG); - throw new ServiceException(BusiStatus.SERVERBUSY); - } - return config; - } - - public void saveConfig(WithdrawConfigDto config) { - WithdrawConfig withdrawConfig = new WithdrawConfig(); - BeanUtils.copyProperties(config, withdrawConfig); - Long minValue = withdrawConfig.getMinValue(); - Long weekMaxValue = withdrawConfig.getWeekMaxValue(); - BigDecimal chargeRate = withdrawConfig.getChargeRate(); - if (minValue < 0) { - throw new ServiceException("最小提现金币不能小于零"); - } - if (weekMaxValue < 0) { - throw new ServiceException("周提现上限不能小于零"); - } - if (minValue > weekMaxValue) { - throw new ServiceException("周提现上限不能小于最小提现金币"); - } - if (chargeRate == null || chargeRate.compareTo(BigDecimal.ZERO) < 0) { - throw new ServiceException("提现手续费率不能小于零"); - } - withdrawConfig.setIsEnabled((byte) Constant.Yes1No0.YES); - withdrawConfigService.saveOrUpdate(withdrawConfig); - List accounts = config.getAccounts(); - if (CollectionUtil.isNotEmpty(accounts)) { - withdrawAccountDtlService.saveOrUpdateBatch(accounts); - } - } - - public WithdrawConfigAdminVo get() { - WithdrawConfigAdminVo admin = new WithdrawConfigAdminVo(); - List configs = withdrawConfigService.list(Wrappers.lambdaQuery() - .eq(WithdrawConfig::getIsEnabled, Constant.Yes1No0.YES)); - if (CollectionUtil.isEmpty(configs)) { - return admin; - } - WithdrawConfig config = configs.get(0); - BeanUtils.copyProperties(config, admin); - admin.setAccounts(withdrawAccountDtlService.list()); - admin.setRates(exchangeRateService.list()); - admin.setLastRateTime(exchangeRateService.getLastRateTime()); - return admin; - } - -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/WithdrawUserAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/WithdrawUserAdminService.java deleted file mode 100644 index 11574cf57..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/WithdrawUserAdminService.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.accompany.admin.service.withdraw; - -import com.accompany.admin.vo.withdraw.WithdrawUserAdminVo; -import com.accompany.business.model.withdraw.WithdrawUserAccount; -import com.accompany.common.model.PageReq; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.springframework.web.context.request.ServletWebRequest; - -/** - * @author: liaozetao - * @date: 2023/7/7 15:20 - * @description: - */ -public interface WithdrawUserAdminService { - - /** - * 分页 - * - * @param erbanNo - * @param req - * @return - */ - Page page(String erbanNo, PageReq req); - - /** - * 获取 - * - * @param uid - * @param accountType - * @return - */ - WithdrawUserAccount get(Long uid, Integer accountType); - - /** - * 导出 - * - * @param erBanNo - * @param servletWebRequest - */ - void export(Long erBanNo, ServletWebRequest servletWebRequest); - - /** - * 重置 - * - * @param id - */ - void reset(Long id); - -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/WithdrawUserLimitAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/WithdrawUserLimitAdminService.java deleted file mode 100644 index 808daf68d..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/WithdrawUserLimitAdminService.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.accompany.admin.service.withdraw; - -import com.accompany.admin.dto.withdraw.WithdrawUserLimitAdminDto; -import com.accompany.admin.vo.withdraw.WithdrawUserLimitAdminVo; -import com.accompany.common.model.PageReq; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.springframework.web.context.request.ServletWebRequest; - -/** - * @author: liaozetao - * @date: 2023/7/10 14:38 - * @description: - */ -public interface WithdrawUserLimitAdminService { - - /** - * 分页 - * - * @param erbanNo - * @param limitType - * @param roomErBanNo - * @param hallErBanNo - * @param req - * @return - */ - Page page(String erbanNo, Integer limitType, String roomErBanNo, String hallErBanNo, PageReq req); - - /** - * 保存 - * - * @param limit - */ - void save(WithdrawUserLimitAdminDto limit); - - /** - * 删除 - * - * @param id - */ - void del(Long id); - - /** - * 批量删除 - * - * @param idStr - */ - void batchDel(String idStr); - - /** - * 导出 - * - * @param erbanNo - * @param limitType - * @param roomErBanNo - * @param hallErBanNo - * @param servletWebRequest - */ - void export(String erbanNo, Integer limitType, String roomErBanNo, String hallErBanNo, ServletWebRequest servletWebRequest); - -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/WithdrawUserRecordAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/WithdrawUserRecordAdminService.java deleted file mode 100644 index 0727e981c..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/WithdrawUserRecordAdminService.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.accompany.admin.service.withdraw; - -import com.accompany.admin.vo.withdraw.WithdrawUserRecordAdminVo; -import com.accompany.common.model.PageReq; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.springframework.web.context.request.ServletWebRequest; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * @author: liaozetao - * @date: 2023/7/10 14:38 - * @description: - */ -public interface WithdrawUserRecordAdminService { - - /** - * 分页 - * - * @param recordStatus - * @param erBanNo - * @param accountType - * @param applyStartTime - * @param applyEndTime - * @param req - * @return - */ - Page page(Integer recordStatus, String erBanNo, Integer accountType, Date applyStartTime, Date applyEndTime, PageReq req); - - /** - * 发放 - * - * @param adminId - * @param isSecretary - * @param id - */ - void grant(Long id, Integer isSecretary, Integer adminId); - - /** - * 导出 - * - * @param recordStatus - * @param erbanNo - * @param accountType - * @param applyStartTime - * @param applyEndTime - * @param servletWebRequest - */ - void export(Integer recordStatus, String erbanNo, Integer accountType, Date applyStartTime, Date applyEndTime, ServletWebRequest servletWebRequest); - - /** - * 汇总提现金额 - * - * @param recordStatus - * @param erbanNo - * @param accountType - * @param applyStartTime - * @param applyEndTime - * @return - */ - BigDecimal totalAmount(Integer recordStatus, String erbanNo, Integer accountType, Date applyStartTime, Date applyEndTime); - - /** - * 批量发放 - * - * @param recordIdStr - * @param isSecretary - * @param adminId - */ - void batchGrant(String recordIdStr, Integer isSecretary, Integer adminId); - - /** - * 驳回 - * - * @param id - * @param isReturn - * @param isSecretary - * @param adminId - */ - void reject(Long id, Integer isReturn, Integer isSecretary, Integer adminId); - - /** - * 批量驳回 - * - * @param recordIdStr - * @param isReturn - * @param isSecretary - * @param adminId - */ - void batchReject(String recordIdStr, Integer isReturn, Integer isSecretary, Integer adminId); -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/impl/ExchangeRateAdminServiceImpl.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/impl/ExchangeRateAdminServiceImpl.java deleted file mode 100644 index cca150a09..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/impl/ExchangeRateAdminServiceImpl.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.accompany.admin.service.withdraw.impl; - -import cn.hutool.core.collection.CollectionUtil; -import com.accompany.admin.service.withdraw.ExchangeRateAdminService; -import com.accompany.business.dto.exchange.ExchangeRateDto; -import com.accompany.business.model.withdraw.ExchangeRate; -import com.accompany.business.service.withdraw.ExchangeRateService; -import com.accompany.payment.constant.CurrencyTypeEnum; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.function.Function; -import java.util.stream.Collectors; - -/** - * @author: liaozetao - * @date: 2023/7/7 18:08 - * @description: - */ -@Slf4j -@Service -public class ExchangeRateAdminServiceImpl implements ExchangeRateAdminService { - - @Autowired - private ExchangeRateService exchangeRateService; - - @Override - public void save(ExchangeRateDto rate) { - BigDecimal cny = rate.getCny(); - BigDecimal myr = rate.getMyr(); - BigDecimal sgd = rate.getSgd(); - BigDecimal other = rate.getOther(); - BigDecimal twd = rate.getTwd(); - List list = exchangeRateService.list(Wrappers.lambdaQuery() - .in(ExchangeRate::getCurrency, Arrays.asList( - CurrencyTypeEnum.CNY.getValue(), - CurrencyTypeEnum.MYR.getValue(), - CurrencyTypeEnum.SGD.getValue(), - CurrencyTypeEnum.USD.getValue(), - CurrencyTypeEnum.TWD.getValue()))); - if (CollectionUtil.isEmpty(list)) { - return; - } - Map exchangeRateMap = list.stream().collect(Collectors.toMap(ExchangeRate::getCurrency, Function.identity())); - if (exchangeRateMap.containsKey(CurrencyTypeEnum.CNY.getValue())) { - ExchangeRate exchangeRate = exchangeRateMap.get(CurrencyTypeEnum.CNY.getValue()); - exchangeRate.setRate(cny); - exchangeRate.setUpdateTime(new Date()); - exchangeRateService.saveOrUpdate(exchangeRate); - } - if (exchangeRateMap.containsKey(CurrencyTypeEnum.MYR.getValue())) { - ExchangeRate exchangeRate = exchangeRateMap.get(CurrencyTypeEnum.MYR.getValue()); - exchangeRate.setRate(myr); - exchangeRate.setUpdateTime(new Date()); - exchangeRateService.saveOrUpdate(exchangeRate); - } - if (exchangeRateMap.containsKey(CurrencyTypeEnum.SGD.getValue())) { - ExchangeRate exchangeRate = exchangeRateMap.get(CurrencyTypeEnum.SGD.getValue()); - exchangeRate.setRate(sgd); - exchangeRate.setUpdateTime(new Date()); - exchangeRateService.saveOrUpdate(exchangeRate); - } - if (exchangeRateMap.containsKey(CurrencyTypeEnum.USD.getValue())) { - ExchangeRate exchangeRate = exchangeRateMap.get(CurrencyTypeEnum.USD.getValue()); - exchangeRate.setRate(other); - exchangeRate.setUpdateTime(new Date()); - exchangeRateService.saveOrUpdate(exchangeRate); - } - if (exchangeRateMap.containsKey(CurrencyTypeEnum.TWD.getValue())) { - ExchangeRate exchangeRate = exchangeRateMap.get(CurrencyTypeEnum.TWD.getValue()); - exchangeRate.setRate(twd); - exchangeRate.setUpdateTime(new Date()); - exchangeRateService.saveOrUpdate(exchangeRate); - } - } - - @Override - public List list() { - return exchangeRateService.list(); - } -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/impl/WithdrawAccountDtlAdminServiceImpl.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/impl/WithdrawAccountDtlAdminServiceImpl.java deleted file mode 100644 index 59314cbe2..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/impl/WithdrawAccountDtlAdminServiceImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.accompany.admin.service.withdraw.impl; - -import com.accompany.admin.service.withdraw.WithdrawAccountDtlAdminService; -import com.accompany.business.model.withdraw.WithdrawAccountDtl; -import com.accompany.business.service.withdraw.WithdrawAccountDtlService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @author: liaozetao - * @date: 2023/7/7 18:44 - * @description: - */ -@Slf4j -@Service -public class WithdrawAccountDtlAdminServiceImpl implements WithdrawAccountDtlAdminService { - - @Autowired - private WithdrawAccountDtlService withdrawAccountDtlService; - - @Override - public List list() { - return withdrawAccountDtlService.list(); - } -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/impl/WithdrawUserAdminServiceImpl.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/impl/WithdrawUserAdminServiceImpl.java deleted file mode 100644 index abca6b674..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/impl/WithdrawUserAdminServiceImpl.java +++ /dev/null @@ -1,219 +0,0 @@ -package com.accompany.admin.service.withdraw.impl; - -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.date.DatePattern; -import cn.hutool.core.util.StrUtil; -import com.accompany.admin.dto.withdraw.WithdrawUserAdminDto; -import com.accompany.admin.service.withdraw.WithdrawUserAdminService; -import com.accompany.admin.vo.withdraw.WithdrawUserAdminVo; -import com.accompany.business.constant.withdraw.WithdrawAccountTypeConstant; -import com.accompany.business.model.UserCertifyRecord; -import com.accompany.business.model.UserCertifyRecordExample; -import com.accompany.business.model.withdraw.WithdrawUser; -import com.accompany.business.model.withdraw.WithdrawUserAccount; -import com.accompany.business.mybatismapper.UserCertifyRecordMapper; -import com.accompany.business.service.certification.AbstractCertifyService; -import com.accompany.business.service.certification.FinancialFaceVerifyService; -import com.accompany.business.service.user.UsersService; -import com.accompany.business.service.withdraw.WithdrawUserAccountService; -import com.accompany.business.service.withdraw.WithdrawUserService; -import com.accompany.common.constant.Constant; -import com.accompany.common.model.PageReq; -import com.accompany.core.model.Users; -import com.accompany.core.mybatismapper.UsersMapper; -import com.alibaba.excel.EasyExcel; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.time.DateFormatUtils; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.web.context.request.ServletWebRequest; - -import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -/** - * @author: liaozetao - * @date: 2023/7/7 15:21 - * @description: - */ -@Slf4j -@Service -public class WithdrawUserAdminServiceImpl implements WithdrawUserAdminService { - - @Autowired - private UsersMapper usersMapper; - - @Autowired - private UserCertifyRecordMapper userCertifyRecordMapper; - - @Autowired - private UsersService usersService; - - @Autowired - private WithdrawUserService withdrawUserService; - - @Autowired - private WithdrawUserAccountService withdrawUserAccountService; - - @Autowired - private FinancialFaceVerifyService financialFaceVerifyService; - - @Override - public Page page(String erBanNo, PageReq req) { - List uidList = null; - if (StrUtil.isNotEmpty(erBanNo)) { - uidList = usersMapper.getUidByErBanNo(erBanNo); - } - if (req == null) { - req = new PageReq(-1, -1); - } - IPage page = null; - if (req.getPage() == -1 && req.getPageSize() == -1) { - page = new Page<>(-1, -1); - page.setRecords(withdrawUserService.list(Wrappers.lambdaQuery() - .in(CollectionUtil.isNotEmpty(uidList), WithdrawUser::getUid, uidList))); - } else { - page = withdrawUserService.page(new Page<>(req.getPage(), req.getPageSize()), Wrappers.lambdaQuery() - .in(CollectionUtil.isNotEmpty(uidList), WithdrawUser::getUid, uidList)); - } - List admins = new ArrayList<>(); - List records = page.getRecords(); - if (CollectionUtil.isNotEmpty(records)) { - Map userMap = usersService.getUsersMapByUids(records.stream().map(WithdrawUser::getUid).collect(Collectors.toList())); - List withdrawUserAccounts = withdrawUserAccountService.list(Wrappers.lambdaQuery() - .in(WithdrawUserAccount::getUid, userMap.keySet()) - .eq(WithdrawUserAccount::getAccountType, WithdrawAccountTypeConstant.CHINA_UNION_PAY)); - for (WithdrawUser record : records) { - Long uid = record.getUid(); - WithdrawUserAdminVo admin = new WithdrawUserAdminVo(); - BeanUtils.copyProperties(record, admin); - if (userMap.containsKey(uid)) { - Users users = userMap.get(uid); - admin.setErbanNo(users.getErbanNo()); - admin.setNick(users.getNick()); - if (CollectionUtil.isNotEmpty(withdrawUserAccounts)) { - withdrawUserAccounts.stream().filter(v -> v.getUid().equals(uid)).findAny().ifPresent(v -> admin.setUpdateTime(v.getUpdateTime())); - } - } - admins.add(admin); - } - } - Page iPage = new Page<>(req.getPage(), req.getPageSize()); - iPage.setTotal(page.getTotal()); - iPage.setRecords(admins); - return iPage; - } - - @Override - public WithdrawUserAccount get(Long uid, Integer accountType) { - List accounts = withdrawUserAccountService.list(Wrappers.lambdaQuery() - .eq(WithdrawUserAccount::getUid, uid) - .eq(WithdrawUserAccount::getAccountType, accountType)); - if (CollectionUtil.isNotEmpty(accounts)) { - return accounts.get(0); - } - return null; - } - - @Override - public void export(Long erBanNo, ServletWebRequest servletWebRequest) { - String erBanNoStr = null; - if (erBanNo != null) { - erBanNoStr = String.valueOf(erBanNo); - } - PageReq req = new PageReq(); - req.setPage(-1); - req.setPageSize(-1); - Page page = page(erBanNoStr, req); - List datas = new ArrayList<>(); - List records = page.getRecords(); - if (CollectionUtil.isNotEmpty(records)) { - for (WithdrawUserAdminVo record : records) { - WithdrawUserAdminDto admin = new WithdrawUserAdminDto(); - BeanUtils.copyProperties(record, admin); - Date createTime = record.getCreateTime(); - Integer isOrderAccount = record.getIsOrderAccount(); - Integer isChinaUnionPay = record.getIsChinaUnionPay(); - Integer isMayBank = record.getIsMayBank(); - Integer isBankOfSingapore = record.getIsBankOfSingapore(); - Integer isTaiWanBank = record.getIsTaiWanBank(); - String withdrawAccount = "中国大陆银联 " + (isChinaUnionPay == Constant.Yes1No0.YES ? "已绑定" : "未绑定") + "\n"; - withdrawAccount += "马来西亚银行 " + (isMayBank == Constant.Yes1No0.YES ? "已绑定" : "未绑定") + "\n"; - withdrawAccount += "新加坡银行 " + (isBankOfSingapore == Constant.Yes1No0.YES ? "已绑定" : "未绑定") + "\n"; - withdrawAccount += "其它账户 " + (isOrderAccount == Constant.Yes1No0.YES ? "已绑定" : "未绑定") + "\n"; - withdrawAccount += "台湾地区银行 " + (isTaiWanBank == Constant.Yes1No0.YES ? "已绑定" : "未绑定"); - admin.setWithdrawAccount(withdrawAccount); - admin.setCreateTimeStr(DateFormatUtils.format(createTime, DatePattern.NORM_DATETIME_PATTERN)); - datas.add(admin); - } - } - if (servletWebRequest.getResponse() != null) { - try { - //这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman - servletWebRequest.getResponse().setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); - servletWebRequest.getResponse().setCharacterEncoding("utf-8"); - //这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系 - String fileName = URLEncoder.encode("用户账户信息", "UTF-8").replaceAll("\\+", "%20"); - servletWebRequest.getResponse().setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); - EasyExcel.write(servletWebRequest.getResponse().getOutputStream(), WithdrawUserAdminDto.class).sheet("用户账户信息").doWrite(datas); - } catch (Exception e) { - log.error(e.getMessage(), e); - } - } - } - - @Override - public void reset(Long id) { - WithdrawUserAccount withdrawUserAccount = withdrawUserAccountService.getById(id); - withdrawUserAccountService.removeById(id); - if (withdrawUserAccount == null) { - return; - } - Long uid = withdrawUserAccount.getUid(); - Integer accountType = withdrawUserAccount.getAccountType(); - List withdrawUsers = withdrawUserService.list(Wrappers.lambdaQuery() - .eq(WithdrawUser::getUid, uid)); - if (CollectionUtil.isEmpty(withdrawUsers)) { - return; - } - WithdrawUser withdrawUser = withdrawUsers.get(0); - withdrawUser.setAccountFlag(withdrawUser.getAccountFlag() ^ accountType); - withdrawUser.setUpdateTime(new Date()); - withdrawUserService.saveOrUpdate(withdrawUser); - //清除实名记录 - UserCertifyRecordExample example = new UserCertifyRecordExample(); - example.createCriteria().andUidEqualTo(uid); - List records = userCertifyRecordMapper.selectByExample(example); - if (CollectionUtil.isEmpty(records)) { - return; - } - if (accountType == WithdrawAccountTypeConstant.CHINA_UNION_PAY) { - Date now = new Date(); - Users users = usersMapper.selectByPrimaryKey(uid); - if (users != null) { - String idCardNum = users.getIdCardNum(); - users.setIdCardNum(StrUtil.EMPTY); - users.setRealName(StrUtil.EMPTY); - users.setCertifyModifyTimes(0); - users.setUpdateTime(now); - usersMapper.updateByPrimaryKeySelective(users); - usersService.deleteUserRelateCachesByUid(uid); - financialFaceVerifyService.decreaseBindCount(idCardNum); - } - for (UserCertifyRecord record : records) { - record.setBindStatus((byte) AbstractCertifyService.DELETE); - record.setUpdateTime(now); - userCertifyRecordMapper.updateByPrimaryKey(record); - } - } - } - -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/impl/WithdrawUserLimitAdminServiceImpl.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/impl/WithdrawUserLimitAdminServiceImpl.java deleted file mode 100644 index 6e8336b1f..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/impl/WithdrawUserLimitAdminServiceImpl.java +++ /dev/null @@ -1,173 +0,0 @@ -package com.accompany.admin.service.withdraw.impl; - -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.date.DatePattern; -import cn.hutool.core.util.StrUtil; -import com.accompany.admin.dto.withdraw.WithdrawUserLimitAdminDto; -import com.accompany.admin.dto.withdraw.WithdrawUserLimitExportDto; -import com.accompany.admin.mapper.withdraw.WithdrawUserLimitAdminMapper; -import com.accompany.admin.service.system.AdminRoleService; -import com.accompany.admin.service.withdraw.WithdrawUserLimitAdminService; -import com.accompany.admin.vo.withdraw.WithdrawUserLimitAdminVo; -import com.accompany.business.model.withdraw.WithdrawUserLimit; -import com.accompany.business.service.withdraw.WithdrawUserLimitService; -import com.accompany.common.constant.Constant; -import com.accompany.common.model.PageReq; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.model.Users; -import com.accompany.core.mybatismapper.RoomMapper; -import com.accompany.core.mybatismapper.UsersMapper; -import com.accompany.core.service.user.UsersBaseService; -import com.alibaba.excel.EasyExcel; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.time.DateFormatUtils; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.web.context.request.ServletWebRequest; - -import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -/** - * @author: liaozetao - * @date: 2023/7/10 14:39 - * @description: - */ -@Slf4j -@Service -public class WithdrawUserLimitAdminServiceImpl implements WithdrawUserLimitAdminService { - - @Autowired - private UsersMapper usersMapper; - - @Autowired - private RoomMapper roomMapper; - - @Autowired - private WithdrawUserLimitAdminMapper withdrawUserLimitAdminMapper; - - @Autowired - private UsersBaseService usersBaseService; - - @Autowired - private WithdrawUserLimitService withdrawUserLimitService; - - @Autowired - private AdminRoleService adminRoleService; - - @Override - public Page page(String erbanNo, Integer limitType, String roomErBanNo, String hallErBanNo, PageReq req) { - return withdrawUserLimitAdminMapper.selectPage(new Page<>(req.getPage(), req.getPageSize()), erbanNo, limitType, roomErBanNo, hallErBanNo); - } - - @Override - public void save(WithdrawUserLimitAdminDto limit) { - String erbanNo = limit.getErbanNo(); - String[] erBanNoArray = null; - if (StrUtil.isNotEmpty(erbanNo)) { - if (erbanNo.contains(StrUtil.COMMA)) { - erBanNoArray = erbanNo.split(StrUtil.COMMA); - } - if (erbanNo.contains("\n")) { - erBanNoArray = erbanNo.split("\n"); - } - } - if (erBanNoArray == null) { - erBanNoArray = new String[]{erbanNo}; - } - List uidList = usersMapper.findUidByErbanNos(Arrays.asList(erBanNoArray)); - if (CollectionUtil.isEmpty(uidList)) { - throw new ServiceException("用户ID不存在"); - } - List userList = usersBaseService.getUsersListByUids(uidList.stream().map(Long::valueOf).collect(Collectors.toList())); - if (CollectionUtil.isEmpty(userList)) { - return; - } - Integer limitType = limit.getLimitType(); - for (Users users : userList) { - Long uid = users.getUid(); - WithdrawUserLimit withdrawUserLimit = new WithdrawUserLimit(); - withdrawUserLimit.setUid(uid); - withdrawUserLimit.setLimitType(limitType); - List withdrawUserLimits = withdrawUserLimitService.list(Wrappers.lambdaQuery() - .eq(WithdrawUserLimit::getUid, uid)); - if (CollectionUtil.isNotEmpty(withdrawUserLimits)) { - WithdrawUserLimit userLimit = withdrawUserLimits.get(0); - withdrawUserLimit.setId(userLimit.getId()); - withdrawUserLimit.setUpdateTime(new Date()); - } else { - withdrawUserLimit.setCreateTime(new Date()); - } - withdrawUserLimit.setLimitTime(new Date()); - withdrawUserLimitService.saveOrUpdate(withdrawUserLimit); - } - } - - @Override - public void del(Long id) { - withdrawUserLimitService.removeById(id); - } - - @Override - public void batchDel(String idStr) { - if (StrUtil.isEmpty(idStr)) { - return; - } - String[] idArray = idStr.split(StrUtil.COMMA); - for (String id : idArray) { - del(Long.valueOf(id)); - } - } - - @Override - public void export(String erbanNo, Integer limitType, String roomErBanNo, String hallErBanNo, ServletWebRequest servletWebRequest) { - PageReq req = new PageReq(); - req.setPage(1); - req.setPageSize(1000000); - List datas = new ArrayList<>(); - Page page = page(erbanNo, limitType, roomErBanNo, hallErBanNo, req); - List records = page.getRecords(); - if (CollectionUtil.isNotEmpty(records)) { - for (WithdrawUserLimitAdminVo record : records) { - WithdrawUserLimitExportDto admin = new WithdrawUserLimitExportDto(); - BeanUtils.copyProperties(record, admin); - Integer isCash = record.getIsCash(); - Integer isDiamond = record.getIsDiamond(); - Date limitTime = record.getLimitTime(); - String limitContent = StrUtil.EMPTY; - if (isDiamond != null && isDiamond == Constant.Yes1No0.YES) { - limitContent += "兑换钻石\n"; - } - if (isCash != null && isCash == Constant.Yes1No0.YES) { - limitContent += "提现\n"; - } - admin.setLimitContent(limitContent); - if (limitTime != null) { - admin.setLimitTimeStr(DateFormatUtils.format(limitTime, DatePattern.NORM_DATETIME_PATTERN)); - } - datas.add(admin); - } - } - if (servletWebRequest.getResponse() != null) { - try { - //这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman - servletWebRequest.getResponse().setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); - servletWebRequest.getResponse().setCharacterEncoding("utf-8"); - //这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系 - String fileName = URLEncoder.encode("用户限制信息", "UTF-8").replaceAll("\\+", "%20"); - servletWebRequest.getResponse().setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); - EasyExcel.write(servletWebRequest.getResponse().getOutputStream(), WithdrawUserLimitExportDto.class).sheet("用户限制信息").doWrite(datas); - } catch (Exception e) { - log.error(e.getMessage(), e); - } - } - } - -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/impl/WithdrawUserRecordAdminServiceImpl.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/impl/WithdrawUserRecordAdminServiceImpl.java deleted file mode 100644 index 10cf976d2..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/impl/WithdrawUserRecordAdminServiceImpl.java +++ /dev/null @@ -1,243 +0,0 @@ -package com.accompany.admin.service.withdraw.impl; - -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.date.DatePattern; -import cn.hutool.core.util.StrUtil; -import com.accompany.admin.dto.withdraw.WithdrawUserRecordAdminDto; -import com.accompany.admin.service.withdraw.WithdrawUserRecordAdminService; -import com.accompany.admin.util.DateTimeUtil; -import com.accompany.admin.vo.withdraw.WithdrawUserRecordAdminVo; -import com.accompany.business.enums.withdraw.RecordStatusEnum; -import com.accompany.business.model.withdraw.WithdrawUserRecord; -import com.accompany.business.param.neteasepush.NeteaseSendMsgBatchParam; -import com.accompany.business.service.SendSysMsgService; -import com.accompany.business.service.purse.UserPurseService; -import com.accompany.business.service.record.BillRecordService; -import com.accompany.business.service.withdraw.WithdrawUserRecordService; -import com.accompany.business.vo.withdraw.WithdrawUserRecordVo; -import com.accompany.common.config.SystemConfig; -import com.accompany.common.constant.Constant; -import com.accompany.common.model.PageReq; -import com.accompany.core.constant.BlockStatusEnum; -import com.accompany.core.enumeration.BillObjTypeEnum; -import com.accompany.core.exception.AdminServiceException; -import com.accompany.core.exception.ServiceException; -import com.alibaba.excel.EasyExcel; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.time.DateFormatUtils; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.context.request.ServletWebRequest; - -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.net.URLEncoder; -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.List; - -/** - * @author: liaozetao - * @date: 2023/7/10 14:39 - * @description: - */ -@Slf4j -@Service -public class WithdrawUserRecordAdminServiceImpl implements WithdrawUserRecordAdminService { - - @Autowired - private WithdrawUserRecordService withdrawUserRecordService; - - @Autowired - private SendSysMsgService sendSysMsgService; - - @Autowired - private UserPurseService userPurseService; - - @Autowired - private BillRecordService billRecordService; - - @Override - public Page page(Integer recordStatus, String erBanNo, Integer accountType, Date applyStartTime, Date applyEndTime, PageReq req) { - if (req == null) { - req = new PageReq(-1, -1); - } - List records = null; - if (req.getPage() == -1 && req.getPageSize() == -1) { - records = withdrawUserRecordService.page(null, recordStatus, erBanNo, accountType, applyStartTime, applyEndTime); - } else { - records = withdrawUserRecordService.page(new Page<>(req.getPage(), req.getPageSize()), recordStatus, erBanNo, accountType, applyStartTime, applyEndTime); - } - List admins = new ArrayList<>(); - if (CollectionUtil.isNotEmpty(records)) { - for (WithdrawUserRecordVo record : records) { - WithdrawUserRecordAdminVo admin = new WithdrawUserRecordAdminVo(); - BeanUtils.copyProperties(record, admin); - admins.add(admin); - } - } - Page iPage = new Page<>(req.getPage(), req.getPageSize()); - iPage.setRecords(admins); - if (req.getPage() != -1 && req.getPageSize() != -1) { - iPage.setTotal(withdrawUserRecordService.totalCount(recordStatus, erBanNo, accountType, applyStartTime, applyEndTime)); - } - return iPage; - } - - @Override - public void grant(Long id, Integer isSecretary, Integer adminId) { - if (id == null) { - throw new AdminServiceException("缺少ID"); - } - log.info("grant id : {}, adminId : {}", id, adminId); - WithdrawUserRecord record = withdrawUserRecordService.getById(id); - if (record == null) { - throw new AdminServiceException("找不到"+ id +"记录"); - } - LocalDateTime now = LocalDateTime.now(); - withdrawUserRecordService.update(Wrappers.lambdaUpdate() - .set(WithdrawUserRecord::getOperatorId, adminId) - .set(WithdrawUserRecord::getGrantTime, now) - .set(WithdrawUserRecord::getUpdateTime, now) - .set(WithdrawUserRecord::getRecordStatus, RecordStatusEnum.PASS.ordinal()) - .eq(WithdrawUserRecord::getId, id)); - if (isSecretary != null && isSecretary == Constant.Yes1No0.YES) { - String currentTime = DateTimeUtil.getCurrentTime(); - String message = "尊敬的用戶您好，您於【" + currentTime + "】發起的提領已發放至綁定的賬戶，請留意查收，到帳時間以當地銀行處理為準，如有問題請聯繫官方客服wechat：sd245376或line：pekoyuyin"; - NeteaseSendMsgBatchParam param = new NeteaseSendMsgBatchParam(); - param.setType(0); - param.setContent(message); - sendSysMsgService.sendBatchPersonTextMsg(SystemConfig.secretaryUid, Collections.singletonList(record.getUid()), null, message, param); - } - } - - @Override - public void export(Integer recordStatus, String erbanNo, Integer accountType, Date applyStartTime, Date applyEndTime, ServletWebRequest servletWebRequest) { - PageReq req = new PageReq(); - req.setPage(-1); - req.setPageSize(-1); - List datas = new ArrayList<>(); - Page page = page(recordStatus, erbanNo, accountType, applyStartTime, applyEndTime, req); - List records = page.getRecords(); - if (CollectionUtil.isNotEmpty(records)) { - for (WithdrawUserRecordAdminVo record : records) { - Integer blockStatus = record.getBlockStatus(); - Date createTime = record.getCreateTime(); - BigDecimal handlingRate = record.getHandlingRate(); - WithdrawUserRecordAdminDto admin = new WithdrawUserRecordAdminDto(); - BeanUtils.copyProperties(record, admin); - String blockStatusName = "正常"; - if (blockStatus != null) { - if (blockStatus.equals(BlockStatusEnum.BLOCKING.getValue())) { - blockStatusName = "封禁"; - } - } - admin.setBlockStatusName(blockStatusName); - if (createTime != null) { - admin.setCreateTimeStr(DateFormatUtils.format(createTime, DatePattern.NORM_DATETIME_PATTERN)); - } - admin.setHandlingRateStr(handlingRate + "%"); - datas.add(admin); - } - } - if (servletWebRequest.getResponse() != null) { - try { - //这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman - servletWebRequest.getResponse().setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); - servletWebRequest.getResponse().setCharacterEncoding("utf-8"); - //这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系 - String fileName = URLEncoder.encode("提现申请", "UTF-8").replaceAll("\\+", "%20"); - servletWebRequest.getResponse().setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); - EasyExcel.write(servletWebRequest.getResponse().getOutputStream(), WithdrawUserRecordAdminDto.class).sheet("提现申请").doWrite(datas); - } catch (Exception e) { - log.error(e.getMessage(), e); - } - } - } - - @Override - public BigDecimal totalAmount(Integer recordStatus, String erbanNo, Integer accountType, Date applyStartTime, Date applyEndTime) { - PageReq req = new PageReq(); - req.setPage(-1); - req.setPageSize(-1); - Page page = page(recordStatus, erbanNo, accountType, applyStartTime, applyEndTime, req); - List records = page.getRecords(); - BigDecimal total = BigDecimal.ZERO; - if (CollectionUtil.isNotEmpty(records)) { - for (WithdrawUserRecordAdminVo record : records) { - BigDecimal cashAmount = record.getCashAmount(); - if (cashAmount != null) { - total = total.add(cashAmount); - } - } - } - return total.setScale(3, RoundingMode.HALF_UP); - } - - @Override - public void batchGrant(String recordIdStr, Integer isSecretary, Integer adminId) { - if (StrUtil.isEmpty(recordIdStr)) { - return; - } - log.info("recordIdStr : {}", recordIdStr); - String[] recordIdArray = recordIdStr.split(StrUtil.COMMA); - for (String idStr : recordIdArray) { - grant(Long.valueOf(idStr), isSecretary, adminId); - } - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void reject(Long id, Integer isReturn, Integer isSecretary, Integer adminId) { - if (id == null) { - throw new ServiceException("缺少ID"); - } - log.info("reject id : {}, isReturn : {}, isSecretary : {}, adminId : {}", id, isReturn, isSecretary, adminId); - WithdrawUserRecord record = withdrawUserRecordService.getById(id); - if (record == null) { - return; - } - LocalDateTime now = LocalDateTime.now(); - withdrawUserRecordService.update(Wrappers.lambdaUpdate() - .set(WithdrawUserRecord::getOperatorId, adminId) - .set(WithdrawUserRecord::getUpdateTime, now) - .set(WithdrawUserRecord::getRecordStatus, RecordStatusEnum.REJECT.ordinal()) - .eq(WithdrawUserRecord::getId, id)); - if (isReturn != null && isReturn == Constant.Yes1No0.YES) { - Long uid = record.getUid(); - Integer goldNum = record.getGoldNum(); - log.info("[金币提现退回] {} 提现金币数 {} 开始", uid, goldNum); - //扣减钱包 - userPurseService.addGold(uid, goldNum.doubleValue(), BillObjTypeEnum.REJECT_WITHDRAW, - (userPurse)-> billRecordService.insertGeneralBillRecord(uid, record.getId().toString(), BillObjTypeEnum.REJECT_WITHDRAW, goldNum.doubleValue(), userPurse)); - log.info("[金币提现退回] {} 提现金币数 {} 成功", uid, goldNum); - } - if (isSecretary != null && isSecretary == Constant.Yes1No0.YES) { - String currentTime = DateTimeUtil.getCurrentTime(); - String message = "尊敬的用戶您好，您於【" + currentTime + "】發起的提領由於綁定的賬戶異常導致發放失敗，請修正為正確的賬戶，如有問題請聯繫官方客服wechat：sd245376或line：pekoyuyin"; - NeteaseSendMsgBatchParam param = new NeteaseSendMsgBatchParam(); - param.setType(0); - param.setContent(message); - sendSysMsgService.sendBatchPersonTextMsg(SystemConfig.secretaryUid, Collections.singletonList(record.getUid()), null, message, param); - } - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void batchReject(String recordIdStr, Integer isReturn, Integer isSecretary, Integer adminId) { - if (StrUtil.isEmpty(recordIdStr)) { - return; - } - log.info("recordIdStr : {}", recordIdStr); - String[] recordIdArray = recordIdStr.split(StrUtil.COMMA); - for (String idStr : recordIdArray) { - reject(Long.valueOf(idStr), isReturn, isSecretary, adminId); - } - } -} diff --git a/accompany-admin/accompany-admin-service/src/main/resources/mapper/ActCallBattleAdminMapper.xml b/accompany-admin/accompany-admin-service/src/main/resources/mapper/ActCallBattleAdminMapper.xml deleted file mode 100644 index 7c98c6dc0..000000000 --- a/accompany-admin/accompany-admin-service/src/main/resources/mapper/ActCallBattleAdminMapper.xml +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/accompany-admin/accompany-admin-service/src/main/resources/mapper/AdminDictMapper.xml b/accompany-admin/accompany-admin-service/src/main/resources/mapper/AdminDictMapper.xml deleted file mode 100644 index e8b31ba05..000000000 --- a/accompany-admin/accompany-admin-service/src/main/resources/mapper/AdminDictMapper.xml +++ /dev/null @@ -1,244 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - code, dictkey, dictval, status, showOrder, createTime, description - - - - - delete from admin_dict - where code = #{code,jdbcType=VARCHAR} - and dictkey = #{dictkey,jdbcType=VARCHAR} - - - delete from admin_dict - - - - - - insert into admin_dict (code, dictkey, dictval, - status, showOrder, createTime, - description) - values (#{code,jdbcType=VARCHAR}, #{dictkey,jdbcType=VARCHAR}, #{dictval,jdbcType=VARCHAR}, - #{status,jdbcType=BIT}, #{showorder,jdbcType=INTEGER}, #{createtime,jdbcType=TIMESTAMP}, - #{description,jdbcType=VARCHAR}) - - - insert into admin_dict - - - code, - - - dictkey, - - - dictval, - - - status, - - - showOrder, - - - createTime, - - - description, - - - - - #{code,jdbcType=VARCHAR}, - - - #{dictkey,jdbcType=VARCHAR}, - - - #{dictval,jdbcType=VARCHAR}, - - - #{status,jdbcType=BIT}, - - - #{showorder,jdbcType=INTEGER}, - - - #{createtime,jdbcType=TIMESTAMP}, - - - #{description,jdbcType=VARCHAR}, - - - - - - update admin_dict - - - code = #{record.code,jdbcType=VARCHAR}, - - - dictkey = #{record.dictkey,jdbcType=VARCHAR}, - - - dictval = #{record.dictval,jdbcType=VARCHAR}, - - - status = #{record.status,jdbcType=BIT}, - - - showOrder = #{record.showorder,jdbcType=INTEGER}, - - - createTime = #{record.createtime,jdbcType=TIMESTAMP}, - - - description = #{record.description,jdbcType=VARCHAR}, - - - - - - - - update admin_dict - set code = #{record.code,jdbcType=VARCHAR}, - dictkey = #{record.dictkey,jdbcType=VARCHAR}, - dictval = #{record.dictval,jdbcType=VARCHAR}, - status = #{record.status,jdbcType=BIT}, - showOrder = #{record.showorder,jdbcType=INTEGER}, - createTime = #{record.createtime,jdbcType=TIMESTAMP}, - description = #{record.description,jdbcType=VARCHAR} - - - - - - update admin_dict - - - dictval = #{dictval,jdbcType=VARCHAR}, - - - status = #{status,jdbcType=BIT}, - - - showOrder = #{showorder,jdbcType=INTEGER}, - - - createTime = #{createtime,jdbcType=TIMESTAMP}, - - - description = #{description,jdbcType=VARCHAR}, - - - where code = #{code,jdbcType=VARCHAR} - and dictkey = #{dictkey,jdbcType=VARCHAR} - - - update admin_dict - set dictval = #{dictval,jdbcType=VARCHAR}, - status = #{status,jdbcType=BIT}, - showOrder = #{showorder,jdbcType=INTEGER}, - createTime = #{createtime,jdbcType=TIMESTAMP}, - description = #{description,jdbcType=VARCHAR} - where code = #{code,jdbcType=VARCHAR} - and dictkey = #{dictkey,jdbcType=VARCHAR} - - \ No newline at end of file diff --git a/accompany-admin/accompany-admin-service/src/main/resources/mapper/FlowDataBatchSearchAdminMapper.xml b/accompany-admin/accompany-admin-service/src/main/resources/mapper/FlowDataBatchSearchAdminMapper.xml deleted file mode 100644 index 231263b5a..000000000 --- a/accompany-admin/accompany-admin-service/src/main/resources/mapper/FlowDataBatchSearchAdminMapper.xml +++ /dev/null @@ -1,288 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/accompany-admin/accompany-admin-service/src/main/resources/mapper/FlowDataBatchSearchMapper.xml b/accompany-admin/accompany-admin-service/src/main/resources/mapper/FlowDataBatchSearchMapper.xml deleted file mode 100644 index 8ae47a24a..000000000 --- a/accompany-admin/accompany-admin-service/src/main/resources/mapper/FlowDataBatchSearchMapper.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/accompany-admin/accompany-admin-service/src/main/resources/mapper/GamePartnerOrderAdminMapper.xml b/accompany-admin/accompany-admin-service/src/main/resources/mapper/GamePartnerOrderAdminMapper.xml deleted file mode 100644 index 7ff22b67d..000000000 --- a/accompany-admin/accompany-admin-service/src/main/resources/mapper/GamePartnerOrderAdminMapper.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/accompany-admin/accompany-admin-service/src/main/resources/mapper/LuckySeaActAdminMapper.xml b/accompany-admin/accompany-admin-service/src/main/resources/mapper/LuckySeaActAdminMapper.xml deleted file mode 100644 index 85aae11ea..000000000 --- a/accompany-admin/accompany-admin-service/src/main/resources/mapper/LuckySeaActAdminMapper.xml +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/accompany-admin/accompany-admin-service/src/main/resources/mapper/OfficialRecordAdminMapper.xml b/accompany-admin/accompany-admin-service/src/main/resources/mapper/OfficialRecordAdminMapper.xml deleted file mode 100644 index 150587865..000000000 --- a/accompany-admin/accompany-admin-service/src/main/resources/mapper/OfficialRecordAdminMapper.xml +++ /dev/null @@ -1,110 +0,0 @@ - - - - - \ No newline at end of file diff --git a/accompany-admin/accompany-admin-service/src/main/resources/mapper/OperationSmsRecordMapperExpand.xml b/accompany-admin/accompany-admin-service/src/main/resources/mapper/OperationSmsRecordMapperExpand.xml deleted file mode 100644 index a9aea48f4..000000000 --- a/accompany-admin/accompany-admin-service/src/main/resources/mapper/OperationSmsRecordMapperExpand.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - insert into operation_sms_record (uid, phone, template_id,send_status,create_time,operator) values - - ( - #{item.uid,jdbcType=BIGINT}, - #{item.phone,jdbcType=VARCHAR}, - #{item.templateId,jdbcType=INTEGER}, - #{item.sendStatus,jdbcType=INTEGER}, - #{item.createTime,jdbcType=TIMESTAMP}, - #{item.operator,jdbcType=INTEGER}) - - - - - - - - \ No newline at end of file diff --git a/accompany-admin/accompany-admin-service/src/main/resources/mapper/WithdrawBlockMapper.xml b/accompany-admin/accompany-admin-service/src/main/resources/mapper/WithdrawBlockMapper.xml deleted file mode 100644 index 370f7fabe..000000000 --- a/accompany-admin/accompany-admin-service/src/main/resources/mapper/WithdrawBlockMapper.xml +++ /dev/null @@ -1,206 +0,0 @@ - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - uid, status, remark, create_time, update_time - - - - - delete from withdraw_block - where uid = #{uid,jdbcType=BIGINT} - - - insert into withdraw_block (uid, status, remark, - create_time, update_time) - values (#{uid,jdbcType=BIGINT}, #{status,jdbcType=TINYINT}, #{remark,jdbcType=VARCHAR}, - #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}) - - - insert into withdraw_block - - - uid, - - - status, - - - remark, - - - create_time, - - - update_time, - - - - - #{uid,jdbcType=BIGINT}, - - - #{status,jdbcType=TINYINT}, - - - #{remark,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - - - - update withdraw_block - - - uid = #{record.uid,jdbcType=BIGINT}, - - - status = #{record.status,jdbcType=TINYINT}, - - - remark = #{record.remark,jdbcType=VARCHAR}, - - - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - - - update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - - - - - - - - update withdraw_block - set uid = #{record.uid,jdbcType=BIGINT}, - status = #{record.status,jdbcType=TINYINT}, - remark = #{record.remark,jdbcType=VARCHAR}, - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - update_time = #{record.updateTime,jdbcType=TIMESTAMP} - - - - - - update withdraw_block - - - status = #{status,jdbcType=TINYINT}, - - - remark = #{remark,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - where uid = #{uid,jdbcType=BIGINT} - - - update withdraw_block - set status = #{status,jdbcType=TINYINT}, - remark = #{remark,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP} - where uid = #{uid,jdbcType=BIGINT} - - \ No newline at end of file diff --git a/accompany-admin/accompany-admin-service/src/main/resources/mapper/WithdrawBlockMapperExpand.xml b/accompany-admin/accompany-admin-service/src/main/resources/mapper/WithdrawBlockMapperExpand.xml deleted file mode 100644 index f272a2426..000000000 --- a/accompany-admin/accompany-admin-service/src/main/resources/mapper/WithdrawBlockMapperExpand.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - - - - - insert into withdraw_block - - - uid, - - - status, - - - remark, - - - create_time, - - - update_time, - - - - - #{uid,jdbcType=BIGINT}, - - - #{status,jdbcType=TINYINT}, - - - #{remark,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - ON DUPLICATE KEY UPDATE - `status`=values(status), - `remark`=values(remark), - `update_time`=values(update_time) - - \ No newline at end of file diff --git a/accompany-admin/accompany-admin-service/src/main/resources/mapper/WithdrawUserLimitAdminMapper.xml b/accompany-admin/accompany-admin-service/src/main/resources/mapper/WithdrawUserLimitAdminMapper.xml deleted file mode 100644 index e152dd34d..000000000 --- a/accompany-admin/accompany-admin-service/src/main/resources/mapper/WithdrawUserLimitAdminMapper.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - \ No newline at end of file diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/ChannelDistributeAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/ChannelDistributeAdminController.java deleted file mode 100644 index 5984b0a6e..000000000 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/ChannelDistributeAdminController.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.accompany.admin.controller; - -import com.accompany.admin.dto.ChannelDistributeSearchDto; -import com.accompany.admin.model.AdminUser; -import com.accompany.admin.service.ChannelDistributeAdminService; -import com.accompany.admin.service.system.AdminUserService; -import com.accompany.business.model.ChannelDistribute; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.alibaba.fastjson.JSONObject; -import com.github.pagehelper.PageInfo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * ｛这里添加描述｝ - * - * @author fangchengyan - * @date 2020-02-20 2:20 下午 - */ -@RestController -@RequestMapping(value = "/admin/channel/distribute") -public class ChannelDistributeAdminController extends BaseController { - - @Autowired - private ChannelDistributeAdminService channelDistributeAdminService; - @Autowired - private AdminUserService adminUserService; - - @ResponseBody - @RequestMapping(value = "list", method = RequestMethod.GET) - public void list(ChannelDistributeSearchDto searchDto){ - PageInfo pageInfo = channelDistributeAdminService.queryForPages(searchDto, getPageNumber(), getPageSize()); - JSONObject jsonObject = new JSONObject(); - jsonObject.put("total", pageInfo.getTotal()); - jsonObject.put("rows", pageInfo.getList()); - writeJson(jsonObject.toJSONString()); - } - - @ResponseBody - @RequestMapping(value = "saveOrUpdate", method = RequestMethod.POST) - public BusiResult saveOrUpdate(ChannelDistribute channelDistribute) { - if(null == channelDistribute.getAppId() || null == channelDistribute.getChannel()) { - return new BusiResult(BusiStatus.PARAMERROR); - } - AdminUser adminUser = adminUserService.getAdminUserById(getAdminId()); - if (adminUser == null) { - return new BusiResult(BusiStatus.BUSIERROR, "管理员不存在", null); - } - channelDistribute.setOperator(adminUser.getUsername()); - - int result = channelDistributeAdminService.save(channelDistribute); - if(result > 0) { - return new BusiResult(BusiStatus.SUCCESS); - } else { - return new BusiResult(BusiStatus.BUSIERROR); - } - } - - @RequestMapping(value = "getById", method = RequestMethod.GET) - public BusiResult getById(Long id){ - try { - ChannelDistribute record = channelDistributeAdminService.getById(id); - return new BusiResult(BusiStatus.SUCCESS, record); - } catch (Exception e) { - logger.error(e.getMessage(), e); - return new BusiResult(BusiStatus.SERVERERROR); - } - } - - @RequestMapping(value = "delete", method = RequestMethod.POST) - public BusiResult delete(Long id) { - if(null == id) { - return new BusiResult(BusiStatus.PARAMERROR); - } - channelDistributeAdminService.deleteById(id); - return new BusiResult(BusiStatus.SUCCESS); - } - -} diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/ActCallBattleAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/ActCallBattleAdminController.java deleted file mode 100644 index 7f96717f7..000000000 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/ActCallBattleAdminController.java +++ /dev/null @@ -1,241 +0,0 @@ -/* - * 文 件 名: LuckySeaActAdminController - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/11 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.admin.controller.activity; - -import cn.hutool.core.util.StrUtil; -import com.accompany.admin.controller.BaseController; -import com.accompany.admin.params.ActCallBattleItemSaveReqParams; -import com.accompany.admin.service.activity.ActCallBattleAdminService; -import com.accompany.admin.util.ExcelUtils; -import com.accompany.admin.vo.callbattle.ActCallBattleAdminRoundDetailVo; -import com.accompany.admin.vo.callbattle.ActCallBattleAdminUserDrawRecord; -import com.accompany.business.model.callbattle.ActCallBattleInfo; -import com.accompany.business.model.callbattle.ActCallBattleItem; -import com.accompany.business.service.callbattle.ActCallBattleBizService; -import com.accompany.business.service.callbattle.ActCallBattleInfoService; -import com.accompany.business.service.callbattle.ActCallBattleStockService; -import com.accompany.common.constant.Constant; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.tencent.cos.TencentCosUploadService; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.common.utils.PinYin4JUtil; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.service.common.JedisService; -import com.accompany.core.vo.BaseResponseVO; -import com.alibaba.fastjson.JSONObject; -import org.apache.poi.ss.usermodel.Workbook; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -/** - *
类描述: 召唤战斗活动管理后台 - *
功能详细描述: - * - * @author H1 - * @date [2021/1/11] - */ -@RestController -@RequestMapping(value = "/admin/callBattle") -public class ActCallBattleAdminController extends BaseController { - - @Autowired - private ActCallBattleAdminService actCallBattleAdminService; - @Autowired - private TencentCosUploadService uploadService; - @Autowired - private JedisService jedisService; - @Autowired - private ActCallBattleBizService actCallBattleBizService; - @Autowired - private ActCallBattleInfoService actCallBattleInfoService; - @Autowired - private ActCallBattleStockService actCallBattleStockService; - - @RequestMapping(value = "/addOrUpdateItem", method = RequestMethod.POST) - public BaseResponseVO addOrUpdateActItem(ActCallBattleItem item) { - actCallBattleAdminService.addActItem(item); - return new BaseResponseVO(BusiStatus.SUCCESS); - } - - @RequestMapping(value = "/saveItems", method = RequestMethod.POST) - public BaseResponseVO addOrUpdateActItem(@RequestBody ActCallBattleItemSaveReqParams params) { - actCallBattleAdminService.saveActItems(params); - return new BaseResponseVO(BusiStatus.SUCCESS); - } - - @RequestMapping(value = "/listItem", method = RequestMethod.GET) - public void listItem(String name, Integer page, Integer pageSize) { - Map data = actCallBattleAdminService.listItem(name, page, pageSize); - writeJson(JSONObject.toJSONString(data)); - } - - @RequestMapping(value = "/upload", method = RequestMethod.POST) - @ResponseBody - public void upload(@RequestParam("file") MultipartFile uploadFile) { - String msg = null; - JSONObject jsonObject = new JSONObject(); - if (!uploadFile.isEmpty()) { - try { - String fileName = uploadFile.getOriginalFilename(); - if (StrUtil.isNotEmpty(fileName)) { - assert fileName != null; - if (PinYin4JUtil.isChinese(fileName)) { - String pinyinName = PinYin4JUtil.hanziToPinyin(fileName); - if (StrUtil.isNotEmpty(pinyinName)) { - fileName = pinyinName.replaceAll(StrUtil.SPACE, StrUtil.EMPTY); - } - } - } - String filepath = uploadService.uploadByStream(uploadFile.getInputStream(), fileName); - jsonObject.put("path", filepath); - } catch (Exception e) { - logger.error("upload fail, " + e.getMessage()); - msg = "上传失败，I/O流异常"; - } - } else { - msg = "上传失败，表单类型不正确！"; - } - jsonObject.put("msg", msg); - writeJson(jsonObject.toJSONString()); - } - - @RequestMapping(value = "/listPlatformStat", method = RequestMethod.GET) - public void listPlatformStat(String startTime, String endTime, Integer page, Integer pageSize) { - Map data = actCallBattleAdminService.listPlatformStat(startTime, endTime, page, pageSize); - writeJson(JSONObject.toJSONString(data)); - } - - @RequestMapping(value = "/listUserDrawRecordList", method = RequestMethod.GET) - public void listUserDrawRecordList(String startTime, String endTime, String erbanNoStr, Integer page, Integer pageSize) { - Map data = actCallBattleAdminService.listUserDrawRecordList(startTime, endTime, erbanNoStr, page, pageSize); - writeJson(JSONObject.toJSONString(data)); - } - - @RequestMapping(value = "/exportUserDrawRecordList", method = RequestMethod.GET) - public void exportUserDrawRecordList(HttpServletRequest request, HttpServletResponse response, String startTime, String endTime, String erbanNoStr) throws Exception { - Map data = actCallBattleAdminService.listUserDrawRecordList(startTime, endTime, erbanNoStr, 1, Integer.MAX_VALUE); - List recordList = (List) data.get("rows"); - try { - List headerList = new ArrayList<>(); - headerList.add("uid"); - headerList.add("66号"); - headerList.add("昵称"); - headerList.add("轮次"); - headerList.add("结束时间"); - headerList.add("投入"); - headerList.add("平台价值"); - String fileName = "用户数据记录.xls"; - List excelRows = buildExcelData(recordList); - Workbook workbook = ExcelUtils.createExcelSheet(headerList, excelRows); - ExcelUtils.setExcelResponseHeader(request, response, fileName); - java.io.OutputStream out = response.getOutputStream(); - workbook.write(out); - out.flush(); - } catch (Exception e) { - logger.error("Failed to export invite_code_stats. Cause by {}", e.getMessage()); - writeJson(false, "导出失败"); - } - } - - public List buildExcelData(List vos) { - List excelRows = new ArrayList<>(vos.size()); - for (ActCallBattleAdminUserDrawRecord vo : vos) { - List excelData = new ArrayList<>(); - excelData.add(vo.getUid()); - excelData.add(vo.getErbanNo()); - excelData.add(vo.getNick()); - excelData.add(vo.getRoundId()); - excelData.add(DateTimeUtil.convertDate(vo.getEndTime(), DateTimeUtil.DEFAULT_DATETIME_PATTERN)); - excelData.add(vo.getCostPieceNum()); - excelData.add(vo.getPrizePieceNum()); - excelRows.add(excelData); - } - return excelRows; - } - - @RequestMapping(value = "/listActRecord", method = RequestMethod.GET) - public void listActRecord(String startTime, String endTime, String roundId, Integer page, Integer pageSize) { - Map data = actCallBattleAdminService.listActRecord(startTime, endTime, roundId, page, pageSize); - writeJson(JSONObject.toJSONString(data)); - } - - - @RequestMapping(value = "/listRoundDrawDetail", method = RequestMethod.GET) - public void listRoundDrawDetail(String roundId, Integer page, Integer pageSize) { - Map data = actCallBattleAdminService.listRoundDrawDetail(roundId, page, pageSize); - writeJson(JSONObject.toJSONString(data)); - } - - - @RequestMapping(value = "/exportRoundDrawDetail", method = RequestMethod.GET) - public void exportRoundDrawDetail(HttpServletRequest request, HttpServletResponse response, String roundId) throws Exception { - Map data = actCallBattleAdminService.listRoundDrawDetail(roundId, 1, Integer.MAX_VALUE); - List recordList = (List) data.get("rows"); - try { - List headerList = new ArrayList<>(); - headerList.add("uid"); - headerList.add("66号"); - headerList.add("昵称"); - headerList.add("投入"); - headerList.add("平台价值"); - String fileName = new StringBuilder(roundId).append("轮游戏明细.xls").toString(); - List excelRows = buildRoundDrawDetailExcelData(recordList); - Workbook workbook = ExcelUtils.createExcelSheet(headerList, excelRows); - ExcelUtils.setExcelResponseHeader(request, response, fileName); - java.io.OutputStream out = response.getOutputStream(); - workbook.write(out); - out.flush(); - } catch (Exception e) { - logger.error("Failed to export invite_code_stats. Cause by {}", e.getMessage()); - writeJson(false, "导出失败"); - } - } - - public List buildRoundDrawDetailExcelData(List vos) { - List excelRows = new ArrayList<>(vos.size()); - for (ActCallBattleAdminRoundDetailVo vo : vos) { - List excelData = new ArrayList<>(); - excelData.add(vo.getUid()); - excelData.add(vo.getErbanNo()); - excelData.add(vo.getNick()); - excelData.add(vo.getCostPieceNum()); - excelData.add(vo.getPrizePieceNum()); - excelRows.add(excelData); - } - return excelRows; - } - - - @RequestMapping(value = "/getStock", method = RequestMethod.GET) - public BaseResponseVO getStock() { - BigDecimal stock = actCallBattleStockService.getStock(); - return new BaseResponseVO<>(BusiStatus.SUCCESS, stock.toString()); - } - - @RequestMapping(value = "/editStock", method = RequestMethod.GET) - public BaseResponseVO editStock(String stock) { - ActCallBattleInfo currRound = actCallBattleInfoService.getByCurrTime(); - if (null != currRound && Constant.LuckySeaActStatus.DRAWING.equals(currRound.getStatus())) { - throw new ServiceException("当前正在开奖，请等待开奖结束再修改库存"); - } - BigDecimal stockB = new BigDecimal(stock.trim()); - actCallBattleStockService.editStock(stockB); - return new BaseResponseVO<>(BusiStatus.SUCCESS); - } -} \ No newline at end of file diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/LuckySeaActAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/LuckySeaActAdminController.java deleted file mode 100644 index db1228442..000000000 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/LuckySeaActAdminController.java +++ /dev/null @@ -1,262 +0,0 @@ -package com.accompany.admin.controller.activity; - -import cn.hutool.core.util.StrUtil; -import com.accompany.admin.controller.BaseController; -import com.accompany.admin.params.LuckySeaItemSaveReqParams; -import com.accompany.admin.service.activity.LuckySeaActAdminService; -import com.accompany.admin.util.ExcelUtils; -import com.accompany.admin.vo.luckysea.LuckySeaActAdminRoundDetailVo; -import com.accompany.admin.vo.luckysea.LuckySeaActAdminUserDrawRecord; -import com.accompany.admin.vo.luckysea.LuckySeaActPlatformStatVo; -import com.accompany.admin.vo.luckysea.LuckySeaItemGroupAdminVo; -import com.accompany.business.model.activity.luckysea.LuckySeaActInfo; -import com.accompany.business.model.activity.luckysea.LuckySeaItem; -import com.accompany.business.service.activities.luckySea.LuckySeaActInfoService; -import com.accompany.business.service.activities.luckySea.LuckySeaStockService; -import com.accompany.common.constant.Constant; -import com.accompany.common.result.BusiResult; -import com.accompany.common.result.PageResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.tencent.cos.TencentCosUploadService; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.common.utils.PinYin4JUtil; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.vo.BaseResponseVO; -import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.support.ExcelTypeEnum; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.apache.poi.ss.usermodel.Workbook; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.math.BigDecimal; -import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -/** - *
类描述: 深海奇缘活动管理后台 - *
功能详细描述: - * - * @author H1 - * @date [2021/1/11] - */ -@RestController -@RequestMapping(value = "/admin/luckySea") -public class LuckySeaActAdminController extends BaseController { - - @Autowired - private LuckySeaActAdminService luckySeaActAdminService; - @Autowired - private TencentCosUploadService uploadService; - @Autowired - private LuckySeaActInfoService luckySeaActInfoService; - @Autowired - private LuckySeaStockService stockService; - - @RequestMapping(value = "/addOrUpdateItem", method = RequestMethod.POST) - public BaseResponseVO addOrUpdateActItem(LuckySeaItem item) { - luckySeaActAdminService.addLuckySeaActItem(item); - return new BaseResponseVO(BusiStatus.SUCCESS); - } - - @RequestMapping(value = "/saveLuckySeaActItems", method = RequestMethod.POST) - public BaseResponseVO addOrUpdateActItem(@RequestBody LuckySeaItemSaveReqParams params) { - luckySeaActAdminService.saveLuckySeaActItems(params); - return new BaseResponseVO(BusiStatus.SUCCESS); - } - - @RequestMapping(value = "/listItem", method = RequestMethod.GET) - public void listLuckySeaItem(String name, Integer page, Integer pageSize) { - Map data = luckySeaActAdminService.listLuckySeaItem(name, page, pageSize); - writeJson(JSONObject.toJSONString(data)); - } - - @RequestMapping(value = "/upload", method = RequestMethod.POST) - @ResponseBody - public void upload(@RequestParam("file") MultipartFile uploadFile) { - String msg = null; - JSONObject jsonObject = new JSONObject(); - if (!uploadFile.isEmpty()) { - try { - String fileName = uploadFile.getOriginalFilename(); - if (StrUtil.isNotEmpty(fileName)) { - assert fileName != null; - if (PinYin4JUtil.isChinese(fileName)) { - String pinyinName = PinYin4JUtil.hanziToPinyin(fileName); - if (StrUtil.isNotEmpty(pinyinName)) { - fileName = pinyinName.replaceAll(StrUtil.SPACE, StrUtil.EMPTY); - } - } - } - String filepath = uploadService.uploadByStream(uploadFile.getInputStream(), fileName); - jsonObject.put("path", filepath); - } catch (Exception e) { - logger.error("upload fail, " + e.getMessage()); - msg = "上传失败，I/O流异常"; - } - } else { - msg = "上传失败，表单类型不正确！"; - } - jsonObject.put("msg", msg); - writeJson(jsonObject.toJSONString()); - } - - @GetMapping("/listPlatformStat") - public PageResult listPlatformStat(String startTime, String endTime, Integer page, Integer pageSize) { - Page pageInfo = luckySeaActAdminService.pagePlatformStat(startTime, endTime, page, pageSize); - return new PageResult<>(pageInfo); - } - - @GetMapping( "/exportPlatformStat") - public void exportPlatformStat(HttpServletResponse response, String startTime, String endTime) throws IOException { - Page pageInfo = luckySeaActAdminService.pagePlatformStat(startTime, endTime, -1, -1); - response.setContentType("application/vnd.ms-excel"); - response.setCharacterEncoding("utf-8"); - // 这里URLEncoder.encode可以防止中文乱码 - String excelName = URLEncoder.encode("平台数据统计", "UTF-8"); - response.setHeader("Content-disposition", "attachment;filename=" + excelName + ExcelTypeEnum.XLSX.getValue()); - EasyExcel.write(response.getOutputStream(), LuckySeaActPlatformStatVo.class).sheet("平台数据统计").doWrite(pageInfo.getRecords()); - } - - @RequestMapping(value = "/listUserDrawRecordList", method = RequestMethod.GET) - public void listUserDrawRecordList(String startTime, String endTime, String erbanNoStr, Integer page, Integer pageSize) { - Map data = luckySeaActAdminService.listUserDrawRecordList(startTime, endTime, erbanNoStr, page, pageSize); - writeJson(JSONObject.toJSONString(data)); - } - - @RequestMapping(value = "/exportUserDrawRecordList", method = RequestMethod.GET) - public void exportUserDrawRecordList(HttpServletRequest request, HttpServletResponse response, String startTime, String endTime, String erbanNoStr) throws Exception { - Map data = luckySeaActAdminService.listUserDrawRecordList(startTime, endTime, erbanNoStr, 1, Integer.MAX_VALUE); - List recordList = (List) data.get("rows"); - try { - List headerList = new ArrayList<>(); - headerList.add("uid"); - headerList.add("66号"); - headerList.add("昵称"); - headerList.add("轮次"); - headerList.add("结束时间"); - headerList.add("投入"); - headerList.add("平台价值"); - String fileName = "用户数据记录.xls"; - List excelRows = buildExcelData(recordList); - Workbook workbook = ExcelUtils.createExcelSheet(headerList, excelRows); - ExcelUtils.setExcelResponseHeader(request, response, fileName); - java.io.OutputStream out = response.getOutputStream(); - workbook.write(out); - out.flush(); - } catch (Exception e) { - logger.error("Failed to export invite_code_stats. Cause by {}", e.getMessage()); - writeJson(false, "导出失败"); - } - } - - public List buildExcelData(List vos) { - List excelRows = new ArrayList<>(vos.size()); - for (LuckySeaActAdminUserDrawRecord vo : vos) { - List excelData = new ArrayList<>(); - excelData.add(vo.getUid()); - excelData.add(vo.getErbanNo()); - excelData.add(vo.getNick()); - excelData.add(vo.getRoundId()); - excelData.add(DateTimeUtil.convertDate(vo.getEndTime(), DateTimeUtil.DEFAULT_DATETIME_PATTERN)); - excelData.add(vo.getCostPieceNum()); - excelData.add(vo.getPrizePieceNum()); - excelRows.add(excelData); - } - return excelRows; - } - - @RequestMapping(value = "/listActRecord", method = RequestMethod.GET) - public void listActRecord(String startTime, String endTime, String roundId, Integer page, Integer pageSize) { - Map data = luckySeaActAdminService.listActRecord(startTime, endTime, roundId, page, pageSize); - writeJson(JSONObject.toJSONString(data)); - } - - - @RequestMapping(value = "/listRoundDrawDetail", method = RequestMethod.GET) - public void listRoundDrawDetail(String roundId, Integer page, Integer pageSize) { - Map data = luckySeaActAdminService.listRoundDrawDetail(roundId, page, pageSize); - writeJson(JSONObject.toJSONString(data)); - } - - - @RequestMapping(value = "/exportRoundDrawDetail", method = RequestMethod.GET) - public void exportRoundDrawDetail(HttpServletRequest request, HttpServletResponse response, String roundId) throws Exception { - Map data = luckySeaActAdminService.listRoundDrawDetail(roundId, 1, Integer.MAX_VALUE); - List recordList = (List) data.get("rows"); - try { - List headerList = new ArrayList<>(); - headerList.add("uid"); - headerList.add("66号"); - headerList.add("昵称"); - headerList.add("投入"); - headerList.add("平台价值"); - String fileName = new StringBuilder(roundId).append("轮游戏明细.xls").toString(); - List excelRows = buildRoundDrawDetailExcelData(recordList); - Workbook workbook = ExcelUtils.createExcelSheet(headerList, excelRows); - ExcelUtils.setExcelResponseHeader(request, response, fileName); - java.io.OutputStream out = response.getOutputStream(); - workbook.write(out); - out.flush(); - } catch (Exception e) { - logger.error("Failed to export invite_code_stats. Cause by {}", e.getMessage()); - writeJson(false, "导出失败"); - } - } - - public List buildRoundDrawDetailExcelData(List vos) { - List excelRows = new ArrayList<>(vos.size()); - for (LuckySeaActAdminRoundDetailVo vo : vos) { - List excelData = new ArrayList<>(); - excelData.add(vo.getUid()); - excelData.add(vo.getErbanNo()); - excelData.add(vo.getNick()); - excelData.add(vo.getCostPieceNum()); - excelData.add(vo.getPrizePieceNum()); - excelRows.add(excelData); - } - return excelRows; - } - - - @RequestMapping(value = "/getStock", method = RequestMethod.GET) - public BaseResponseVO getStock() { - BigDecimal stock = stockService.getStock(); - return new BaseResponseVO<>(BusiStatus.SUCCESS, stock.toString()); - } - - @RequestMapping(value = "/editStock", method = RequestMethod.GET) - public BaseResponseVO editStock(String stock) { - LuckySeaActInfo currRound = luckySeaActInfoService.getByCurrTime(); - if (null != currRound && Constant.LuckySeaActStatus.DRAWING.equals(currRound.getStatus())) { - throw new ServiceException("当前正在开奖，请等待开奖结束再修改库存"); - } - BigDecimal stockB = new BigDecimal(stock.trim()); - stockService.editStock(stockB); - return new BaseResponseVO<>(BusiStatus.SUCCESS); - } - - @GetMapping("/listItemGroup") - public List listLuckySeaItemGroup() { - return luckySeaActAdminService.listLuckySeaItemGroup(); - } - - @PostMapping("/saveItemGroup") - public BusiResult delItemGroup(Long id, String name, String itemIds, Byte status) { - luckySeaActAdminService.saveLuckySeaItemGroup(id, name, itemIds, status); - return new BusiResult<>(BusiStatus.SUCCESS); - } - - @PostMapping("/delItemGroup") - public BusiResult delItemGroup(Long id) { - luckySeaActAdminService.delLuckySeaItemGroup(id); - return new BusiResult<>(BusiStatus.SUCCESS); - } -} \ No newline at end of file diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/OperationActAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/OperationActAdminController.java deleted file mode 100644 index c0d064334..000000000 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/OperationActAdminController.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.accompany.admin.controller.activity; - -import com.accompany.admin.controller.BaseController; -import com.accompany.admin.service.activity.OperationActAdminService; -import com.accompany.business.model.OperationAct; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.alibaba.fastjson.JSONObject; -import com.github.pagehelper.PageInfo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; - -/** - * Created by yuanyi on 2018/10/5. - */ -@RestController -@RequestMapping("/admin/act/operational") -public class OperationActAdminController extends BaseController { - - @Autowired - private OperationActAdminService operationActAdminService; - - @RequestMapping("/list") - public void queryList(){ - PageInfo pageInfo = this.operationActAdminService.queryList(getPageNumber(),getPageSize()); - JSONObject jsonObject = new JSONObject(); - jsonObject.put("total",pageInfo.getTotal()); - - jsonObject.put("rows",pageInfo.getList()); - writeJson(jsonObject.toJSONString()); - } - - @RequestMapping(value = "/save",method = RequestMethod.POST) - public BusiResult saveOperationAct(OperationAct operationAct){ - BusiResult busiResult = new BusiResult(BusiStatus.SUCCESS); - try{ - this.operationActAdminService.saveOperationAct(operationAct); - return busiResult; - }catch (Exception e){ - logger.error("save operation act failed,opeartionAct={}",operationAct.toString(),e); - return new BusiResult(BusiStatus.BUSIERROR); - } - } - - @RequestMapping(value = "/del",method = RequestMethod.POST) - public BusiResult delOperationAct(Integer id){ - BusiResult busiResult = new BusiResult(BusiStatus.SUCCESS); - try{ - this.operationActAdminService.delOperationAct(id); - return busiResult; - }catch (Exception e){ - logger.error("del operation act failed,id={}",id.toString(),e); - return new BusiResult(BusiStatus.BUSIERROR); - } - } -} diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/StaticActivityPageController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/StaticActivityPageController.java deleted file mode 100644 index 9f03bed63..000000000 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/StaticActivityPageController.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.accompany.admin.controller.activity; - -import com.accompany.admin.controller.BaseController; -import com.accompany.admin.service.activity.StaticActivityPageService; -import com.accompany.business.model.activity.PageActivity; -import com.accompany.business.vo.activities.PageActivityVO; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -/** - * 静态活动配置 - * - * @author linuxea - * @date 2019/10/9 - */ -@RestController -@RequestMapping("/admin/act/static") -public class StaticActivityPageController extends BaseController { - - @Autowired - private StaticActivityPageService staticActivityPageService; - - - /** - * 分页列表 - * - * @param pageNumber 页码 - * @param pageSize 页长 - */ - @GetMapping("/list") - public void queryList(@RequestParam("pageNumber") Integer pageNumber, @RequestParam("pageSize") Integer pageSize) { - IPage pageInfo = this.staticActivityPageService.queryList(pageNumber, pageSize); - JSONObject jsonObject = new JSONObject(); - jsonObject.put("total", pageInfo.getTotal()); - jsonObject.put("rows", pageInfo.getRecords()); - writeJson(jsonObject.toJSONString()); - } - - /** - * 创建 - * @param pageActivity - * @return - */ - @PostMapping(value = "/save") - public BusiResult saveOperationAct(PageActivityVO pageActivity) { - Boolean exist = staticActivityPageService.existByCode(pageActivity.getCode()); - if (exist) { - return new BusiResult(BusiStatus.CODE_DUPLICATE); - } - staticActivityPageService.save(pageActivity); - return new BusiResult<>(BusiStatus.SUCCESS); - } - - /** - * 删除 - * - * @param id 静态活动 id - * @return 结果 - */ - @PostMapping(value = "/delete") - public BusiResult delOperationAct(Integer id) { - staticActivityPageService.deleteByActivityId(id); - return new BusiResult(BusiStatus.SUCCESS); - } -} diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/api/MyApiController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/api/MyApiController.java index 412838341..2c8420125 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/api/MyApiController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/api/MyApiController.java @@ -211,15 +211,6 @@ public class MyApiController { return BusiResult.success(); } - @GetMapping("/calUserYearReport") - public BusiResult calUserYearReport(Long roomId) { - if (null == roomId || !roomId.equals(603L)) { - throw new AdminServiceException(BusiStatus.PARAMERROR); - } - myApiService.calUserYearReport(); - return BusiResult.success(); - } - @GetMapping("/diamondStatAr") public BusiResult diamondStatAr(Long roomId, String date) { if (null == roomId || !roomId.equals(603L)) { diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/batch/FlowDataBatchSearchAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/batch/FlowDataBatchSearchAdminController.java deleted file mode 100644 index e87a9293a..000000000 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/batch/FlowDataBatchSearchAdminController.java +++ /dev/null @@ -1,130 +0,0 @@ -package com.accompany.admin.controller.batch; - -import com.accompany.admin.model.batch.FlowDataBatchSearch; -import com.accompany.admin.service.batch.FlowDataBatchSearchAdminService; -import com.accompany.admin.vo.batch.FlowDataBatchSearchAdminVo; -import com.accompany.admin.vo.batch.FlowDataBatchSearchGrowAdminVo; -import com.accompany.common.model.PageReq; -import com.accompany.common.result.BusiResult; -import com.accompany.common.result.PageResult; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.context.request.ServletWebRequest; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.List; - -/** - * @author: liaozetao - * @date: 2023/9/22 15:34 - * @description: - */ -@Api(tags = "引流排期管理") -@RestController -@RequestMapping("/admin/flowDataBatchSearch") -public class FlowDataBatchSearchAdminController { - - @Autowired - private FlowDataBatchSearchAdminService flowDataBatchSearchAdminService; - - /** - * 分页 - * - * @param searchKey - * @param batchId - * @param req - * @return - */ - @ApiOperation("分页") - @GetMapping("page") - public PageResult page(String searchKey, Long batchId, PageReq req) { - return new PageResult<>(flowDataBatchSearchAdminService.page(searchKey, batchId, req.getPage(), req.getPageSize())); - } - - /** - * 列表 - * - * @return - */ - @ApiOperation("列表") - @GetMapping("list") - public BusiResult> list() { - return BusiResult.success(flowDataBatchSearchAdminService.list()); - } - - /** - * 删除 - * - * @param batchId - * @return - */ - @ApiOperation("删除") - @GetMapping("del") - public BusiResult del(Long batchId) { - flowDataBatchSearchAdminService.del(batchId); - return BusiResult.success(); - } - - /** - * 保存 - * - * @param param - * @return - */ - @ApiOperation("保存") - @PostMapping("save") - public BusiResult save(FlowDataBatchSearch param) { - flowDataBatchSearchAdminService.save(param); - return BusiResult.success(); - } - - /** - * 付费成长 - * - * @param batchId - * @return - */ - @ApiOperation("付费成长") - @GetMapping("growList") - public PageResult growList(Long batchId) { - Page page = new Page<>(1, 50); - List admins = flowDataBatchSearchAdminService.growList(batchId); - page.setTotal(admins.size()); - page.setRecords(admins); - return new PageResult<>(page); - } - - /** - * 付费成长导出 - * - * @param batchId - * @param request - * @param response - */ - @ApiOperation("付费成长导出") - @GetMapping("growExport") - public void growExport(Long batchId, HttpServletRequest request, HttpServletResponse response) { - flowDataBatchSearchAdminService.growExport(batchId, new ServletWebRequest(request, response)); - } - - /** - * 导出用户明细 - * - * @param batchId - * @param request - * @param response - */ - @ApiOperation("导出用户明细") - @GetMapping("detailExport") - public void detailExport(Long batchId, HttpServletRequest request, HttpServletResponse response) { - flowDataBatchSearchAdminService.detailExport(batchId, new ServletWebRequest(request, response)); - } - -} diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/charge/MyCardAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/charge/MyCardAdminController.java deleted file mode 100644 index aacdab3b9..000000000 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/charge/MyCardAdminController.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.accompany.admin.controller.charge; - -import com.accompany.common.result.BusiResult; -import com.accompany.payment.model.ChargeRecord; -import com.accompany.payment.mycard.MyCardService; -import com.accompany.payment.mycard.config.MyCardConfig; -import com.accompany.payment.mycard.resp.PayItemQueryResp; -import com.accompany.payment.mycard.resp.TradeQueryResp; -import com.accompany.payment.service.ChargeRecordService; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * @author: liaozetao - * @date: 2023/12/27 12:03 - * @description: - */ -@Slf4j -@RestController -@RequestMapping("/admin/MyCard") -public class MyCardAdminController { - - @Autowired - private MyCardConfig myCardConfig; - - @Autowired - private MyCardService myCardService; - - @Autowired - private ChargeRecordService chargeRecordService; - - /** - * 付费方式 - * - * @return - */ - @ApiOperation("付费方式") - @GetMapping("/payItemQuery") - public BusiResult payItemQuery() { - return BusiResult.success(myCardService.payItemQuery(myCardConfig.getFacServiceId())); - } - - /** - * 订单查询 - * - * @param chargeRecordId - * @return - */ - @ApiOperation("订单查询") - @GetMapping("tradeQuery") - public BusiResult tradeQuery(String chargeRecordId) { - ChargeRecord chargeRecord = chargeRecordService.getChargeRecordById(chargeRecordId); - if (chargeRecord == null) { - return BusiResult.fail("订单不存在"); - } - return BusiResult.success(myCardService.tradeQuery(chargeRecord.getExtra())); - } - -} diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/gamepartner/GamePartnerInfoAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/gamepartner/GamePartnerInfoAdminController.java deleted file mode 100644 index a9c800660..000000000 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/gamepartner/GamePartnerInfoAdminController.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.accompany.admin.controller.gamepartner; - -import com.accompany.business.model.gamepartner.GamePartnerInfo; -import com.accompany.business.service.gamepartner.GamePartnerInfoService; -import com.accompany.common.result.BusiResult; -import com.accompany.common.result.PageResult; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@Api(tags = "游戏陪玩") -@RestController -@RequestMapping("/admin/gamePartner/info") -public class GamePartnerInfoAdminController { - - @Autowired - private GamePartnerInfoService service; - - @ApiOperation("获取所有游戏信息") - @GetMapping("/listAll") - public BusiResult> listGamePartnerInfo(){ - return new BusiResult<>(service.listAllGamePartnerInfo()); - } - - @ApiOperation("分页游戏信息") - @ApiImplicitParams({ - @ApiImplicitParam(name = "gameName", value = "游戏名"), - @ApiImplicitParam(name = "page", value = "页码", required = true), - @ApiImplicitParam(name = "pageSize", value = "页长", required = true), - }) - @GetMapping("/page") - public BusiResult> pageGamePartnerInfo(String gameName, - int page, int pageSize){ - Page pageInfo = service.pageGamePartnerInfo(gameName, page, pageSize); - return new BusiResult<>(new PageResult<>(pageInfo)); - } - - @ApiOperation("编辑游戏信息") - @PostMapping("/save") - public BusiResult save(@RequestBody GamePartnerInfo game){ - service.saveGame(game); - return BusiResult.success(); - } - - @ApiOperation("删除游戏信息") - @ApiImplicitParams({ - @ApiImplicitParam(name = "gameId", value = "游戏Id", required = true) - }) - @GetMapping("/delGame") - public BusiResult delGame(int gameId){ - service.delGame(gameId); - return BusiResult.success(); - } - -} diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/gamepartner/GamePartnerOrderAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/gamepartner/GamePartnerOrderAdminController.java deleted file mode 100644 index b05cdbb64..000000000 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/gamepartner/GamePartnerOrderAdminController.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.accompany.admin.controller.gamepartner; - -import com.accompany.admin.service.gamepartner.GamePartnerOrderAdminService; -import com.accompany.admin.vo.gamepartner.GamePartnerOrderDayAdminVo; -import com.accompany.admin.vo.gamepartner.GamePartnerOrderDayDetailAdminVo; -import com.accompany.business.vo.gamepartner.GamePartnerOrderVo; -import com.accompany.common.model.PageReq; -import com.accompany.common.result.PageResult; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.context.request.ServletWebRequest; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -/** - * @author: liaozetao - * @date: 2023/8/22 11:17 - * @description: - */ -@Api(tags = "游戏开黑点单管理") -@RestController -@RequestMapping("/admin/gamePartner/order") -public class GamePartnerOrderAdminController { - - @Autowired - private GamePartnerOrderAdminService gamePartnerOrderAdminService; - - /** - * 订单记录查询 - * - * @param fromErBanNo - * @param toErBanNo - * @param gameId - * @param orderNo - * @param startTime - * @param endTime - * @param req - * @return - */ - @ApiOperation("订单记录查询") - @GetMapping("orderPage") - public PageResult orderPage(String fromErBanNo, String toErBanNo, Integer gameId, String orderNo, String startTime, String endTime, PageReq req) { - return new PageResult<>(gamePartnerOrderAdminService.orderPage(fromErBanNo, toErBanNo, gameId, orderNo, startTime, endTime, req)); - } - - /** - * 订单统计 - * - * @param startTime - * @param endTime - * @param req - * @return - */ - @ApiOperation("订单统计") - @GetMapping("dayPage") - public PageResult dayPage(String startTime, String endTime, PageReq req) { - return new PageResult<>(gamePartnerOrderAdminService.dayPage(startTime, endTime, req)); - } - - /** - * 订单详情 - * - * @param orderDate - * @param req - * @return - */ - @ApiOperation("订单详情") - @GetMapping("dayDetailPage") - public PageResult dayDetailPage(String orderDate, PageReq req) { - return new PageResult<>(gamePartnerOrderAdminService.dayDetailPage(orderDate, req)); - } - - /** - * 订单记录导出 - * - * @param fromErBanNo - * @param toErBanNo - * @param gameId - * @param orderNo - * @param startTime - * @param endTime - * @param request - * @param response - */ - @ApiOperation("订单记录导出") - @GetMapping("orderExport") - public void orderExport(String fromErBanNo, String toErBanNo, Integer gameId, String orderNo, String startTime, String endTime, HttpServletRequest request, HttpServletResponse response) { - gamePartnerOrderAdminService.orderExport(fromErBanNo, toErBanNo, gameId, orderNo, startTime, endTime, new ServletWebRequest(request, response)); - } - - /** - * 订单统计导出 - * - * @param startTime - * @param endTime - * @param request - * @param response - */ - @ApiOperation("订单统计导出") - @GetMapping("dayExport") - public void dayExport(String startTime, String endTime, HttpServletRequest request, HttpServletResponse response) { - gamePartnerOrderAdminService.dayExport(startTime, endTime, new ServletWebRequest(request, response)); - } - - /** - * 订单详情导出 - * - * @param orderDate - * @param request - * @param response - */ - @ApiOperation("订单详情导出") - @GetMapping("dayDetailExport") - public void dayDetailExport(String orderDate, HttpServletRequest request, HttpServletResponse response) { - gamePartnerOrderAdminService.dayDetailExport(orderDate, new ServletWebRequest(request, response)); - } - -} diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/gamepartner/UserGamePartnerInfoAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/gamepartner/UserGamePartnerInfoAdminController.java deleted file mode 100644 index 68e367a36..000000000 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/gamepartner/UserGamePartnerInfoAdminController.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.accompany.admin.controller.gamepartner; - -import com.accompany.admin.controller.BaseController; -import com.accompany.admin.service.gamepartner.UserGamePartnerInfoAdminService; -import com.accompany.admin.vo.gamepartner.UserGamePartnerInfoAdminVo; -import com.accompany.common.result.BusiResult; -import com.accompany.common.result.PageResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.ServiceException; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.*; - -@RestController -@RequestMapping("/admin/gamePartner/user") -public class UserGamePartnerInfoAdminController extends BaseController { - - @Autowired - private UserGamePartnerInfoAdminService service; - - @GetMapping("/page") - public PageResult pageGamePartnerInfo(Integer pageNum, Integer pageSize, - Long erbanNo, Integer gameId, - String startTime, String endTime){ - Page page = service.pageUserGamePartnerInfo(pageNum, pageSize, erbanNo, gameId, startTime, endTime); - return new PageResult<>(page); - } - - @PostMapping("/save") - public BusiResult saveGamePartnerInfo(@RequestBody UserGamePartnerInfoAdminVo vo){ - Integer adminId = getAdminId(); - service.save(vo, adminId); - return new BusiResult<>(BusiStatus.SUCCESS); - } - - @PostMapping("/changeStatus") - public BusiResult changeStatus(String uidStr, Byte status){ - if (!StringUtils.hasText(uidStr) || null == status){ - throw new ServiceException(BusiStatus.PARAMERROR); - } - Integer adminId = getAdminId(); - service.changeStatus(uidStr, status, adminId); - return new BusiResult<>(BusiStatus.SUCCESS); - } - -} diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/gift/NewUserGiftAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/gift/NewUserGiftAdminController.java deleted file mode 100644 index 45865611b..000000000 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/gift/NewUserGiftAdminController.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.accompany.admin.controller.gift; - -import com.accompany.admin.base.Pagination; -import com.accompany.business.model.newuser.NewUserInRoomGift; -import com.accompany.business.service.newuser.NewUserInRoomGiftService; -import com.accompany.common.model.PageReq; -import com.accompany.common.result.BusiResult; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -/** - * @author guojicong - * @description - * @date 2022-07-22 - */ -@RestController -@RequestMapping("admin/newuser/gift") -public class NewUserGiftAdminController { - - @Autowired - private NewUserInRoomGiftService newUserInRoomGiftService; - - @GetMapping("page") - public BusiResult page(PageReq pageReq) { - return new BusiResult<>(new Pagination(newUserInRoomGiftService.getPage(pageReq))); - } - - @GetMapping("get") - public BusiResult getOne(Long id) { - return new BusiResult<>(newUserInRoomGiftService.getVoById(id)); - } - - @PostMapping("save") - public BusiResult save(@RequestBody NewUserInRoomGift newUserInRoomGift) { - return new BusiResult(newUserInRoomGiftService.addOrUpdate(newUserInRoomGift)); - } - - @DeleteMapping("delete") - public BusiResult delete(Long id) { - return new BusiResult(newUserInRoomGiftService.removeById(id)); - } -} diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/newUserStart/NewUserSayHelloChannelAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/newUserStart/NewUserSayHelloChannelAdminController.java deleted file mode 100644 index 64028b6ed..000000000 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/newUserStart/NewUserSayHelloChannelAdminController.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.accompany.admin.controller.newUserStart; - -import com.accompany.admin.base.Pagination; -import com.accompany.admin.controller.BaseController; -import com.accompany.business.model.newUserStart.NewUserSayHelloChannel; -import com.accompany.business.service.newUserStart.NewUserSayHelloChannelService; -import com.accompany.common.result.BusiResult; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -/** - * @author guojicong - * @date 2022/5/31 - */ -@RestController -@RequestMapping("/admin/newUserStar/sayHello") -public class NewUserSayHelloChannelAdminController extends BaseController { - @Autowired - private NewUserSayHelloChannelService channelService; - - @GetMapping("/list") - public Pagination list() { - return new Pagination(channelService.pageList(getPageSize(), getPageNumber())); - } - - @PostMapping("/add") - public BusiResult add(NewUserSayHelloChannel channel) { - channel.setId(null); - // 转为 集合 格式字符串 - String erbanNos = channel.getErbanNos(); - - erbanNos = erbanNos.indexOf("[") != 0 ? "[" + erbanNos : erbanNos; - erbanNos = erbanNos.indexOf("]") != erbanNos.length() - 1 ? erbanNos + "]" : erbanNos; - channel.setErbanNos(erbanNos); - return new BusiResult<>(channelService.add(channel)); - } - - @GetMapping("/get") - public BusiResult getById(Integer id) { - return new BusiResult<>(channelService.getById(id)); - } - - @PutMapping("/update") - public BusiResult update(NewUserSayHelloChannel channel) { - // 转为 集合 格式字符串 - String erbanNos = channel.getErbanNos(); - erbanNos = erbanNos.indexOf("[") != 0 ? "[" + erbanNos : erbanNos; - erbanNos = erbanNos.indexOf("]") != erbanNos.length() - 1 ? erbanNos + "]" : erbanNos; - channel.setErbanNos(erbanNos); - return new BusiResult<>(channelService.update(channel)); - } - - @DeleteMapping("/delete") - public BusiResult delete(Integer id) { - return new BusiResult<>(channelService.delete(id)); - } -} \ No newline at end of file diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/official/OfficialBrowseRecordAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/official/OfficialBrowseRecordAdminController.java deleted file mode 100644 index 49b541b26..000000000 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/official/OfficialBrowseRecordAdminController.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.accompany.admin.controller.official; - -import com.accompany.admin.service.official.OfficialBrowseRecordAdminService; -import com.accompany.admin.vo.official.OfficialBrowseCountVo; -import com.accompany.common.result.BusiResult; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - * @author: liaozetao - * @date: 2024/1/17 10:40 - * @description: - */ -@RestController -@RequestMapping("/admin/official/browse/record") -public class OfficialBrowseRecordAdminController { - - @Autowired - private OfficialBrowseRecordAdminService officialBrowseRecordAdminService; - - /** - * 官网访问数据-最近30天 - * - * @return - */ - @ApiOperation("官网访问数据-最近30天") - @GetMapping("browseFor30Days") - public BusiResult> browseFor30Days() { - return BusiResult.success(officialBrowseRecordAdminService.browseFor30Days()); - } - -} diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/official/OfficialConfigAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/official/OfficialConfigAdminController.java deleted file mode 100644 index 173d3c63c..000000000 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/official/OfficialConfigAdminController.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.accompany.admin.controller.official; - -import com.accompany.admin.service.official.OfficialConfigAdminService; -import com.accompany.business.model.official.OfficialConfig; -import com.accompany.common.result.BusiResult; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - * @author: liaozetao - * @date: 2024/1/17 10:22 - * @description: - */ -@RestController -@RequestMapping("/admin/official/config") -public class OfficialConfigAdminController { - - @Autowired - private OfficialConfigAdminService officialConfigAdminService; - - /** - * 列表 - * - * @return - */ - @ApiOperation("列表") - @GetMapping("/list") - public BusiResult> list() { - return BusiResult.success(officialConfigAdminService.list()); - } - - /** - * 保存 - * - * @param config - * @return - */ - @ApiOperation("保存") - @PostMapping("/save") - public BusiResult save(OfficialConfig config) { - officialConfigAdminService.save(config); - return BusiResult.success(); - } -} diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/sms/OperationSmsAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/sms/OperationSmsAdminController.java deleted file mode 100644 index 1c5d86471..000000000 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/sms/OperationSmsAdminController.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.accompany.admin.controller.sms; - -import com.accompany.admin.controller.BaseController; -import com.accompany.admin.service.sms.OperationSmsAdminService; -import com.accompany.admin.vo.OperationSmsRecordVo; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.alibaba.fastjson.JSONObject; -import com.github.pagehelper.PageInfo; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.ss.usermodel.Workbook; -import org.apache.poi.ss.usermodel.WorkbookFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.multipart.MultipartFile; - -import javax.servlet.http.HttpServletRequest; -import java.io.InputStream; -import java.util.List; - -@RestController -@RequestMapping("/admin/sms") -public class OperationSmsAdminController extends BaseController { - - @Autowired - private OperationSmsAdminService operationSmsAdminService; - - - /** - * 上传Excel并插入到数据库 - * @param templateId - * @param uploadFile - * @return - * @throws Exception - */ - @RequestMapping(value = "/uploadExcel",method = RequestMethod.POST) - public BusiResult uploadFile(Integer templateId,MultipartFile uploadFile) throws Exception{ - - Integer adminId = getAdminId(); - String fileName = uploadFile.getOriginalFilename(); - - if(!fileName.contains(".xls")&&fileName.contains(".xlsx")){ - return new BusiResult(BusiStatus.FILE_FORMAT_ERROR); - } - InputStream fileInputStream = uploadFile.getInputStream(); - Workbook workbook = WorkbookFactory.create(fileInputStream); - //获取第一个sheet页 - Sheet sheet = workbook.getSheetAt(0); - return operationSmsAdminService.insertFileDate(templateId,sheet,adminId); - } - - /** - * 通过查询条件批量发送短信 - * @param erbanNo - * @param templateId - * @param sendStatus - * @param createTime - * @param updateTime - * @return - * @throws Exception - */ - @RequestMapping(value = "/query/send",method = RequestMethod.POST) - public BusiResult batchSendByQuery(Long erbanNo,Integer templateId,Integer sendStatus,String createTime, - String updateTime) throws Exception{ - operationSmsAdminService.batchSendByQuery(erbanNo,templateId,sendStatus,createTime,updateTime); - return new BusiResult(BusiStatus.SUCCESS); - } - - /** - * 根据选中的数据批量发送短信 - * @param request - * @return - * @throws Exception - */ - @RequestMapping(value = "/page/send",method = RequestMethod.POST) - public BusiResult batchSendByPage(HttpServletRequest request) throws Exception{ - List ids = getRequestArray(request, "ids", Long.class); - operationSmsAdminService.batchSendByPage(ids); - return new BusiResult(BusiStatus.SUCCESS); - } - - /** - * 单条记录发送短信 - * @param recordId - * @return - * @throws Exception - */ - @RequestMapping(value = "/send",method = RequestMethod.POST) - public BusiResult sendForOne(Long recordId) throws Exception{ - operationSmsAdminService.sendForOne(recordId); - return new BusiResult(BusiStatus.SUCCESS); - } - - /**单条记录删除**/ - @RequestMapping(value = "/del",method = RequestMethod.POST) - public BusiResult delForOne(Long recordId) throws Exception{ - operationSmsAdminService.delForOne(recordId); - return new BusiResult(BusiStatus.SUCCESS); - } -} diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/sms/SmsRecordAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/sms/SmsRecordAdminController.java index a2f322ff5..86904bc22 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/sms/SmsRecordAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/sms/SmsRecordAdminController.java @@ -1,39 +1,9 @@ package com.accompany.admin.controller.sms; import com.accompany.admin.controller.BaseController; -import com.accompany.admin.service.sms.OperationSmsAdminService; import com.accompany.admin.service.sms.SmsRecordAdminService; -import com.accompany.admin.vo.OperationSmsRecordVo; import com.accompany.common.model.PageReq; import com.accompany.common.result.BusiResult; import com.accompany.common.result.PageResult; import com.accompany.common.status.BusiStatus; -import com.accompany.sms.model.SmsRecord; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.github.pagehelper.PageInfo; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.ss.usermodel.Workbook; -import org.apache.poi.ss.usermodel.WorkbookFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import javax.servlet.http.HttpServletRequest; -import java.io.InputStream; -import java.util.List; - -@RestController -@RequestMapping("/admin/smsRecord") -public class SmsRecordAdminController extends BaseController { - - @Autowired - private SmsRecordAdminService smsRecordAdminService; - - @GetMapping("/page") - public BusiResult> page(PageReq pageReq, String phone) { - Page pageInfo = smsRecordAdminService.page(pageReq, phone); - return BusiResult.success(new PageResult<>(pageInfo)); - } - -} +import com.accompany.sms.model.SmsRecord; \ No newline at end of file diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/AdminDictController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/AdminDictController.java deleted file mode 100644 index 672112a06..000000000 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/AdminDictController.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.accompany.admin.controller.system; - -import com.accompany.admin.common.ErrorCode; -import com.accompany.admin.controller.BaseController; -import com.accompany.admin.model.AdminDict; -import com.accompany.admin.service.system.AdminDictService; -import com.accompany.common.utils.BlankUtil; -import com.alibaba.fastjson.JSONObject; -import com.github.pagehelper.PageInfo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; - - -@Controller -@RequestMapping("/admin/dict") -public class AdminDictController extends BaseController{ - @Autowired - private AdminDictService adminDictService; - - /** - * 查询字典列表 - * @param searchText 字典名称 - */ - @RequestMapping("/getlist") - @ResponseBody - public void getDictList(String searchText){ - JSONObject jsonObject = new JSONObject(); - PageInfo pageInfo = adminDictService.getDictByPage(searchText, getPageNumber(), getPageSize()); - jsonObject.put("total",pageInfo.getTotal()); - jsonObject.put("rows",pageInfo.getList()); - writeJson(jsonObject.toJSONString()); - } - - @RequestMapping("/getone") - @ResponseBody - public void getOneDict(String code,String dictkey){ - JSONObject jsonObject = new JSONObject(); - if(!BlankUtil.isBlank(code) && !BlankUtil.isBlank(dictkey)){ - try { - AdminDict adminDict = adminDictService.getOneAdminDict(code, dictkey); - if (adminDict != null) { - jsonObject.put("entity", adminDict); - } - }catch (Exception e){ - logger.warn("getAdminDict fail,cause by "+e.getMessage(),e); - } - } - writeJson(jsonObject.toJSONString()); - } - - @RequestMapping("/save") - @ResponseBody - public void saveDict(AdminDict adminDict, boolean isEdit){ - int result = -1; - if(adminDict!=null){ - try { - result = adminDictService.saveDict(adminDict, isEdit); - }catch (Exception e){ - logger.warn("saveDict fail,cause by "+e.getMessage(),e); - } - }else{ - result = ErrorCode.ERROR_NULL_ARGU; - } - writeJsonResult(result); - } - - @RequestMapping("/del") - @ResponseBody - public void delDict(String code,String dictkey){ - int result = 1; - if(!BlankUtil.isBlank(code) && !BlankUtil.isBlank(dictkey)){ - try { - adminDictService.delAdminDict(code, dictkey); - }catch (Exception e){ - result = ErrorCode.SERVER_ERROR; - logger.warn("delDict fail,cause by "+e.getMessage(),e); - } - }else{ - result = ErrorCode.ERROR_NULL_ARGU; - } - writeJsonResult(result); - } -} diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/AdminPictureController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/AdminPictureController.java deleted file mode 100644 index ee455f783..000000000 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/AdminPictureController.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.accompany.admin.controller.system; - -import com.accompany.admin.controller.BaseController; -import com.accompany.admin.service.system.AdminPictureService; -import com.accompany.business.model.AdminPicture; -import com.accompany.business.mybatismapper.AdminPictureMapper; -import com.accompany.common.tencent.cos.TencentCosUploadService; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.github.pagehelper.PageInfo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import java.util.Date; -import java.util.List; - -/** - * Created by liuyang on 2019/2/21. - */ -@RestController -@RequestMapping(value = "/admin/picture") -public class AdminPictureController extends BaseController { - - @Autowired - private AdminPictureMapper pictureMapper; - @Autowired - private AdminPictureService pictureService; - @Autowired - private TencentCosUploadService uploadService; - - @RequestMapping(value = "/save", method = RequestMethod.POST) - public void saveAdminPicture(AdminPicture adminPicture) { - logger.info("saveAdminPicture info request:" + JSONObject.toJSONString(adminPicture)); - try { - Date date = new Date(); - adminPicture.setUpdateTime(date); - if(adminPicture.getPicId() == null){ - adminPicture.setCreateTime(date); - pictureMapper.insertSelective(adminPicture); - }else { - pictureMapper.updateByPrimaryKeySelective(adminPicture); - } - writeJson(true, "保存成功"); - } catch (Exception e) { - logger.error("addAdminPicture error:{}", e); - } - writeJson(false, "保存失败"); - } - - @RequestMapping(value = "/list", method = RequestMethod.GET) - public void getAdminPictureList(String appId) { - try { - PageInfo pageInfo = pictureService.gameInfoList(appId, getPageNumber(), getPageSize()); - List list = pageInfo.getList(); - JSONObject jsonObject = new JSONObject(); - jsonObject.put("total", pageInfo.getTotal()); - jsonObject.put("rows", list); - writeJson(jsonObject.toJSONString()); - } catch (Exception e) { - writeJson(false, "fail"); - logger.error("getAdminPirtureList error:{}", e); - } - } - - @RequestMapping(value = "/get", method = RequestMethod.GET) - public void getAdminPicture(Integer picId) { - try { - AdminPicture adminPicture = pictureMapper.selectByPrimaryKey(picId); - writeJson(JSON.toJSONString(adminPicture)); - } catch (Exception e) { - writeJson(false, "fail"); - logger.error("getAdminPirture error:{},picId={}", e,picId); - } - } - - - - @RequestMapping(value = "/delete", method = RequestMethod.POST) - public void deletePicture(Integer picId) { - logger.info("deletePicture picId :" + picId); - try { - int i = pictureMapper.deleteByPrimaryKey(picId); - if (i > 0) { - writeJson(true, "删除成功"); - } else { - writeJson(false, "删除失败"); - } - } catch (Exception e) { - writeJson(false, "删除失败"); - logger.error("deletePicture", e); - } - } - - @RequestMapping(value = "/headimg") - @ResponseBody - public void uploadGameImage(@RequestParam("uploadGameFile") MultipartFile uploadFile) { - String msg = null; - JSONObject jsonObject = new JSONObject(); - if (!uploadFile.isEmpty()) { - try { - String filepath = uploadService.uploadByStream(uploadFile.getInputStream(), uploadFile.getOriginalFilename()); - jsonObject.put("path", filepath); - } catch (Exception e) { - logger.error("upload fail, " + e.getMessage()); - msg = "上传失败，I/O流异常"; - } - } else { - msg = "上传失败，表单类型不正确！"; - } - jsonObject.put("msg", msg); - writeJson(jsonObject.toJSONString()); - } -} diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/SysConfAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/SysConfAdminController.java index de67131f4..4cdf3cf68 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/SysConfAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/SysConfAdminController.java @@ -4,8 +4,6 @@ import com.accompany.admin.controller.BaseController; import com.accompany.admin.service.system.SysConfAdminService; import com.accompany.common.result.BusiResult; import com.accompany.core.model.SysConf; -import com.accompany.core.model.SysConfExample; -import com.accompany.core.mybatismapper.SysConfMapper; import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -24,9 +22,6 @@ public class SysConfAdminController extends BaseController { @Autowired private SysConfAdminService sysConfNacosAdminService; - @Autowired - private SysConfMapper sysConfMapper; - @RequestMapping(value = "save", method = RequestMethod.POST) @ResponseBody public void save(SysConf sysConf) { @@ -79,15 +74,6 @@ public class SysConfAdminController extends BaseController { writeJson(jsonObject.toJSONString()); } - @RequestMapping(value = "loadList", method = RequestMethod.POST) - @ResponseBody - public void loadList() throws Exception { - SysConfExample example = new SysConfExample(); - example.createCriteria(); - List result = sysConfMapper.selectByExample(example); - sysConfNacosAdminService.publishConfig2Nacos(result); - } - /** * 获取配置 * diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/UserLevelCharmFixController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/UserLevelCharmFixController.java deleted file mode 100644 index b4d31d735..000000000 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/UserLevelCharmFixController.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.accompany.admin.controller.system; - - -import com.accompany.admin.controller.BaseController; -import com.accompany.admin.mapper.UserLevelCharmMapper; -import com.accompany.admin.model.UserLevelInfo; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.StringUtils; -import com.accompany.core.model.Users; -import com.accompany.core.model.UsersExample; -import com.accompany.core.mybatismapper.UsersMapper; -import com.accompany.core.service.common.JedisService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.CollectionUtils; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -@RestController -@RequestMapping("/admin/user/level/fix") -public class UserLevelCharmFixController extends BaseController { - - @Autowired - JedisService jedisService; - @Autowired - UsersMapper usersMapper; - @Autowired - private UserLevelCharmMapper userLevelCharmMapper; - - /** - * 修复单个或多个 - */ - @RequestMapping("/single") - public BusiResult single(String erbanNo) { - BusiResult busiResult = new BusiResult(BusiStatus.SUCCESS); - if (StringUtils.isEmpty(erbanNo)) { - busiResult.setMessage("平台号不能为空"); - return busiResult; - } - String[] erbanNoList = erbanNo.split(","); - List longList = new ArrayList<>(); - Arrays.stream(erbanNoList).forEach(item -> - longList.add(Long.parseLong(item)) - ); - UsersExample usersExample = new UsersExample(); - usersExample.createCriteria().andErbanNoIn(longList); - List usersList = usersMapper.selectByExample(usersExample); - if (CollectionUtils.isEmpty(usersList)) { - busiResult.setMessage("查找不到用户"); - return busiResult; - } - longList.clear(); - usersList.forEach(item -> - longList.add(item.getUid()) - ); - List userLevelInfoList = userLevelCharmMapper.getOneOrMore(longList); - if (CollectionUtils.isEmpty(userLevelInfoList)) { - busiResult.setMessage("查找不到礼物记录"); - return busiResult; - } - userLevelInfoList.forEach(item -> - { - jedisService.hset(RedisKey.user_level_charm.getKey(), item.getUid() + "", item.getCharmNum() + ""); - jedisService.hdel(RedisKey.user_summary.getKey(), item.getUid() + ""); - } - ); - return busiResult; - } - - /** - * 修复全部 - * - * @return - */ - @RequestMapping("/all") - public BusiResult all() { - BusiResult busiResult = new BusiResult(BusiStatus.SUCCESS); - List userLevelInfoList = userLevelCharmMapper.getAll(); - if (CollectionUtils.isEmpty(userLevelInfoList)) { - busiResult.setMessage("查找不到礼物记录"); - return busiResult; - } - userLevelInfoList.forEach(item -> - { - Long value = item.getCharmNum(); - jedisService.hset(RedisKey.user_level_charm.getKey(), item.getUid() + "", value + ""); - jedisService.hdel(RedisKey.user_summary.getKey(), item.getUid() + ""); - } - ); - return busiResult; - } - -} diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/ChargeRecordAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/ChargeRecordAdminController.java index 79106293d..29d5406fb 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/ChargeRecordAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/ChargeRecordAdminController.java @@ -369,7 +369,7 @@ public class ChargeRecordAdminController extends BaseController { @ApiImplicitParam(name = "beginDate", value = "开始时间：XX年XX月XX日 00:00:00", required = false, dataType = "string", paramType = "query"), @ApiImplicitParam(name = "endDate", value = "结束时间：XX年XX月XX日 23:59:59", required = false, dataType = "string", paramType = "query"), @ApiImplicitParam(name = "os", value = "空字符串-全部/android-Android/iOS-iOS", required = false, dataType = "string", paramType = "query"), - @ApiImplicitParam(name = "channel", value = "支付渠道：google_play_billing-google内购/payermax-payermax/MyCard-myCard/start_pay-startPay/ios_pay-ios内购/company-对公打款", required = false, dataType = "string", paramType = "query"), + @ApiImplicitParam(name = "channel", value = "支付渠道：google_play_billing-google内购/payermax-payermax/start_pay-startPay/ios_pay-ios内购/company-对公打款", required = false, dataType = "string", paramType = "query"), @ApiImplicitParam(name = "pageNo", value = "查询起始页", required = true, dataType = "long", paramType = "query"), @ApiImplicitParam(name = "pageSize", value = "每页显示数量", required = true, dataType = "long", paramType = "query") }) diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/PhoneAuthApplyRecordAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/PhoneAuthApplyRecordAdminController.java deleted file mode 100644 index e32e738c2..000000000 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/PhoneAuthApplyRecordAdminController.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.accompany.admin.controller.user; - -import com.accompany.admin.base.Pagination; -import com.accompany.admin.controller.BaseController; -import com.accompany.admin.service.system.AdminUserService; -import com.accompany.admin.service.user.PhoneAuthApplyRecordAdiminService; -import com.accompany.admin.vo.PhoneAuthApplyRecordExcelVo; -import com.accompany.admin.vo.apply.PhoneAuthApplyRecordAdminVo; -import com.accompany.common.utils.StringUtils; -import com.accompany.core.util.ExcelUtils; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletResponse; -import java.util.Arrays; -import java.util.Date; -import java.util.List; - -@RestController -@RequestMapping("/admin/phone/auth/apply") -public class PhoneAuthApplyRecordAdminController extends BaseController { - - @Autowired - private PhoneAuthApplyRecordAdiminService phoneAuthApplyRecordAdiminService; - @Autowired - private AdminUserService adminUserService; - - /** - * 分页列表 - * - * @param pageNumber - * @param pageSize - * @param phone - * @param authCode - * @param beginDate - * @param endDate - * @param status - * @return - */ - @ApiOperation("分页列表") - @GetMapping("/list") - public Pagination list(Integer pageNumber, Integer pageSize, String phone, String authCode, Date beginDate, Date endDate, Byte status) { - return new Pagination<>(phoneAuthApplyRecordAdiminService.getPageList(pageNumber, pageSize, phone, authCode, beginDate, endDate, status)); - } - - @RequestMapping("/exportRecord") - public void list(String phone, String authCode, Date beginDate, Date endDate, Byte status, HttpServletResponse response) throws Exception { - List statisticsList = phoneAuthApplyRecordAdiminService.export(phone, authCode, beginDate, endDate, status); - // 设置下载时客户端Excel的名称 - String filename = "statistics_phone_auth.xls"; - List fields = Arrays.asList("id", "phoneAreaCode", "phone", "authCode", "status", "createTime", "remark", "operator", "updateTime"); - ExcelUtils.exportExcel("手机号授权注册统计数据", filename, fields, statisticsList, response); - } - - @PostMapping("/changeStatus") - public void changeStatus(Long id, Byte status) { - if (id == null || id == 0 || status == null) { - writeJson(false, "参数有误"); - return; - } - int adminId = getAdminId(); - String adminName = adminUserService.getAdminName(adminId); - int result = phoneAuthApplyRecordAdiminService.changeStatus(id, status, adminName); - if (result > 0) { - writeJson(true, String.valueOf(result)); - return; - } - writeJson(false, "操作失败"); - } - - @RequestMapping("/remark") - public void remark(Long id, String remark) { - if (id == null || id == 0 || StringUtils.isEmpty(remark)) { - writeJson(false, "参数不能为空"); - return; - } - int adminId = getAdminId(); - String adminName = adminUserService.getAdminName(adminId); - phoneAuthApplyRecordAdiminService.remark(id, remark, adminName); - writeJson(true, "操作成功"); - } - -} diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/TopicBoxItemAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/TopicBoxItemAdminController.java deleted file mode 100644 index 37a36ead8..000000000 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/TopicBoxItemAdminController.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.accompany.admin.controller.user; - -import com.accompany.admin.controller.BaseController; -import com.accompany.admin.model.AdminUser; -import com.accompany.admin.service.system.AdminUserService; -import com.accompany.admin.service.user.TopicBoxItemAdminService; -import com.accompany.business.model.TopicBoxItem; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.ServiceException; -import com.alibaba.fastjson.JSONObject; -import com.github.pagehelper.PageInfo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; - -/** - * ｛这里添加描述｝ - * - * @author fangchengyan - * @date 2019-05-30 19:01 - */ -@Controller -@RequestMapping("/admin/user/topicBoxItem") -public class TopicBoxItemAdminController extends BaseController { - - @Autowired - private TopicBoxItemAdminService topicBoxItemAdminService; - @Autowired - private AdminUserService adminUserService; - - @ResponseBody - @RequestMapping(value = "list", method = RequestMethod.GET) - public void list(Byte status){ - PageInfo pageInfo = topicBoxItemAdminService.queryForPages(status, getPageNumber(), getPageSize()); - JSONObject jsonObject = new JSONObject(); - jsonObject.put("total", pageInfo.getTotal()); - jsonObject.put("rows", pageInfo.getList()); - writeJson(jsonObject.toJSONString()); - } - - @ResponseBody - @RequestMapping(value = "save", method = RequestMethod.POST) - public BusiResult save(TopicBoxItem record){ - if (record == null) { - throw new ServiceException(BusiStatus.PARAMERROR); - } - try { - int adminUserId = getAdminId(); - //获取当前登录用户信息 - AdminUser adminUser = adminUserService.getAdminUserById(adminUserId); - record.setOperatorId(new Long(adminUser.getId())); - record.setOperator(adminUser.getUsername()); - topicBoxItemAdminService.save(record); - return new BusiResult(BusiStatus.SUCCESS); - } catch (Exception e) { - logger.error(e.getMessage(), e); - return new BusiResult(BusiStatus.SERVERERROR); - } - } - - @ResponseBody - @RequestMapping(value = "delete", method = RequestMethod.POST) - public BusiResult delete(Integer id){ - if(null == id || id <= 0) { - return new BusiResult(BusiStatus.PARAMERROR); - } - try { - topicBoxItemAdminService.deleteById(id); - return new BusiResult(BusiStatus.SUCCESS); - } catch (Exception e){ - logger.error(e.getMessage(), e); - return new BusiResult(BusiStatus.SERVERERROR); - } - } - - @ResponseBody - @RequestMapping(value = "getById", method = RequestMethod.GET) - public BusiResult getById(Integer id){ - try { - TopicBoxItem record = topicBoxItemAdminService.getById(id); - return new BusiResult(BusiStatus.SUCCESS, record); - } catch (Exception e) { - logger.error(e.getMessage(), e); - return new BusiResult(BusiStatus.SERVERERROR); - } - } - -} diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/UserCertifyRecordAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/UserCertifyRecordAdminController.java deleted file mode 100644 index 79dd0f276..000000000 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/UserCertifyRecordAdminController.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.accompany.admin.controller.user; - -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.StrUtil; -import com.accompany.admin.controller.BaseController; -import com.accompany.admin.service.user.UserCertifyRecordAdminService; -import com.accompany.admin.vo.UserCertifyRecordVo; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.service.user.UsersBaseService; -import com.accompany.core.util.StringUtils; -import com.alibaba.fastjson.JSONObject; -import com.github.pagehelper.PageInfo; -import com.google.common.collect.Lists; -import org.apache.commons.collections4.CollectionUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; -import java.util.Arrays; -import java.util.List; - -/** - * @author yangming - * @date 2018-12-21 - * @description 用户实名认证 - */ -@RestController -@RequestMapping("/admin/certify/record") -public class UserCertifyRecordAdminController extends BaseController { - - private static final transient Logger logger = LoggerFactory.getLogger(UserCertifyRecordAdminController.class); - - @Autowired - private UserCertifyRecordAdminService userCertifyRecordAdminService; - - @Autowired - private UsersBaseService usersBaseService; - - @GetMapping("list") - public void list(String erBanNoStr, String idCardNum, Byte bindStatus) { - List uidList = null; - if (StrUtil.isNotEmpty(erBanNoStr)) { - uidList = usersBaseService.getUidByErbanNo(Arrays.asList(erBanNoStr.split(StrUtil.COMMA))); - } - JSONObject jsonObject = new JSONObject(); - if (CollectionUtil.isNotEmpty(uidList) || StringUtils.isNotBlank(idCardNum)) { - PageInfo pageInfo = userCertifyRecordAdminService.queryForPages(uidList, idCardNum, bindStatus, getPageNumber(), getPageSize()); - jsonObject.put("total", pageInfo.getTotal()); - jsonObject.put("rows", pageInfo.getList()); - } else { - jsonObject.put("total", 0); - jsonObject.put("rows", Lists.newArrayList()); - } - writeJson(jsonObject.toJSONString()); - } - - @RequestMapping(value = "/delete") - public BusiResult list(Long recordId) { - if (null == recordId || recordId <= 0) { - return new BusiResult(BusiStatus.PARAMERROR); - } - try { - int result = userCertifyRecordAdminService.deleteById(recordId); - if (result > 0) { - return new BusiResult(BusiStatus.SUCCESS); - } else { - return new BusiResult(BusiStatus.UNKNOWN, "删除失败！", null); - } - } catch (Exception e) { - logger.error(e.getMessage(), e); - return new BusiResult(BusiStatus.SERVERERROR); - } - } - - @RequestMapping(value = "/deleteBatch") - public BusiResult del(HttpServletRequest request) { - List ids = getRequestArray(request, "ids", Long.class); - if (CollectionUtils.isEmpty(ids)) { - writeJson(false, "参数有误"); - return new BusiResult(BusiStatus.PARAMERROR); - } - try { - int result = userCertifyRecordAdminService.deleteBatch(ids); - if (result > 0) { - return new BusiResult(BusiStatus.SUCCESS); - } else { - return new BusiResult(BusiStatus.UNKNOWN, "删除失败！", null); - } - } catch (Exception e) { - logger.error(e.getMessage(), e); - return new BusiResult(BusiStatus.SERVERERROR); - } - } -} diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/ExchangeRateAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/ExchangeRateAdminController.java deleted file mode 100644 index 1d5830210..000000000 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/ExchangeRateAdminController.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.accompany.admin.controller.withdraw; - -import com.accompany.admin.service.withdraw.ExchangeRateAdminService; -import com.accompany.business.dto.exchange.ExchangeRateDto; -import com.accompany.business.model.withdraw.ExchangeRate; -import com.accompany.common.result.BusiResult; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - * @author: liaozetao - * @date: 2023/7/7 18:09 - * @description: - */ -@Api(tags = "汇率管理") -@Slf4j -@RestController -@RequestMapping("/admin/withdraw/exchangeRate") -public class ExchangeRateAdminController { - - @Autowired - private ExchangeRateAdminService exchangeRateAdminService; - - /** - * 保存 - * - * @param rate - * @return - */ - @ApiOperation("保存") - @PostMapping("save") - public BusiResult save(ExchangeRateDto rate) { - exchangeRateAdminService.save(rate); - return BusiResult.success(); - } - - /** - * 列表 - * - * @return - */ - @ApiOperation("列表") - @GetMapping("list") - public BusiResult> list() { - return BusiResult.success(exchangeRateAdminService.list()); - } -} diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawAccountAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawAccountAdminController.java deleted file mode 100644 index eb7b7f32c..000000000 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawAccountAdminController.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.accompany.admin.controller.withdraw; - -import com.accompany.admin.controller.BaseController; -import com.accompany.admin.service.withdraw.WithdrawAccountAdminService; -import com.accompany.admin.vo.withdraw.WithdrawAccountAdminVo; -import com.accompany.common.result.PageResult; -import com.alibaba.excel.EasyExcel; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.net.URLEncoder; - -/** - * @author yangziwen - * @description ti - * @date 2018/5/3 16:37 - */ -@Slf4j -@RestController -@RequestMapping("/admin/withdraw/account") -public class WithdrawAccountAdminController extends BaseController { - - @Autowired - private WithdrawAccountAdminService withdrawAccountAdminService; - - @GetMapping("/list") - public PageResult pageWithdrawAccount(Long erbanNo, Integer pageNum, Integer pageSize) { - Page page = withdrawAccountAdminService.pageWithdrawAccount(pageNum, pageSize, erbanNo); - return new PageResult<>(page); - } - - //导出功能 - @GetMapping("/exportList") - public void export(Long erbanNo, HttpServletResponse response) throws IOException { - Page page = withdrawAccountAdminService.pageWithdrawAccount(-1, -1, erbanNo); - // 这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman - response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); - response.setCharacterEncoding("utf-8"); - // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系 - String fileName = URLEncoder.encode("提现信息查看", "UTF-8").replaceAll("\\+", "%20"); - response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); - EasyExcel.write(response.getOutputStream(), WithdrawAccountAdminVo.class).sheet("提现信息查看").doWrite(page.getRecords()); - } - -} diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawAccountDtlAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawAccountDtlAdminController.java deleted file mode 100644 index 537494b54..000000000 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawAccountDtlAdminController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.accompany.admin.controller.withdraw; - -import com.accompany.admin.service.withdraw.WithdrawAccountDtlAdminService; -import com.accompany.business.model.withdraw.WithdrawAccountDtl; -import com.accompany.common.result.BusiResult; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - * @author: liaozetao - * @date: 2023/7/7 18:46 - * @description: - */ -@Api(tags = "提现账户管理") -@Slf4j -@RestController -@RequestMapping("/admin/withdraw/accountDtl") -public class WithdrawAccountDtlAdminController { - - @Autowired - private WithdrawAccountDtlAdminService withdrawAccountDtlAdminService; - - /** - * 列表 - * - * @return - */ - @ApiOperation("列表") - @GetMapping("list") - public BusiResult> list() { - return BusiResult.success(withdrawAccountDtlAdminService.list()); - } - -} diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawAdminController.java deleted file mode 100644 index 5a5f8c02f..000000000 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawAdminController.java +++ /dev/null @@ -1,152 +0,0 @@ -package com.accompany.admin.controller.withdraw; - -import com.accompany.admin.common.AdminConstants; -import com.accompany.admin.controller.BaseController; -import com.accompany.admin.service.user.WithdrawAdminService; -import com.accompany.admin.service.withdraw.WithdrawBlockAdminService; -import com.accompany.admin.vo.withdraw.WithdrawVo; -import com.accompany.business.model.WithdrawRecord; -import com.accompany.core.util.StringUtils; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.CollectionUtils; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.List; - -/** - * Created by yangziwen on 2018/01/31. - * @description 提现管理，所有提现的管理系统 - */ -@RestController -@RequestMapping("/admin/withdraw") -public class WithdrawAdminController extends BaseController { - - private static final Logger logger = LoggerFactory.getLogger(WithdrawAdminController.class); - - @Autowired - WithdrawAdminService withdrawAdminService; - @Autowired - private WithdrawBlockAdminService withdrawBlockAdminService; - - @RequestMapping(value = "/list", method = RequestMethod.GET) - public void getList(String erbanNo, String account, String accountName, String phone, String beginDate, String endDate, Byte status, String payStatus, Integer pageNum, - Integer pageSize, Byte blockStatus, Byte accountType) throws Exception { - List blockUids = null; - // 如果不是全部，先获取所有提现黑名单的uid - blockUids = this.withdrawBlockAdminService.getBlockedUidList(AdminConstants.Status.VALID); - IPage pageInfo = this.withdrawAdminService.getWithdrawList(erbanNo, account, accountName, phone, beginDate, endDate, status, payStatus, blockStatus, blockUids, accountType, pageNum, pageSize); - List list = this.withdrawAdminService.convertToVo(pageInfo.getRecords(),blockUids,blockStatus); - JSONObject jsonObject = new JSONObject(); - jsonObject.put("total", pageInfo.getTotal()); - jsonObject.put("rows", list); - writeJson(jsonObject.toJSONString()); - } - - @RequestMapping(value = "/approve", method = RequestMethod.POST) - public void approveWithdraw(@RequestParam(value = "id", required = true) String id) { - logger.debug("approveWithdraw({})", id); - - try { - String result = this.withdrawAdminService.approveWithdraw(id); - if (result == null) { - writeJson(true, "操作成功"); - return; - } - - writeJson(false, result); - return; - } catch (Exception e) { - logger.error("Failed to save withdraw. Cause by {}", e.getCause().getMessage()); - } - - writeJson(false, "操作失败"); - } - - @RequestMapping(value = "/batchApprove", method = RequestMethod.POST) - public void batchApproveWithdraw(HttpServletRequest request) { - List ids = getRequestArray(request, "ids", String.class); - logger.debug("batchConfirmPayment(), ids={}", ids); - if (CollectionUtils.isEmpty(ids)) { - writeJson(false, "参数有误"); - return; - } - - Integer success = 0; - for (String id : ids) { - try { - String result = this.withdrawAdminService.approveWithdraw(id); - logger.debug("batchConfirmPayment(), result={}", result); - if (StringUtils.isBlank(result)) { - success++; - } - } catch (Exception e) { - logger.error("Failed to save withdraw {}. Cause by {}", id, e.getCause().getMessage(), e); - } - } - - if (ids.size() == success.intValue()) { - writeJson(true, "全部批准成功"); - return; - } - - if (success.intValue() > 0 && success.intValue() < ids.size()) { - writeJson(true, "部分批准成功"); - return; - } - - writeJson(false, "全部批准失败"); - } - - @RequestMapping(value = "/reject", method = RequestMethod.POST) - public void reject(String withdrawId, String remark) { - logger.info("reject(), id={}, remark={}", withdrawId, remark); - - this.withdrawAdminService.reject(withdrawId, remark); - writeJson(true, "已拒绝提现申请"); - } - - @RequestMapping(value = "/batchReject", method = RequestMethod.POST) - public void batchReject(HttpServletRequest request) { - List ids = getRequestArray(request, "ids", String.class); - logger.info("reject(), id={}, remark={}", ids); - if (CollectionUtils.isEmpty(ids)) { - writeJson(false, "参数有误"); - return; - } - this.withdrawAdminService.batchReject(ids); - writeJson(true, "已拒绝提现申请"); - } - - - - @RequestMapping(value = "/export", method = RequestMethod.GET) - public void export(HttpServletRequest request, HttpServletResponse response, String erbanNo, String account, String accountName, String payStatus, String phone, - String beginDate, String endDate, Byte status, Byte blockStatus, Byte accountType) throws Exception { - /*List blockUids = null; - // 如果不是全部，先获取所有提现黑名单的uid - blockUids = this.withdrawBlockAdminService.getBlockedUidList(AdminConstants.Status.VALID); - IPage pageInfo = this.withdrawAdminService.getWithdrawList(erbanNo, account, accountName, phone, beginDate, endDate, status, payStatus, blockStatus, blockUids, accountType, 1, -1); - List list = this.withdrawAdminService.convertToVo(pageInfo.getRecords(),blockUids,blockStatus); - HSSFWorkbook workbook = this.buildWithdrawExcel(list); - - // 设置下载时客户端Excel的名称 - String filename = "withdraw_list.xls"; - response.setContentType("application/vnd.ms-excel"); - response.setHeader("Content-disposition", "attachment;filename=" + filename); - response.setCharacterEncoding("UTF-8"); - OutputStream ouputStream = response.getOutputStream(); - workbook.write(ouputStream); - ouputStream.flush(); - ouputStream.close();*/ - } - -} \ No newline at end of file diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawApplyAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawApplyAdminController.java deleted file mode 100644 index bba9014a9..000000000 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawApplyAdminController.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.accompany.admin.controller.withdraw; - -import com.accompany.admin.controller.BaseController; -import com.accompany.admin.service.system.AdminLogService; -import com.accompany.admin.service.system.AdminUserService; -import com.accompany.admin.service.withdraw.WithdrawApplyAdminService; -import com.accompany.admin.vo.withdraw.WithdrawRecordAdminVo; -import com.accompany.common.result.BusiResult; -import com.accompany.common.result.PageResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.AdminServiceException; -import com.alibaba.excel.EasyExcel; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.net.URLEncoder; - -/** - * @author yangziwen - * @description ti - * @date 2018/5/3 16:37 - */ -@Slf4j -@RestController -@RequestMapping("/admin/withdraw/apply") -public class WithdrawApplyAdminController extends BaseController { - - @Autowired - private WithdrawApplyAdminService withdrawApplyAdminService; - @Autowired - private AdminLogService adminLogService; - @Autowired - private AdminUserService adminUserService; - - @GetMapping("/list") - public PageResult listWithdrawApply(Long erbanNo, String beginDate, String endDate, Byte status, Integer pageNum, Integer pageSize) { - Page page = withdrawApplyAdminService.pageWithdrawRecord(pageNum, pageSize, erbanNo, beginDate, endDate, status); - return new PageResult<>(page); - } - - @PostMapping("/update") - public BusiResult updateApplyWithdraw(Long id, Byte status){ - if (null == id || null == status){ - throw new AdminServiceException(BusiStatus.PARAMERROR); - } - int adminId = getAdminId(); - String adminName = adminUserService.getAdminName(adminId); - withdrawApplyAdminService.updateWithdrawStatus(id, status, adminName); - adminLogService.insertLog(getAdminId(),getClass().getCanonicalName(),"updateWithdrawApply", - "params===>>id:" + id + ", status:" + status); - return new BusiResult<>(BusiStatus.SUCCESS); - } - - //导出功能 - @GetMapping("/exportList") - public void export(Long erbanNo, String beginDate, String endDate, Byte status, HttpServletResponse response) throws IOException { - Page page = withdrawApplyAdminService.pageWithdrawRecord(-1, -1, erbanNo, beginDate, endDate, status); - // 这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman - response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); - response.setCharacterEncoding("utf-8"); - // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系 - String fileName = URLEncoder.encode("提现申请", "UTF-8").replaceAll("\\+", "%20"); - response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); - EasyExcel.write(response.getOutputStream(), WithdrawRecordAdminVo.class).sheet("提现申请").doWrite(page.getRecords()); - } - -} diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawBlockAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawBlockAdminController.java deleted file mode 100644 index e59a726b6..000000000 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawBlockAdminController.java +++ /dev/null @@ -1,121 +0,0 @@ -package com.accompany.admin.controller.withdraw; - -import com.accompany.admin.common.AdminConstants; -import com.accompany.admin.controller.BaseController; -import com.accompany.admin.service.system.AdminLogService; -import com.accompany.admin.service.withdraw.WithdrawBlockAdminService; -import com.accompany.admin.vo.withdraw.WithdrawBlockVo; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.exception.AdminServiceException; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.github.pagehelper.PageInfo; -import org.apache.poi.hssf.usermodel.HSSFRow; -import org.apache.poi.hssf.usermodel.HSSFSheet; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.OutputStream; -import java.util.Date; -import java.util.List; - -/** - * Created by yuanyi on 2019/4/29. - */ -@RestController -@RequestMapping("/admin/withdraw/block") -public class WithdrawBlockAdminController extends BaseController { - @Autowired - private WithdrawBlockAdminService withdrawBlockAdminService; - @Autowired - private AdminLogService adminLogService; - - @RequestMapping(value = "/list", method = RequestMethod.GET) - public void getList(String erbanNoList, Byte status, Date startDate, Date endDate){ - - List list = this.withdrawBlockAdminService.getBlockList(erbanNoList,status,getPageSize(),getPageNumber(),startDate,endDate); - PageInfo pageInfo = new PageInfo<>(list); - JSONObject jsonObject = new JSONObject(); - jsonObject.put("total",pageInfo.getTotal()); - jsonObject.put("rows",pageInfo.getList()); - writeJson(jsonObject.toJSONString()); - } - - - /** - * 单个和批量删除，单个和批量移除， - * @param uids - * @param status - */ - @RequestMapping(value = "/modify",method = RequestMethod.POST) - public BusiResult modifyStatus(@RequestParam String uids, @RequestParam Byte status){ - BusiResult busiResult = new BusiResult(BusiStatus.SUCCESS); - try{ - this.withdrawBlockAdminService.batchModify(uids,status); - adminLogService.insertLog(getAdminId(),getClass().getCanonicalName(),"modifyStatus", - "params===>>uids:" + JSON.toJSONString(uids) + ", status:" + status); - return busiResult; - }catch (Exception e){ - logger.error("modify failed,param is uids:{}",uids,e); - throw new AdminServiceException(BusiStatus.SERVERERROR, e.getMessage()); - } - } - - @RequestMapping(value = "/add",method = RequestMethod.POST) - public BusiResult addWithDrawBlock(@RequestParam String erbanNoList, @RequestParam String remark) { - BusiResult busiResult = new BusiResult(BusiStatus.SUCCESS); - try{ - this.withdrawBlockAdminService.insertBlock(erbanNoList,remark); - adminLogService.insertLog(getAdminId(),getClass().getCanonicalName(),"addWithDrawBlock", - "params===>>erbanNo:" + JSON.toJSONString(erbanNoList) + ", remark:" + remark); - return busiResult; - }catch (Exception e){ - logger.error("add withdraw block failed,erbanNo = {}",JSON.toJSONString(erbanNoList),e); - throw new AdminServiceException(BusiStatus.SERVERERROR, e.getMessage()); - } - } - - @RequestMapping(value = "/export", method = RequestMethod.GET) - public void exportWithDrawBlockList(HttpServletResponse response, String erbanNoList, Byte status, Date startDate, Date endDate) throws IOException{ - List list = this.withdrawBlockAdminService.getBlockList(erbanNoList,status,5000,1,startDate,endDate); - HSSFWorkbook workbook = this.buildWithdrawBlockExcel(list); - String filename = "withdraw_block_list.xls"; - response.setContentType("application/vnd.ms-excel"); - response.setHeader("Content-disposition", "attachment;filename=" + filename); - response.setCharacterEncoding("UTF-8"); - OutputStream ouputStream = response.getOutputStream(); - workbook.write(ouputStream); - ouputStream.flush(); - ouputStream.close(); - } - - private HSSFWorkbook buildWithdrawBlockExcel(List list){ - HSSFWorkbook workbook = new HSSFWorkbook(); - HSSFSheet sheet = workbook.createSheet("提现黑名单"); - String[] headers = {"uid", "平台号", "昵称", "状态", "备注","创建时间"}; - HSSFRow header = sheet.createRow(0); - for(int i = 0;i < headers.length;i++){ - header.createCell(i).setCellValue(headers[i]); - } - int rowNum = 1; - for(WithdrawBlockVo item: list){ - HSSFRow row = sheet.createRow(rowNum++); - row.createCell(0).setCellValue(item.getUid()); - row.createCell(1).setCellValue(item.getErbanNo()); - row.createCell(2).setCellValue(item.getNick()); - row.createCell(3).setCellValue(item.getStatus().equals(AdminConstants.Status.VALID)?"有效":"无效"); - row.createCell(4).setCellValue(item.getRemark() == null?"":item.getRemark()); - row.createCell(5).setCellValue(DateTimeUtil.convertDate(item.getCreateTime(),"yyyy-MM-dd hh:mm:ss")); - } - return workbook; - } - -} diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawConfigAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawConfigAdminController.java deleted file mode 100644 index 526cbf5cf..000000000 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawConfigAdminController.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.accompany.admin.controller.withdraw; - -import com.accompany.admin.controller.BaseController; -import com.accompany.admin.service.system.AdminLogService; -import com.accompany.admin.service.withdraw.WithdrawConfigAdminService; -import com.accompany.admin.vo.withdraw.WithdrawConfigAdminVo; -import com.accompany.business.dto.exchange.WithdrawConfigDto; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.GsonUtil; -import com.accompany.core.exception.ServiceException; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.Collections; -import java.util.List; - - -/** - * @author yangziwen - * @description ti - * @date 2018/5/3 16:37 - */ -@Slf4j -@RestController -@RequestMapping("/admin/withdraw/config") -public class WithdrawConfigAdminController extends BaseController { - - @Autowired - private WithdrawConfigAdminService service; - - @Autowired - private AdminLogService adminLogService; - - @GetMapping("/list") - public List listWithdrawConfig() { - return service.list(); - } - - @PostMapping("/save") - public BusiResult updateApplyWithdraw(WithdrawConfigDto configDto) { - if (null == configDto || null == configDto.getFee() || null == configDto.getTimes() - || null == configDto.getMin() || null == configDto.getMax()) { - throw new ServiceException(BusiStatus.PARAMERROR); - } - service.save(configDto); - adminLogService.insertLog(getAdminId(), getClass().getCanonicalName(), "updateWithdrawApply", - "params===>>" + GsonUtil.getGson().toJson(configDto)); - return new BusiResult<>(BusiStatus.SUCCESS); - } - - /** - * 保存 - * - * @param config - * @return - */ - @ApiOperation("保存") - @PostMapping("saveConfig") - public BusiResult saveConfig(WithdrawConfigDto config) { - service.saveConfig(config); - return BusiResult.success(); - } - - /** - * 获取 - * - * @return - */ - @ApiOperation("获取") - @GetMapping("get") - public List get() { - return Collections.singletonList(service.get()); - } - -} diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawUserAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawUserAdminController.java deleted file mode 100644 index 5fde293e0..000000000 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawUserAdminController.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.accompany.admin.controller.withdraw; - -import com.accompany.admin.controller.BaseController; -import com.accompany.admin.service.system.AdminLogService; -import com.accompany.admin.service.withdraw.WithdrawUserAdminService; -import com.accompany.admin.vo.withdraw.WithdrawUserAdminVo; -import com.accompany.business.model.withdraw.WithdrawUserAccount; -import com.accompany.common.model.PageReq; -import com.accompany.common.result.BusiResult; -import com.accompany.common.result.PageResult; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.context.request.ServletWebRequest; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; - -/** - * @author: liaozetao - * @date: 2023/7/7 15:29 - * @description: - */ -@Api(tags = "用户账户信息管理") -@Slf4j -@RestController -@RequestMapping("/admin/withdraw/user") -public class WithdrawUserAdminController extends BaseController { - - - @Autowired - private WithdrawUserAdminService withdrawUserAdminService; - - @Autowired - private AdminLogService adminLogService; - - /** - * 分页 - * - * @param erbanNo - * @param req - * @return - */ - @ApiOperation("分页") - @GetMapping("page") - public PageResult page(@RequestParam(required = false) String erbanNo, PageReq req) { - return new PageResult<>(withdrawUserAdminService.page(erbanNo, req)); - } - - - /** - * 获取 - * - * @param uid - * @param accountType - * @return - */ - @ApiOperation("获取") - @GetMapping("get") - public BusiResult get(@RequestParam("uid") Long uid, @RequestParam("accountType") Integer accountType) { - return BusiResult.success(withdrawUserAdminService.get(uid, accountType)); - } - - /** - * 重置 - * - * @param id - * @return - */ - @ApiOperation("重置") - @GetMapping("reset") - public BusiResult reset(@RequestParam("id") Long id) { - withdrawUserAdminService.reset(id); - adminLogService.insertLog(getAdminId(), getClass().getCanonicalName(), "reset", "params===>>id:" + id); - return BusiResult.success(); - } - - /** - * 导出 - * - * @param erbanNo - * @param response - * @throws IOException - */ - @ApiOperation("导出") - @GetMapping("/export") - public void export(Long erbanNo, HttpServletRequest request, HttpServletResponse response) { - withdrawUserAdminService.export(erbanNo, new ServletWebRequest(request, response)); - } - -} diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawUserLimitAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawUserLimitAdminController.java deleted file mode 100644 index a4329700d..000000000 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawUserLimitAdminController.java +++ /dev/null @@ -1,120 +0,0 @@ -package com.accompany.admin.controller.withdraw; - -import com.accompany.admin.controller.BaseController; -import com.accompany.admin.dto.withdraw.WithdrawUserLimitAdminDto; -import com.accompany.admin.service.system.AdminRoleService; -import com.accompany.admin.service.withdraw.WithdrawUserLimitAdminService; -import com.accompany.admin.vo.withdraw.WithdrawUserLimitAdminVo; -import com.accompany.common.model.PageReq; -import com.accompany.common.result.BusiResult; -import com.accompany.common.result.PageResult; -import com.accompany.core.exception.ServiceException; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.ServletWebRequest; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -/** - * @author: liaozetao - * @date: 2023/7/10 14:36 - * @description: - */ -@Api(tags = "提现用户限制管理") -@Slf4j -@RestController -@RequestMapping("/admin/withdraw/user/limit") -public class WithdrawUserLimitAdminController extends BaseController { - - @Autowired - private AdminRoleService adminRoleService; - - @Autowired - private WithdrawUserLimitAdminService withdrawUserLimitAdminService; - - /** - * 分页 - * - * @param erbanNo - * @param req - * @return - */ - @ApiOperation("分页") - @GetMapping("page") - public PageResult page(@RequestParam(value = "erbanNo", required = false) String erbanNo, - @RequestParam(value = "searchType", required = false) Integer searchType, - @RequestParam(value = "roomErBanNo", required = false) String roomErBanNo, - @RequestParam(value = "hallErBanNo", required = false) String hallErBanNo, - PageReq req) { - return new PageResult<>(withdrawUserLimitAdminService.page(erbanNo, searchType, roomErBanNo, hallErBanNo, req)); - } - - /** - * 保存 - * - * @return - */ - @ApiOperation("保存") - @PostMapping("save") - public BusiResult save(WithdrawUserLimitAdminDto limit) { - withdrawUserLimitAdminService.save(limit); - return BusiResult.success(); - } - - /** - * 删除 - * - * @param id - * @return - */ - @ApiOperation("删除") - @GetMapping("del") - public BusiResult del(Long id) { - if (!adminRoleService.isAdminAuthority(getAdminId(), "超管", "公会运营组长")) { - throw new ServiceException("权限不足，请联系管理员！"); - } - withdrawUserLimitAdminService.del(id); - return BusiResult.success(); - } - - /** - * 批量删除 - * - * @param idStr - * @return - */ - @ApiOperation("批量删除") - @GetMapping("batchDel") - public BusiResult batchDel(String idStr) { - if (!adminRoleService.isAdminAuthority(getAdminId(), "超管", "公会运营组长")) { - throw new ServiceException("权限不足，请联系管理员！"); - } - withdrawUserLimitAdminService.batchDel(idStr); - return BusiResult.success(); - } - - /** - * 导出 - * - * @param erbanNo - * @param searchType - * @param roomErBanNo - * @param hallErBanNo - * @param request - * @param response - */ - @ApiOperation("导出") - @GetMapping("export") - public void export(@RequestParam(value = "erbanNo", required = false) String erbanNo, - @RequestParam(value = "searchType", required = false) Integer searchType, - @RequestParam(value = "roomErBanNo", required = false) String roomErBanNo, - @RequestParam(value = "hallErBanNo", required = false) String hallErBanNo, - HttpServletRequest request, - HttpServletResponse response) { - withdrawUserLimitAdminService.export(erbanNo, searchType, roomErBanNo, hallErBanNo, new ServletWebRequest(request, response)); - } -} diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawUserRecordAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawUserRecordAdminController.java deleted file mode 100644 index 50d5fdd6d..000000000 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawUserRecordAdminController.java +++ /dev/null @@ -1,156 +0,0 @@ -package com.accompany.admin.controller.withdraw; - -import com.accompany.admin.controller.BaseController; -import com.accompany.admin.service.withdraw.WithdrawUserRecordAdminService; -import com.accompany.admin.vo.withdraw.WithdrawUserRecordAdminVo; -import com.accompany.common.model.PageReq; -import com.accompany.common.result.BusiResult; -import com.accompany.common.result.PageResult; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.ServletWebRequest; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.math.BigDecimal; -import java.util.Date; - -/** - * @author: liaozetao - * @date: 2023/7/10 14:36 - * @description: - */ -@Api(tags = "提现申请管理") -@Slf4j -@RestController -@RequestMapping("/admin/withdraw/user/record") -public class WithdrawUserRecordAdminController extends BaseController { - - @Autowired - private WithdrawUserRecordAdminService withdrawUserRecordAdminService; - - /** - * 分页 - * - * @param recordStatus - * @param erbanNo - * @param accountType - * @param applyStartTime - * @param applyEndTime - * @param req - * @return - */ - @ApiOperation("分页") - @GetMapping("page") - public PageResult page(@RequestParam("recordStatus") Integer recordStatus, - @RequestParam(value = "erbanNo", required = false) String erbanNo, - @RequestParam(value = "accountType", required = false) Integer accountType, - @RequestParam(value = "applyStartTime", required = false) Date applyStartTime, - @RequestParam(value = "applyEndTime", required = false) Date applyEndTime, - PageReq req) { - return new PageResult<>(withdrawUserRecordAdminService.page(recordStatus, erbanNo, accountType, applyStartTime, applyEndTime, req)); - } - - /** - * 发放 - * - * @param id - * @param isSecretary - * @return - */ - @ApiOperation("发放") - @PostMapping("grant") - public BusiResult grant(Long id, Integer isSecretary) { - withdrawUserRecordAdminService.grant(id, isSecretary, getAdminId()); - return BusiResult.success(); - } - - /** - * 导出 - * - * @param recordStatus - * @param erbanNo - * @param accountType - * @param applyStartTime - * @param applyEndTime - * @param response - */ - @ApiOperation("导出") - @GetMapping("export") - public void export(@RequestParam("recordStatus") Integer recordStatus, - @RequestParam(value = "erbanNo", required = false) String erbanNo, - @RequestParam(value = "accountType", required = false) Integer accountType, - @RequestParam(value = "applyStartTime", required = false) Date applyStartTime, - @RequestParam(value = "applyEndTime", required = false) Date applyEndTime, - HttpServletRequest request, - HttpServletResponse response) { - withdrawUserRecordAdminService.export(recordStatus, erbanNo, accountType, applyStartTime, applyEndTime, new ServletWebRequest(request, response)); - } - - /** - * 汇总提现金额 - * - * @param recordStatus - * @param erbanNo - * @param accountType - * @param applyStartTime - * @param applyEndTime - * @return - */ - @ApiOperation("汇总提现金额") - @GetMapping("totalAmount") - public BusiResult totalAmount(@RequestParam("recordStatus") Integer recordStatus, - @RequestParam(value = "erbanNo", required = false) String erbanNo, - @RequestParam(value = "accountType", required = false) Integer accountType, - @RequestParam(value = "applyStartTime", required = false) Date applyStartTime, - @RequestParam(value = "applyEndTime", required = false) Date applyEndTime) { - return BusiResult.success(withdrawUserRecordAdminService.totalAmount(recordStatus, erbanNo, accountType, applyStartTime, applyEndTime)); - } - - /** - * 批量发放 - * - * @param recordIdStr - * @param isSecretary - * @return - */ - @ApiOperation("批量发放") - @PostMapping("batchGrant") - public BusiResult batchGrant(String recordIdStr, Integer isSecretary) { - withdrawUserRecordAdminService.batchGrant(recordIdStr, isSecretary, getAdminId()); - return BusiResult.success(); - } - - /** - * 驳回 - * - * @param id - * @param isSecretary - * @param isReturn - * @return - */ - @ApiOperation("驳回") - @PostMapping("reject") - public BusiResult reject(Long id, Integer isReturn, Integer isSecretary) { - withdrawUserRecordAdminService.reject(id, isReturn, isSecretary, getAdminId()); - return BusiResult.success(); - } - - /** - * 批量驳回 - * - * @param recordIdStr - * @param isReturn - * @param isSecretary - * @return - */ - @ApiOperation("批量驳回") - @PostMapping("batchReject") - public BusiResult batchReject(String recordIdStr, Integer isReturn, Integer isSecretary) { - withdrawUserRecordAdminService.batchReject(recordIdStr, isReturn, isSecretary, getAdminId()); - return BusiResult.success(); - } -} diff --git a/accompany-base/accompany-basic/accompany-basic-sdk/src/main/java/com/accompany/core/model/phone/PhoneAuthApplyRecord.java b/accompany-base/accompany-basic/accompany-basic-sdk/src/main/java/com/accompany/core/model/phone/PhoneAuthApplyRecord.java deleted file mode 100644 index 6e79153e6..000000000 --- a/accompany-base/accompany-basic/accompany-basic-sdk/src/main/java/com/accompany/core/model/phone/PhoneAuthApplyRecord.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.accompany.core.model.phone; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - * 手机授权码注册管理 - * - * @author lzm - * @email - * @date 2022-11-22 17:30:12 - */ -@Data -@TableName("phone_auth_apply_record") -public class PhoneAuthApplyRecord implements Serializable { - private static final long serialVersionUID = 1L; - - /** - * - */ - @TableId(value = "id", type = IdType.AUTO) - private Long id; - /** - * 手机区号 - */ - private String phoneAreaCode; - /** - * 手机号 - */ - private String phone; - /** - * 授权码 - */ - private String authCode; - /** - * 授权码状态 1待审核 2通过 3拒绝 - */ - private Byte status; - /** - * 备注 - */ - private String remark; - /** - * 操作人 - */ - private String operator; - /** - * - */ - private Date createTime; - /** - * 审核更新时间 - */ - private Date updateTime; - /** - * 是否使用过该授权码 - */ - private Byte hasUsed; -} \ No newline at end of file diff --git a/accompany-base/accompany-basic/accompany-basic-sdk/src/main/java/com/accompany/core/model/phone/PhoneAuthRecord.java b/accompany-base/accompany-basic/accompany-basic-sdk/src/main/java/com/accompany/core/model/phone/PhoneAuthRecord.java deleted file mode 100644 index 56f47f0d9..000000000 --- a/accompany-base/accompany-basic/accompany-basic-sdk/src/main/java/com/accompany/core/model/phone/PhoneAuthRecord.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.accompany.core.model.phone; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - * 用户填写授权码记录表 - * - * @author lzm - * @email - * @date 2022-11-22 17:30:12 - */ -@Data -@TableName("phone_auth_record") -public class PhoneAuthRecord implements Serializable { - private static final long serialVersionUID = 1L; - - /** - * - */ - @TableId(value = "id", type = IdType.AUTO) - private Long id; - /** - * - */ - private Long uid; - /** - * 注册时使用的手机号 - */ - private String phone; - /** - * 手机号授权码 - */ - private Long authId; - /** - * 授权码 - */ - private String authCode; - /** - * 设备id - */ - private String deviceId; - /** - * 1有效 0无效 - */ - private Byte status; - /** - * - */ - private Date createTime; - /** - * - */ - private Date updateTime; - -} \ No newline at end of file diff --git a/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/mybatismapper/PhoneAuthApplyRecordMapper.java b/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/mybatismapper/PhoneAuthApplyRecordMapper.java deleted file mode 100644 index f4e22c7b5..000000000 --- a/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/mybatismapper/PhoneAuthApplyRecordMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.accompany.core.mybatismapper; - -import com.accompany.core.model.phone.PhoneAuthApplyRecord; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - * 手机授权码注册管理 - * - * @author lzm - * @email - * @date 2022-11-22 17:30:12 - */ -@Mapper -public interface PhoneAuthApplyRecordMapper extends BaseMapper { - -} \ No newline at end of file diff --git a/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/mybatismapper/PhoneAuthRecordMapper.java b/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/mybatismapper/PhoneAuthRecordMapper.java deleted file mode 100644 index 2d095437a..000000000 --- a/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/mybatismapper/PhoneAuthRecordMapper.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.accompany.core.mybatismapper; - -import com.accompany.core.model.phone.PhoneAuthRecord; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -/** - * 用户填写授权码记录表 - * - * @author lzm - * @email - * @date 2022-11-22 17:30:12 - */ -@Mapper -public interface PhoneAuthRecordMapper extends BaseMapper { - - int getDeviceIdCount(@Param("deviceId") String deviceId); -} \ No newline at end of file diff --git a/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/mybatismapper/SysConfMapper.java b/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/mybatismapper/SysConfMapper.java deleted file mode 100644 index 60e9c6ac0..000000000 --- a/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/mybatismapper/SysConfMapper.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.accompany.core.mybatismapper; - -import com.accompany.core.model.SysConf; -import com.accompany.core.model.SysConfExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface SysConfMapper { - int countByExample(SysConfExample example); - - int deleteByExample(SysConfExample example); - - int deleteByPrimaryKey(String configId); - - int insert(SysConf record); - - int insertSelective(SysConf record); - - List selectByExample(SysConfExample example); - - SysConf selectByPrimaryKey(String configId); - - int updateByExampleSelective(@Param("record") SysConf record, @Param("example") SysConfExample example); - - int updateByExample(@Param("record") SysConf record, @Param("example") SysConfExample example); - - int updateByPrimaryKeySelective(SysConf record); - - int updateByPrimaryKey(SysConf record); -} \ No newline at end of file diff --git a/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/service/phone/PhoneAuthApplyRecordService.java b/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/service/phone/PhoneAuthApplyRecordService.java deleted file mode 100644 index 132722a0e..000000000 --- a/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/service/phone/PhoneAuthApplyRecordService.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.accompany.core.service.phone; - -import com.accompany.common.device.DeviceInfo; -import com.accompany.core.model.phone.PhoneAuthApplyRecord; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * 手机授权码注册管理 - * - * @author lzm - * @email - * @date 2022-11-22 17:30:12 - */ -public interface PhoneAuthApplyRecordService extends IService { - - - void applyAuthCode(String phone, String phoneAreaCode); - - void boundAuthCode(Long uid, String authCode, DeviceInfo deviceInfo); - - Boolean isBoundPhoneAuthCode(String phone, String phoneAreaCode); - - void isVaild(String phone, String phoneAreaCode); - - Boolean isBoundPhoneAuthCode(Long uid); - - PhoneAuthApplyRecord getAuthApplyRecord(String phone, String phoneAreaCode); -} \ No newline at end of file diff --git a/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/service/phone/PhoneAuthRecordService.java b/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/service/phone/PhoneAuthRecordService.java deleted file mode 100644 index 237fcccc7..000000000 --- a/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/service/phone/PhoneAuthRecordService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.accompany.core.service.phone; - -import com.accompany.core.model.phone.PhoneAuthRecord; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * 用户填写授权码记录表 - * - * @author lzm - * @email - * @date 2022-11-22 17:30:12 - */ -public interface PhoneAuthRecordService extends IService { - -} \ No newline at end of file diff --git a/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/service/phone/impl/PhoneAuthApplyRecordServiceImpl.java b/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/service/phone/impl/PhoneAuthApplyRecordServiceImpl.java deleted file mode 100644 index 15354f45b..000000000 --- a/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/service/phone/impl/PhoneAuthApplyRecordServiceImpl.java +++ /dev/null @@ -1,338 +0,0 @@ -package com.accompany.core.service.phone.impl; - -import cn.hutool.core.util.StrUtil; -import com.accompany.common.constant.Constant; -import com.accompany.common.device.DeviceInfo; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.CommonUtil; -import com.accompany.common.utils.StringUtils; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.model.Account; -import com.accompany.core.model.Users; -import com.accompany.core.model.phone.PhoneAuthApplyRecord; -import com.accompany.core.model.phone.PhoneAuthRecord; -import com.accompany.core.mybatismapper.PhoneAuthApplyRecordMapper; -import com.accompany.core.mybatismapper.PhoneAuthRecordMapper; -import com.accompany.core.service.SysConfService; -import com.accompany.core.service.account.AccountService; -import com.accompany.core.service.common.JedisService; -import com.accompany.core.service.phone.PhoneAuthApplyRecordService; -import com.accompany.core.service.phone.PhoneAuthRecordService; -import com.accompany.core.service.user.UsersBaseService; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.apache.commons.lang.RandomStringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Date; - -/** - * 手机授权码注册管理 - * - * @author lzm - * @email - * @date 2022-11-22 17:30:12 - */ -@Service -public class PhoneAuthApplyRecordServiceImpl extends ServiceImpl implements PhoneAuthApplyRecordService { - - @Autowired - private PhoneAuthRecordMapper phoneAuthRecordMapper; - - @Autowired - private JedisService jedisService; - - @Autowired - private PhoneAuthRecordService phoneAuthRecordService; - - @Autowired - private AccountService accountService; - - @Autowired - private SysConfService sysConfService; - - @Autowired - private UsersBaseService usersBaseService; - - /** - * 密码强度检查正则，必须包括大小写字母和数字，长度为8 - */ - private static final String AUTHCODE_REGIX = "^(?=.*\\d)(?=.*[a-zA-Z]).{8}$"; - - @Override - @Transactional(rollbackFor = Exception.class, transactionManager = "mybatisplusTransactionManager") - public void applyAuthCode(String phone, String phoneAreaCode) { - if (StringUtils.isEmpty(phone)) { - throw new ServiceException(BusiStatus.PARAMETERILLEGAL); - } - - if (!phoneAreaCode.equals("86") || phone.length() != 11) { - throw new ServiceException("手機號格式不正確"); - } - - String lockeKey = RedisKey.phone_auth_apply_lock.getKey(phone); - String lockVal = jedisService.lock(lockeKey); - if (StringUtils.isEmpty(lockVal)) { - throw new ServiceException(BusiStatus.SERVERBUSY); - } - try { - PhoneAuthApplyRecord applyRecord = getAuthApplyRecord(phone, phoneAreaCode); - if (applyRecord != null) { - if (Constant.PhoneAuthApplyStatus.wait_audit.equals(applyRecord.getStatus())) { - throw new ServiceException("該手機號已提交申請，請耐心等待"); - } - if (Constant.PhoneAuthApplyStatus.pass.equals(applyRecord.getStatus())) { - throw new ServiceException("該手機號申請已通過，請查收短信哦"); - } - applyRecord.setRemark(""); - applyRecord.setOperator(""); - applyRecord.setRemark(""); - } else { - applyRecord = new PhoneAuthApplyRecord(); - applyRecord.setCreateTime(new Date()); - } - - applyRecord.setPhone(phone); - applyRecord.setAuthCode(getAuthCode()); - applyRecord.setPhoneAreaCode(phoneAreaCode); - applyRecord.setHasUsed(Constant.GlobalStatus.in_valid); - applyRecord.setStatus(Constant.PhoneAuthApplyStatus.wait_audit); - this.saveOrUpdate(applyRecord); - } finally { - jedisService.unlock(lockeKey, lockVal); - } - } - - public PhoneAuthApplyRecord getAuthApplyRecord(String phone, String phoneAreaCode) { - if (StringUtils.isEmpty(phone) || StringUtils.isEmpty(phoneAreaCode)) { - return null; - } - if (phone.startsWith(phoneAreaCode)) { - phone = phone.replaceFirst(phoneAreaCode, ""); - } - - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(PhoneAuthApplyRecord::getPhone, phone).eq(PhoneAuthApplyRecord::getPhoneAreaCode, phoneAreaCode); - return this.getOne(queryWrapper, false); - } - - @Override - @Transactional(rollbackFor = Exception.class, transactionManager = "mybatisplusTransactionManager") - public void boundAuthCode(Long uid, String authCode, DeviceInfo deviceInfo) { - if (deviceInfo == null || StringUtils.isEmpty(authCode)) { - throw new ServiceException(BusiStatus.SERVERBUSY); - } - - Account account = accountService.getAccountByUid(uid); - if (account == null) { - throw new ServiceException(BusiStatus.USERNOTEXISTS); - } - - if (StringUtils.isEmpty(account.getPhoneAreaCode())) { - throw new ServiceException(BusiStatus.PHONEINVALID); - } - - if (!Constant.CHINA_MAINLAND_PHONE_AREA_CODE.equals(account.getPhoneAreaCode())) { - throw new ServiceException("該地區暫不開放使用"); - } - - if (!CommonUtil.checkPhoneFormat(account.getPhoneAreaCode(), account.getPhone())) { - throw new ServiceException(BusiStatus.PHONEINVALID); - } - - String realPhone = account.getPhone(); - if (realPhone.startsWith(account.getPhoneAreaCode())) { - realPhone = realPhone.replaceFirst(account.getPhoneAreaCode(), ""); - } - - - String lockeKey = RedisKey.phone_auth_apply_lock.getKey(realPhone); - String lockVal = jedisService.lock(lockeKey); - if (StringUtils.isEmpty(lockVal)) { - throw new ServiceException(BusiStatus.SERVERBUSY); - } - try { - PhoneAuthApplyRecord applyRecord = getAuthApplyRecordByPhone(realPhone); - - // if (StringUtils.isNotBlank(account.getPhone()) && !realPhone.equals(account.getPhone())) { - // throw new ServiceException("當前手機已綁定其他用戶"); - // } - - if (applyRecord == null) { - throw new ServiceException("該地區暫不開放使用"); - } - - if (Constant.PhoneAuthApplyStatus.wait_audit.equals(applyRecord.getStatus())) { - throw new ServiceException("該手機號已提交申請，請耐心等待"); - } - - if (!authCode.equalsIgnoreCase(applyRecord.getAuthCode())) { - throw new ServiceException("授權碼錯誤"); - } - - int count = phoneAuthRecordMapper.getDeviceIdCount(deviceInfo.getDeviceId()); - int max = Integer.parseInt(sysConfService.getDefaultSysConfValueById(Constant.SysConfId.divide_id_bound_phone_num, "5")); - if (count >= max) { - throw new ServiceException("該設備綁定授權碼過多，無法綁定"); - } - - // 修改之前的綁定狀態 - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(PhoneAuthRecord::getPhone, realPhone).eq(PhoneAuthRecord::getStatus, Constant.GlobalStatus.valid); - PhoneAuthRecord authRecord = phoneAuthRecordService.getOne(queryWrapper, false); - if (authRecord != null) { - authRecord.setStatus(Constant.GlobalStatus.in_valid); - phoneAuthRecordService.saveOrUpdate(authRecord); - } - - // 更新使用邀請碼狀態 - applyRecord.setHasUsed(Constant.GlobalStatus.valid); - this.saveOrUpdate(applyRecord); - // 保存用戶綁定記錄 - PhoneAuthRecord record = buildPhoneAuthRecord(uid, realPhone, applyRecord.getId(), applyRecord.getAuthCode(), deviceInfo.getDeviceId()); - phoneAuthRecordService.saveOrUpdate(record); - } finally { - jedisService.unlock(lockeKey, lockVal); - } - } - - @Override - public Boolean isBoundPhoneAuthCode(String phone, String phoneAreaCode) { - if (StringUtils.isEmpty(phone) || StringUtils.isEmpty(phoneAreaCode)) { - throw new ServiceException(BusiStatus.PHONEINVALID); - } - if (!CommonUtil.checkPhoneFormat(phoneAreaCode, phone)) { - throw new ServiceException(BusiStatus.PHONEINVALID); - } - - if (!Constant.CHINA_MAINLAND_PHONE_AREA_CODE.equals(phoneAreaCode)) { - return true; - } - - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(PhoneAuthApplyRecord::getPhone, phone); - PhoneAuthApplyRecord record = this.getOne(queryWrapper, false); - if (record == null) { - throw new ServiceException("該地區暫不開放使用"); - } - if (Constant.GlobalStatus.in_valid.equals(record.getHasUsed())) { - return false; - } - return true; - } - - @Override - public void isVaild(String phone, String phoneAreaCode) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.lambda().eq(PhoneAuthApplyRecord::getPhoneAreaCode, phoneAreaCode).eq(PhoneAuthApplyRecord::getPhone, phone); - PhoneAuthApplyRecord record = this.getOne(wrapper, false); - if (record == null || Constant.PhoneAuthApplyStatus.fail.equals(record.getStatus())) { - throw new ServiceException("該地區暫不開放使用"); - } - if (Constant.PhoneAuthApplyStatus.wait_audit.equals(record.getStatus())) { - throw new ServiceException("該手機號已提交申請，請耐心等待"); - } - } - - @Override - public Boolean isBoundPhoneAuthCode(Long uid) { - if (uid == null) { - log.error("isBoundPhoneAuthCode 传入的uid为空"); - return false; - } - Account account = accountService.getAccountByUid(uid); - if (account == null) { - throw new ServiceException(BusiStatus.USERNOTEXISTS); - } - Users user = usersBaseService.getUsersByUid(uid); - if (user != null) { - return true; - } - Byte thirdLoginType = account.getThirdLoginType(); - if (thirdLoginType != null) { - return true; - } - String phoneAreaCode = account.getPhoneAreaCode(); - String phone = account.getPhone(); - if (StrUtil.isEmpty(phone)) { - return true; - } - // 非86手机直接放行 - if (!phone.startsWith(Constant.CHINA_MAINLAND_PHONE_AREA_CODE) || phone.startsWith(StrUtil.DASHED)) { - return true; - } - if (!CommonUtil.checkPhoneFormat(phoneAreaCode, phone)) { - return false; - } - String realPhone = phone; - if (realPhone.startsWith(account.getPhoneAreaCode())) { - realPhone = realPhone.replaceFirst(account.getPhoneAreaCode(), ""); - } - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(PhoneAuthApplyRecord::getPhone, realPhone); - PhoneAuthApplyRecord record = this.getOne(queryWrapper, false); - if (record == null) { - throw new ServiceException("該地區暫不開放使用"); - } - // 还未填过 - return !Constant.GlobalStatus.in_valid.equals(record.getHasUsed()); - } - - private PhoneAuthRecord buildPhoneAuthRecord(Long uid, String phone, Long authId, String authCode, String deviceId) { - PhoneAuthRecord record = new PhoneAuthRecord(); - record.setAuthId(authId); - record.setAuthCode(authCode); - record.setStatus(Constant.GlobalStatus.valid); - record.setCreateTime(new Date()); - record.setUpdateTime(new Date()); - record.setUid(uid); - record.setPhone(phone); - record.setDeviceId(deviceId); - return record; - } - - private PhoneAuthApplyRecord getAuthApplyRecordByPhone(String phone) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(PhoneAuthApplyRecord::getPhone, phone); - return this.getOne(queryWrapper, false); - } - - - public String getAuthCode() { - int digit = 8; - int codeNum = 0; - int num = 0; - String inviteCode = RandomStringUtils.randomAlphanumeric(digit).toLowerCase(); - while (!inviteCode.matches(AUTHCODE_REGIX)) { - codeNum++; - inviteCode = RandomStringUtils.randomAlphanumeric(digit).toLowerCase(); - if (codeNum == 10) { - throw new ServiceException("授權碼生成失敗"); - } - } - while (isExist(inviteCode)) { - num++; - inviteCode = RandomStringUtils.randomAlphanumeric(digit).toLowerCase(); - if (num == 10) { - throw new ServiceException("授權碼生成失敗"); - } - } - return inviteCode; - } - - /** - * 判断授权码是否存在 - * - * @param authCode - * @return - */ - private boolean isExist(String authCode) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(PhoneAuthApplyRecord::getAuthCode, authCode); - return this.getOne(queryWrapper) != null; - } - -} \ No newline at end of file diff --git a/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/service/phone/impl/PhoneAuthRecordServiceImpl.java b/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/service/phone/impl/PhoneAuthRecordServiceImpl.java deleted file mode 100644 index 38c53094a..000000000 --- a/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/service/phone/impl/PhoneAuthRecordServiceImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.accompany.core.service.phone.impl; - -import com.accompany.core.model.phone.PhoneAuthRecord; -import com.accompany.core.mybatismapper.PhoneAuthRecordMapper; -import com.accompany.core.service.phone.PhoneAuthRecordService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - * 用户填写授权码记录表 - * - * @author lzm - * @email - * @date 2022-11-22 17:30:12 - */ -@Service -public class PhoneAuthRecordServiceImpl extends ServiceImpl implements PhoneAuthRecordService { - - - -} \ No newline at end of file diff --git a/accompany-base/accompany-basic/accompany-basic-service/src/main/resources/sqlmappers/PhoneAuthApplyRecordMapper.xml b/accompany-base/accompany-basic/accompany-basic-service/src/main/resources/sqlmappers/PhoneAuthApplyRecordMapper.xml deleted file mode 100644 index 8e4535cb8..000000000 --- a/accompany-base/accompany-basic/accompany-basic-service/src/main/resources/sqlmappers/PhoneAuthApplyRecordMapper.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/accompany-base/accompany-basic/accompany-basic-service/src/main/resources/sqlmappers/PhoneAuthRecordMapper.xml b/accompany-base/accompany-basic/accompany-basic-service/src/main/resources/sqlmappers/PhoneAuthRecordMapper.xml deleted file mode 100644 index 392799450..000000000 --- a/accompany-base/accompany-basic/accompany-basic-service/src/main/resources/sqlmappers/PhoneAuthRecordMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/accompany-base/accompany-basic/accompany-basic-service/src/main/resources/sqlmappers/SysConfMapper.xml b/accompany-base/accompany-basic/accompany-basic-service/src/main/resources/sqlmappers/SysConfMapper.xml deleted file mode 100644 index c5ec8932f..000000000 --- a/accompany-base/accompany-basic/accompany-basic-service/src/main/resources/sqlmappers/SysConfMapper.xml +++ /dev/null @@ -1,237 +0,0 @@ - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - config_id, config_name, name_space, config_status, `operator`, config_value - - - - - delete from sys_conf - where config_id = #{configId,jdbcType=VARCHAR} - - - delete from sys_conf - - - - - - insert into sys_conf (config_id, config_name, name_space, config_status, - `operator`, config_value - ) - values (#{configId,jdbcType=VARCHAR}, #{configName,jdbcType=VARCHAR}, #{nameSpace,jdbcType=VARCHAR}, #{configStatus,jdbcType=TINYINT}, - #{operator,jdbcType=VARCHAR}, #{configValue,jdbcType=LONGVARCHAR} - ) - - - insert into sys_conf - - - config_id, - - - config_name, - - - name_space, - - - config_status, - - - `operator`, - - - config_value, - - - - - #{configId,jdbcType=VARCHAR}, - - - #{configName,jdbcType=VARCHAR}, - - - #{nameSpace,jdbcType=VARCHAR}, - - - #{configStatus,jdbcType=TINYINT}, - - - #{operator,jdbcType=VARCHAR}, - - - #{configValue,jdbcType=LONGVARCHAR}, - - - - - - update sys_conf - - - config_id = #{record.configId,jdbcType=VARCHAR}, - - - config_name = #{record.configName,jdbcType=VARCHAR}, - - - name_space = #{record.nameSpace,jdbcType=VARCHAR}, - - - config_status = #{record.configStatus,jdbcType=TINYINT}, - - - `operator` = #{record.operator,jdbcType=VARCHAR}, - - - config_value = #{record.configValue,jdbcType=LONGVARCHAR}, - - - - - - - - update sys_conf - set config_id = #{record.configId,jdbcType=VARCHAR}, - config_name = #{record.configName,jdbcType=VARCHAR}, - name_space = #{record.nameSpace,jdbcType=VARCHAR}, - config_status = #{record.configStatus,jdbcType=TINYINT}, - `operator` = #{record.operator,jdbcType=VARCHAR}, - config_value = #{record.configValue,jdbcType=LONGVARCHAR} - - - - - - update sys_conf - - - config_name = #{configName,jdbcType=VARCHAR}, - - - name_space = #{nameSpace,jdbcType=VARCHAR}, - - - config_status = #{configStatus,jdbcType=TINYINT}, - - - `operator` = #{operator,jdbcType=VARCHAR}, - - - config_value = #{configValue,jdbcType=LONGVARCHAR}, - - - where config_id = #{configId,jdbcType=VARCHAR} - - - update sys_conf - set config_name = #{configName,jdbcType=VARCHAR}, - name_space = #{nameSpace,jdbcType=VARCHAR}, - config_status = #{configStatus,jdbcType=TINYINT}, - `operator` = #{operator,jdbcType=VARCHAR}, - config_value = #{configValue,jdbcType=LONGVARCHAR} - where config_id = #{configId,jdbcType=VARCHAR} - - \ No newline at end of file diff --git a/accompany-base/accompany-common/src/main/java/com/accompany/common/constant/ExtendsAttach.java b/accompany-base/accompany-common/src/main/java/com/accompany/common/constant/ExtendsAttach.java deleted file mode 100644 index 6cfdb6199..000000000 --- a/accompany-base/accompany-common/src/main/java/com/accompany/common/constant/ExtendsAttach.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.accompany.common.constant; - - -/** - * Created by chucheng on 2019/2/14. - */ -public class ExtendsAttach extends Attach{ - private Integer id; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } -} diff --git a/accompany-base/accompany-common/src/main/java/com/accompany/common/utils/AssertUtil.java b/accompany-base/accompany-common/src/main/java/com/accompany/common/utils/AssertUtil.java deleted file mode 100644 index 226bdf973..000000000 --- a/accompany-base/accompany-common/src/main/java/com/accompany/common/utils/AssertUtil.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.accompany.common.utils; - - -import org.springframework.util.Assert; - - -/** - * 断言 - */ -public class AssertUtil extends Assert { - - public static void isTrue(boolean expression, RuntimeException exception) { - if (!expression) { - throw exception; - } - } -} diff --git a/accompany-base/accompany-common/src/main/java/com/accompany/common/utils/CommonCheckSumBuilder.java b/accompany-base/accompany-common/src/main/java/com/accompany/common/utils/CommonCheckSumBuilder.java deleted file mode 100644 index b2b90c739..000000000 --- a/accompany-base/accompany-common/src/main/java/com/accompany/common/utils/CommonCheckSumBuilder.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.accompany.common.utils; - -import java.security.MessageDigest; - -/** - * Created by liuguofu on 2017/4/27. - */ -public class CommonCheckSumBuilder { - // 计算并获取CheckSum - public static String getCheckSum(String appSecret, String nonce, String curTime) { - return encode("sha1", appSecret + nonce + curTime); - } - - // 计算并获取md5值 - public static String getMD5(String requestBody) { - return encode("md5", requestBody); - } - - private static String encode(String algorithm, String value) { - if (value == null) { - return null; - } - try { - MessageDigest messageDigest - = MessageDigest.getInstance(algorithm); - messageDigest.update(value.getBytes()); - return getFormattedText(messageDigest.digest()); - } catch (Exception e) { - throw new RuntimeException(e); - } - } - private static String getFormattedText(byte[] bytes) { - int len = bytes.length; - StringBuilder buf = new StringBuilder(len * 2); - for (int j = 0; j < len; j++) { - buf.append(HEX_DIGITS[(bytes[j] >> 4) & 0x0f]); - buf.append(HEX_DIGITS[bytes[j] & 0x0f]); - } - return buf.toString(); - } - private static final char[] HEX_DIGITS = { '0', '1', '2', '3', '4', '5', - '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' }; -} \ No newline at end of file diff --git a/accompany-base/accompany-common/src/main/java/com/accompany/common/utils/GameUtil.java b/accompany-base/accompany-common/src/main/java/com/accompany/common/utils/GameUtil.java deleted file mode 100644 index c410bddc8..000000000 --- a/accompany-base/accompany-common/src/main/java/com/accompany/common/utils/GameUtil.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.accompany.common.utils; - -/** - * @Author yubin - * @Description 游戏的一些常量 - * @Date 2019/1/3 下午2:17 - */ - -public class GameUtil { - - - public static final String GAME_MATCH_POOL = "game:match:pool:"; - - //异性匹配key - public static final String GAME_ISOMERISM_MATCH_POOL = "game:isomerism:match:pool"; - //异性房间内匹配key-man陪伴房 - public static final String GAME_ISOMERISM_MATCH_POOL_ROOM1V1_MAN_COMPANION = "game:isomerism:match:pool:room1v1:man:companion"; - //异性房间内匹配key-man普通房 - public static final String GAME_ISOMERISM_MATCH_POOL_ROOM1V1_MAN_GENERAL = "game:isomerism:match:pool:room1v1:man:general"; - //异性房间内匹配key-woman陪伴房 - public static final String GAME_ISOMERISM_MATCH_POOL_ROOM1V1_WOMAN_COMPANION = "game:isomerism:match:pool:room1v1:woman:companion"; - //异性房间内匹配key-woman普通房 - public static final String GAME_ISOMERISM_MATCH_POOL_ROOM1V1_WOMAN_GENERAL = "game:isomerism:match:pool:room1v1:woman:general"; - - public static final String GAME_MATCH_POOL_ROOM1v1 = "game:match:pool:room1v1:"; - - //游戏任务首胜的key - public static final String GAME_RANK_DAY_UID = "game:rank:day:%s:%d"; - - //游戏任务玩游戏数量的key - public static final String GAME_RANK_DAY_COUNT_UID = "game:rank:day:count:%s:%d"; - - //游戏任务玩游戏连胜的key - public static final String GAME_RANK_DAY_MAC_COUNT_UID = "game:rank:day:max:count:%s:%d"; - - //找玩友 男-不限 - public static final String GAME_PLAYER_MATCH_POOL_MAN_UNLIMITED = "game:player:match:pool:man:unlimited"; - //找玩友 女-不限 - public static final String GAME_PLAYER_MATCH_POOL_WOMAN_UNLIMITED = "game:player:match:pool:woman:unlimited"; - //找玩友 男-女 - public static final String GAME_PLAYER_MATCH_POOL_MAN_WOMAN = "game:player:match:pool:man:woman"; - //找玩友 男-男 - public static final String GAME_PLAYER_MATCH_POOL_MAN_MAN = "game:player:match:pool:man:man"; - //找玩友 女-男 - public static final String GAME_PLAYER_MATCH_POOL_WOMAN_MAN = "game:player:match:pool:woman:man"; - //找玩友 女-女 - public static final String GAME_PLAYER_MATCH_POOL_WOMAN_WOMAN = "game:player:match:pool:woman:woman"; - - //玩过游戏的男用户 - public static final String GAME_PLAYER_MAN_USER = "game:player:man:user"; - //玩过游戏的女用户 - public static final String GAME_PLAYER_WOMAN_USER = "game:player:woman:user"; - - //默认的喜欢玩的游戏 - public static final String GAME_USER_LIKES = "game:user:likes"; - - //用户黑名单 - public static final String GAME_USER_BALCKLIST = "game:user:balcklist"; - - - /** - * 房间外的匹配池key - * - * @param gameId - * @return - */ - public static String getGameMatchPoolKey(String gameId) { - return GAME_MATCH_POOL + gameId; - } - - /** - * 房间内1v1的匹配池key - * - * @param gameId - * @return - */ - public static String getGameMatchPoolRoom1v1Key(String gameId) { - return GAME_MATCH_POOL_ROOM1v1 + gameId; - } -} diff --git a/accompany-base/accompany-common/src/main/java/com/accompany/common/utils/MoneyUtil.java b/accompany-base/accompany-common/src/main/java/com/accompany/common/utils/MoneyUtil.java deleted file mode 100644 index 017a9b081..000000000 --- a/accompany-base/accompany-common/src/main/java/com/accompany/common/utils/MoneyUtil.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.accompany.common.utils; - -import java.math.BigDecimal; - -/** - * ｛这里添加描述｝ - * - * @author fangchengyan - * @date 2019-08-28 19:07 - */ -public class MoneyUtil { - - /** - * 将金额从分转成元 - * @param amount - * @return - */ - public static BigDecimal getAmountInYuan(Long amount) { - BigDecimal amountInFen = new BigDecimal(amount); - BigDecimal unit = new BigDecimal(100); - BigDecimal amountInYuan = amountInFen.divide(unit, 2, 2); - return amountInYuan; - } - -} diff --git a/accompany-base/accompany-common/src/main/java/com/accompany/common/utils/Snowflake.java b/accompany-base/accompany-common/src/main/java/com/accompany/common/utils/Snowflake.java deleted file mode 100644 index 90e6f44f7..000000000 --- a/accompany-base/accompany-common/src/main/java/com/accompany/common/utils/Snowflake.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.accompany.common.utils; - -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicLong; -import java.util.concurrent.locks.ReentrantLock; - - -public class Snowflake { - - public static final int NODE_SHIFT = 10; - public static final int SEQ_SHIFT = 12; - - public static final short MAX_NODE = 1024; - public static final short MAX_SEQUENCE = 4096; - - private AtomicInteger sequence = new AtomicInteger(0); - private AtomicLong referenceTime = new AtomicLong(0L); - - private int workID; - - private ReentrantLock lock = new ReentrantLock(); - - public Snowflake() { - int workID = Integer.parseInt("2"); - if (workID < 0 || workID > MAX_NODE) { - throw new IllegalArgumentException(String.format("node must be between %s and %s", 0, MAX_NODE)); - } - this.workID = workID; - } - - public long next() { - long currentTime = System.currentTimeMillis(); - long counter; - lock.lock(); - try { - if (currentTime < referenceTime.get()) { - throw new RuntimeException( - String.format("Last referenceTime %s is after reference time %s", referenceTime, currentTime)); - } else if (currentTime > referenceTime.get()) { - this.sequence.set(0); - } else { - if (this.sequence.shortValue() < Snowflake.MAX_SEQUENCE) { - this.sequence.incrementAndGet(); - } else { - throw new RuntimeException("Sequence exhausted at " + this.sequence); - } - } - counter = this.sequence.get(); - referenceTime.set(currentTime); - } finally { - lock.unlock(); - } - return currentTime << NODE_SHIFT << SEQ_SHIFT | workID << SEQ_SHIFT | counter; - } - - public static void main(String args[]){ - Snowflake Snowflake=new Snowflake(); - System.out.println(Snowflake.next()); - } -} diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/common/config/AliYunFinancialFaceConfig.java b/accompany-base/accompany-core/src/main/java/com/accompany/common/config/AliYunFinancialFaceConfig.java deleted file mode 100644 index d7f3d18ce..000000000 --- a/accompany-base/accompany-core/src/main/java/com/accompany/common/config/AliYunFinancialFaceConfig.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.accompany.common.config; - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.stereotype.Component; - -/** - * @author: liaozetao - * @date: 2024/1/10 11:29 - * @description: - */ -@Data -@Component -@ConfigurationProperties(prefix = "aliyun.financial-face") -public class AliYunFinancialFaceConfig { - - private String accessKeyId; - - private String accessKeySecret; - - private String endpoints; - - private Long sceneId; - - private String callbackUrl; - -} diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/common/config/AliyunConfig.java b/accompany-base/accompany-core/src/main/java/com/accompany/common/config/AliyunConfig.java deleted file mode 100644 index 7892617ae..000000000 --- a/accompany-base/accompany-core/src/main/java/com/accompany/common/config/AliyunConfig.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.accompany.common.config; - -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Lazy; -import org.springframework.core.annotation.Order; -import org.springframework.stereotype.Component; - -@Lazy(value = false) -@Order(-1) -@Component -@ConfigurationProperties(prefix = "aliyun") -public class AliyunConfig { - public static String appSecret; - public static String appKey; - public static String endPoint; - public static String roleArn; - public static String regionId; - public static String product; - - public void setAppSecret(String appSecret) { - AliyunConfig.appSecret = appSecret; - } - - public void setAppKey(String appKey) { - AliyunConfig.appKey = appKey; - } - - public void setEndPoint(String endPoint) { - AliyunConfig.endPoint = endPoint; - } - - public void setRoleArn(String roleArn) { - AliyunConfig.roleArn = roleArn; - } - - public void setRegionId(String regionId) { - AliyunConfig.regionId = regionId; - } - - public void setProduct(String product) { - AliyunConfig.product = product; - } -} diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/common/config/AliyunRPCertifyConfig.java b/accompany-base/accompany-core/src/main/java/com/accompany/common/config/AliyunRPCertifyConfig.java deleted file mode 100644 index a92d44b50..000000000 --- a/accompany-base/accompany-core/src/main/java/com/accompany/common/config/AliyunRPCertifyConfig.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.accompany.common.config; - -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.stereotype.Component; - -/** - * @author yangziwen - * @description 阿里云实人认证配置类 - * @date 2019-01-24 - */ -@Component -@ConfigurationProperties(prefix = "aliyun.certification") -public class AliyunRPCertifyConfig { - - public static String regionId; - public static String accessKeyId; - public static String accessKeySecret; - public static String bizCode; - - public void setRegionId(String regionId) { - AliyunRPCertifyConfig.regionId = regionId; - } - - public void setAccessKeyId(String accessKeyId) { - AliyunRPCertifyConfig.accessKeyId = accessKeyId; - } - - public void setAccessKeySecret(String accessKeySecret) { - AliyunRPCertifyConfig.accessKeySecret = accessKeySecret; - } - - public void setBizCode(String bizCode) { - AliyunRPCertifyConfig.bizCode = bizCode; - } -} diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/common/constant/ActRankTypeEnum.java b/accompany-base/accompany-core/src/main/java/com/accompany/common/constant/ActRankTypeEnum.java deleted file mode 100644 index 04f994be3..000000000 --- a/accompany-base/accompany-core/src/main/java/com/accompany/common/constant/ActRankTypeEnum.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.accompany.common.constant; - -import java.util.Arrays; -import java.util.Optional; - -/** - * Created By LeeNana on 2019/5/29. - */ -public enum ActRankTypeEnum { - RANK_RICH((byte) 1, "rich", "土豪榜"), - RANK_CHARM ((byte) 2, "charm", "明星榜"), - RANK_ROOM ((byte) 3, "room", "房间榜"), - RANK_MALE ((byte) 4, "male", "男神榜"), - RANK_FEMALE ((byte) 5, "female", "女神榜"), - RANK_TASK_NUM ((byte) 6, "task_num", "年中活动任务达人累计完成榜"), - RANK_SHINING((byte) 7, "shining","闪耀主播热度榜"), - RANK_FANS((byte) 8, "fans","吸粉狂人粉丝榜"), - RANK_LIKE((byte) 9, "like","声音瓶子心动值榜"), - ; - - private byte value; - - private String key; - - private String desc; - - ActRankTypeEnum(byte value, String key, String desc) { - this.value = value; - this.key = key; - this.desc = desc; - } - - public byte getValue() { - return value; - } - - public String getKey() { - return key; - } - - public String getDesc() { - return desc; - } - - public static ActRankTypeEnum getByValue(byte value) { - Optional result = Arrays.stream(ActRankTypeEnum.values()).filter(rankTypeEnum -> - rankTypeEnum.value == value).findAny(); - if (result.isPresent()) { - return result.get(); - } - throw new RuntimeException("类型不匹配!"); - } -} diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/common/constant/ActTypeEnum.java b/accompany-base/accompany-core/src/main/java/com/accompany/common/constant/ActTypeEnum.java deleted file mode 100644 index 83f5d3584..000000000 --- a/accompany-base/accompany-core/src/main/java/com/accompany/common/constant/ActTypeEnum.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.accompany.common.constant; - -import java.util.Arrays; -import java.util.Optional; - -/** - * Created By LeeNana on 2019/6/28. - */ -public enum ActTypeEnum { - SPRING_FESTIVAL((byte)5, "spring_festival","春节活动"), - VALENTINE((byte)6, "valentine","情人节活动"), - WOMENDAY((byte)7, "womenday","少女节"), - PLANTINGTREES((byte)8, "plantingtrees","植树节"), - MIDYEAR((byte)9, "midyear","年中活动"), - VOICEBOTTLE((byte)10, "voice_bottle","声音瓶子活动"), - ANNUAL_CEREMONY((byte)11, "annual_ceremony", "2019年年度盛典"), - ; - private byte value; - - private String key; - - private String desc; - - ActTypeEnum(byte value, String key, String desc) { - this.value = value; - this.key = key; - this.desc = desc; - } - - public byte getValue() { - return value; - } - - public String getKey() { - return key; - } - - public String getDesc() { - return desc; - } - - public static ActTypeEnum getByValue(byte value) { - Optional result = Arrays.stream(ActTypeEnum.values()).filter(actTypeEnum -> - actTypeEnum.value == value).findAny(); - if (result.isPresent()) { - return result.get(); - } - throw new RuntimeException("类型不匹配!"); - } -} diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/common/constant/Constant.java b/accompany-base/accompany-core/src/main/java/com/accompany/common/constant/Constant.java index eded944d5..3991efb13 100644 --- a/accompany-base/accompany-core/src/main/java/com/accompany/common/constant/Constant.java +++ b/accompany-base/accompany-core/src/main/java/com/accompany/common/constant/Constant.java @@ -158,6 +158,15 @@ public class Constant { public static int Version = 49; public static int ForceUpdateVersion = 491;//强更全服消息 + public static int WelfareLottery = 91; // 福利彩票 + public static int WelfareLotteryGiftRoomNotify = 910; // 福利彩票礼物房间飘屏通知 + public static int WelfareLotteryGiftAllRoomNotify = 911; // 福利彩票礼物全服飘屏通知 + public static int WelfareLotteryGiftServerNotify = 912; // 福利彩票礼物全服飘屏通知 + public static int WelfareLotteryRoomNotify = 914; // 福利彩票礼物房间飘屏通知 + public static int WelfareLotteryServerNotify = 915; // 福利彩票礼物全服飘屏通知 + + public static int PlayTogether = 96; // 一起玩消息 + // --------------- 红包自定义消息类型 --------------------- public static int RedPackage = 60; // 红包消息 public static int ReceiveRoomGift = 601; // 房间内礼物红包 @@ -2608,7 +2617,7 @@ public class Constant { * banner跳转页 */ - public static class OperationSmsStatus { + public static class SmsTemplateType { /** * 待发送 **/ @@ -2623,13 +2632,6 @@ public class Constant { public static final int ERROR = 3; } - public static class SmsTemplateType { - /** - * 运营类短信 - **/ - public static final int OPERATION = 1; - } - public static class UserStatus { public static final int NORMAL = 0; // 正常 public static final int FROZEN = 1; // 冻结 @@ -3071,10 +3073,8 @@ public class Constant { * 召唤战斗活动榜单类型 */ public static class ActCallBattleRankType { - // 钻石榜 - public static final Integer DIAMOND_RANK = 1; - // 欧皇榜 - public static final Integer LUCKY_MAN_RANK = 2; + public static final Integer GOLD_CONSUME = 1; // 金币消耗榜 + public static final Integer GOLD_WIN = 2; // 金币中奖榜 } /** @@ -3809,16 +3809,6 @@ public class Constant { public static final String INDEX_MSG = "歡迎來到平台，在這裏你可以遇到很多有才有藝的Ta，快來聽聽看，不信你不心動哦~"; } - public static class SingleRoomRankType { - // 新用户送礼榜 - public static final Integer NEW_USER_SEND_GIFT = 1; - // 加入粉丝团榜单 - public static final Integer JOIN_FANS_USER = 2; - // 开播时长榜单 - public static final Integer OPNE_TIME = 3; - - } - public static class SingleRoomSortStatus { public static final Byte DEL = 0; public static final Byte NOT_DEL = 1; diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/common/constant/PaymentConstant.java b/accompany-base/accompany-core/src/main/java/com/accompany/common/constant/PaymentConstant.java deleted file mode 100644 index c33500cca..000000000 --- a/accompany-base/accompany-core/src/main/java/com/accompany/common/constant/PaymentConstant.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.accompany.common.constant; - -import java.math.BigDecimal; - -/** - * @author yangziwen - * @description - * @date 2018/4/20 16:43 - */ -public class PaymentConstant { - - /** 钻石兑换现金利率 */ - public static final BigDecimal DIAMOND_EXCHANGE_CASH_RATE = new BigDecimal(0.1); - - /** 现金兑换钻石利率*/ - public static final BigDecimal CASH_EXCHANGE_DIAMOND_RATE = new BigDecimal(10); - - /**金币兑换现金利率*/ - public static final BigDecimal GOLD_EXCHANGE_CASH_RATE = new BigDecimal(0.1); - - /**购买凭证验证地址*/ - public static final String IOS_PAY_CERTIFY_URL = "https://buy.itunes.apple.com/verifyReceipt"; - - /**测试的购买凭证验证地址*/ - public static final String IOS_PAY_CERTIFY_URL_TEST = "https://sandbox.itunes.apple.com/verifyReceipt"; - - public static class TransferChannel { - //支付宝 - public static final String ALIPAY = "alipay"; - //微信 - public static final String WX = "wx"; - //微信公众号 - public static final String WX_PUB = "wx_pub"; - //微信小程序 - public static final String WX_LITE = "wx_lite"; - //银联电子代付 - public static final String UNIONPAY = "unionpay"; - //通联代付 - public static final String ALLINPAY = "allinpay"; - //京东代付 - public static final String JDPAY = "jdpay"; - //余额 - public static final String BALANCE = "balance"; - } - - /** - * 付款类型，转账到个人用户为 b2c，转账到企业用户为 b2b（wx、wx_pub、wx_lite 和 balance 渠道的企业付款，仅支持 b2c）。 - */ - public static class TransferType { - public static final String B2C = "b2c"; - public static final String B2B = "b2b"; - } - - public static class Currency{ - public static final String CNY = "cny"; - } - - public static class ChargeStatus{ - public static final Byte PAYING = 1; - public static final Byte PAIED = 2; - public static final Byte EXCEPTION = 3; - public static final Byte TIMEOUT = 4; - } - -} diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/common/constant/SmsConstant.java b/accompany-base/accompany-core/src/main/java/com/accompany/common/constant/SmsConstant.java index b1ea09a83..2205254cd 100644 --- a/accompany-base/accompany-core/src/main/java/com/accompany/common/constant/SmsConstant.java +++ b/accompany-base/accompany-core/src/main/java/com/accompany/common/constant/SmsConstant.java @@ -42,15 +42,6 @@ public class SmsConstant { public static final Byte AUTH_CODE = 13; // 获取手机授权码 } - /** - * 阿里云短信返回码 - */ - public static class AliyunSmsResponseCode { - - public static final String OK = "OK"; - public static final String BUSINESS_LIMIT_CONTROL = "isv.BUSINESS_LIMIT_CONTROL"; - } - public interface ResCode { String OK = "Ok"; diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/common/model/GamePlayer.java b/accompany-base/accompany-core/src/main/java/com/accompany/common/model/GamePlayer.java deleted file mode 100644 index 18270d82f..000000000 --- a/accompany-base/accompany-core/src/main/java/com/accompany/common/model/GamePlayer.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.accompany.common.model; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - -/** - * @Author yubin - * @Description 玩家信息 - * @Date 2019/1/3 下午2:56 - */ - -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class GamePlayer implements Serializable{ - - /** - * 用户uid - */ - private Long uid; - - /** - * 用户昵称 - */ - private String nick; - - /** - * 用户性别，1 男 2 女 - */ - private Byte gender; - - /** - * 头像 - */ - private String avatar; - - /** - * 用户创建的匹配房间 - */ - private Long roomId; - - /** - * 游戏地址 - */ - private String gameUrl; - - /** - * 开始匹配的时间 - */ - private Long startMatchTime; -} diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/common/redis/RedisKey.java b/accompany-base/accompany-core/src/main/java/com/accompany/common/redis/RedisKey.java index fcc69bb2a..4188e9703 100644 --- a/accompany-base/accompany-core/src/main/java/com/accompany/common/redis/RedisKey.java +++ b/accompany-base/accompany-core/src/main/java/com/accompany/common/redis/RedisKey.java @@ -1116,7 +1116,6 @@ public enum RedisKey { clan_apply_join, //模厅申请加入家族 lock_clan_apply, - phone_auth_apply_lock,// 申请手机授权码锁 area_code_cash,// 区号缓存 clan_gold_exchange_record_lock, //公会金币兑换锁 diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/common/support/BeanSelfAware.java b/accompany-base/accompany-core/src/main/java/com/accompany/common/support/BeanSelfAware.java deleted file mode 100644 index 39a78c504..000000000 --- a/accompany-base/accompany-core/src/main/java/com/accompany/common/support/BeanSelfAware.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.accompany.common.support; - -/** - * Created by PaperCut on 2018/4/27. - */ -public interface BeanSelfAware { - void setBeanSelf(Object self); -} diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/common/support/InjectBeanSelfBeanPostProcessor.java b/accompany-base/accompany-core/src/main/java/com/accompany/common/support/InjectBeanSelfBeanPostProcessor.java deleted file mode 100644 index 772c88b01..000000000 --- a/accompany-base/accompany-core/src/main/java/com/accompany/common/support/InjectBeanSelfBeanPostProcessor.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.accompany.common.support; - -import org.springframework.aop.support.AopUtils; -import org.springframework.beans.BeansException; -import org.springframework.beans.factory.config.BeanPostProcessor; -import org.springframework.context.ApplicationContext; -import org.springframework.context.ApplicationContextAware; - -/** - * Created by PaperCut on 2018/4/27. - */ -public class InjectBeanSelfBeanPostProcessor implements BeanPostProcessor, ApplicationContextAware{ - private ApplicationContext applicationContext; - - @Override - public Object postProcessBeforeInitialization(Object o, String s) throws BeansException { - return o; - } - - @Override - public Object postProcessAfterInitialization(Object o, String s) throws BeansException { - if(o instanceof BeanSelfAware) { - BeanSelfAware self = (BeanSelfAware)o; - if(AopUtils.isAopProxy(o)) { - self.setBeanSelf(o); - } else { - self.setBeanSelf(applicationContext.getBean(s)); - } - } - return o; - } - - @Override - public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { - this.applicationContext = applicationContext; - } -} diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/common/utils/AccounUtil.java b/accompany-base/accompany-core/src/main/java/com/accompany/common/utils/AccounUtil.java deleted file mode 100644 index 2e70ecb9a..000000000 --- a/accompany-base/accompany-core/src/main/java/com/accompany/common/utils/AccounUtil.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.accompany.common.utils; - -/** - * 账号工具 - * - * @author linuxea - * @date 2019/8/14 11:43 - */ -public class AccounUtil { - - /** - * 检测是否为手机号 - * - * @param string 匹配字符串 - * @return 是否为手机号 - */ - public static Boolean isPhone(String string) { - return StringUtils.isNotBlank(string) && string.length() == 11; - } -} diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/core/annotation/LogTime.java b/accompany-base/accompany-core/src/main/java/com/accompany/core/annotation/LogTime.java deleted file mode 100644 index 92497cc0a..000000000 --- a/accompany-base/accompany-core/src/main/java/com/accompany/core/annotation/LogTime.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.accompany.core.annotation; - -import java.lang.annotation.*; - -/** - * 记录执行时间 - * - * @author linuxea - * @date 2019/8/14 16:08 - */ -@Target(value = {ElementType.METHOD, ElementType.TYPE}) -@Retention(RetentionPolicy.RUNTIME) -@Inherited -@Documented -public @interface LogTime { -} diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/core/annotation/LogTimeAspect.java b/accompany-base/accompany-core/src/main/java/com/accompany/core/annotation/LogTimeAspect.java deleted file mode 100644 index c29cd6d75..000000000 --- a/accompany-base/accompany-core/src/main/java/com/accompany/core/annotation/LogTimeAspect.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.accompany.core.annotation; - -import org.aspectj.lang.ProceedingJoinPoint; -import org.aspectj.lang.annotation.Around; -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Pointcut; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.core.env.Environment; -import org.springframework.stereotype.Component; - -import javax.annotation.PostConstruct; -import java.util.Arrays; -import java.util.stream.Collectors; - -@Aspect -@Component -public class LogTimeAspect { - - private static final Logger log = LoggerFactory.getLogger(LogTimeAspect.class); - - private boolean open = false; - - @Autowired - private Environment environment; - - @PostConstruct - private void init() { - open = Arrays.stream(environment.getActiveProfiles()) - .anyMatch(x -> "native".equals(x) || "dev".equals(x) || "development".equals(x)); - } - - @Pointcut("@annotation(com.accompany.core.annotation.LogTime) || @within(com.accompany.core.annotation.LogTime)") - private void pointCut() { - } - - @Around("pointCut()") - public Object aroundAdvice(ProceedingJoinPoint proceedingJoinPoint) throws Throwable { - if (!open) { - return proceedingJoinPoint.proceed(); - } - long startAt = System.currentTimeMillis(); - String args = Arrays.stream(proceedingJoinPoint.getArgs()) - .map(Object::toString) - .collect(Collectors.joining(",")); - Object result = proceedingJoinPoint.proceed(); - long spentTime = System.currentTimeMillis() - startAt; - String resultStr = result != null ? result.toString() : "void"; - log.info("\n执行方法：{}\n参数:{}\n结果：{}\n时间 : {} 毫秒\n", - proceedingJoinPoint.getSignature().toLongString(), args, resultStr, spentTime); - return result; - } -} diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/core/dto/SysConfDto.java b/accompany-base/accompany-core/src/main/java/com/accompany/core/dto/SysConfDto.java deleted file mode 100644 index 3828ff56e..000000000 --- a/accompany-base/accompany-core/src/main/java/com/accompany/core/dto/SysConfDto.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.accompany.core.dto; - -public class SysConfDto { - private String configId; - - private String configName; - - private String configValue; - - private String nameSpace; - - private Byte configStatus; - - public String getConfigId() { - return configId; - } - - public void setConfigId(String configId) { - this.configId = configId == null ? null : configId.trim(); - } - - public String getConfigName() { - return configName; - } - - public void setConfigName(String configName) { - this.configName = configName == null ? null : configName.trim(); - } - - public String getConfigValue() { - return configValue; - } - - public void setConfigValue(String configValue) { - this.configValue = configValue == null ? null : configValue.trim(); - } - - public String getNameSpace() { - return nameSpace; - } - - public void setNameSpace(String nameSpace) { - this.nameSpace = nameSpace == null ? null : nameSpace.trim(); - } - - public Byte getConfigStatus() { - return configStatus; - } - - public void setConfigStatus(Byte configStatus) { - this.configStatus = configStatus; - } -} \ No newline at end of file diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/core/model/SysConfExample.java b/accompany-base/accompany-core/src/main/java/com/accompany/core/model/SysConfExample.java deleted file mode 100644 index fec857d4d..000000000 --- a/accompany-base/accompany-core/src/main/java/com/accompany/core/model/SysConfExample.java +++ /dev/null @@ -1,630 +0,0 @@ -package com.accompany.core.model; - -import java.util.ArrayList; -import java.util.List; - -public class SysConfExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - private Integer limit; - - private Integer offset; - - public SysConfExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - public void setLimit(Integer limit) { - this.limit = limit; - } - - public Integer getLimit() { - return limit; - } - - public void setOffset(Integer offset) { - this.offset = offset; - } - - public Integer getOffset() { - return offset; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andConfigIdIsNull() { - addCriterion("config_id is null"); - return (Criteria) this; - } - - public Criteria andConfigIdIsNotNull() { - addCriterion("config_id is not null"); - return (Criteria) this; - } - - public Criteria andConfigIdEqualTo(String value) { - addCriterion("config_id =", value, "configId"); - return (Criteria) this; - } - - public Criteria andConfigIdNotEqualTo(String value) { - addCriterion("config_id <>", value, "configId"); - return (Criteria) this; - } - - public Criteria andConfigIdGreaterThan(String value) { - addCriterion("config_id >", value, "configId"); - return (Criteria) this; - } - - public Criteria andConfigIdGreaterThanOrEqualTo(String value) { - addCriterion("config_id >=", value, "configId"); - return (Criteria) this; - } - - public Criteria andConfigIdLessThan(String value) { - addCriterion("config_id <", value, "configId"); - return (Criteria) this; - } - - public Criteria andConfigIdLessThanOrEqualTo(String value) { - addCriterion("config_id <=", value, "configId"); - return (Criteria) this; - } - - public Criteria andConfigIdLike(String value) { - addCriterion("config_id like", value, "configId"); - return (Criteria) this; - } - - public Criteria andConfigIdNotLike(String value) { - addCriterion("config_id not like", value, "configId"); - return (Criteria) this; - } - - public Criteria andConfigIdIn(List values) { - addCriterion("config_id in", values, "configId"); - return (Criteria) this; - } - - public Criteria andConfigIdNotIn(List values) { - addCriterion("config_id not in", values, "configId"); - return (Criteria) this; - } - - public Criteria andConfigIdBetween(String value1, String value2) { - addCriterion("config_id between", value1, value2, "configId"); - return (Criteria) this; - } - - public Criteria andConfigIdNotBetween(String value1, String value2) { - addCriterion("config_id not between", value1, value2, "configId"); - return (Criteria) this; - } - - public Criteria andConfigNameIsNull() { - addCriterion("config_name is null"); - return (Criteria) this; - } - - public Criteria andConfigNameIsNotNull() { - addCriterion("config_name is not null"); - return (Criteria) this; - } - - public Criteria andConfigNameEqualTo(String value) { - addCriterion("config_name =", value, "configName"); - return (Criteria) this; - } - - public Criteria andConfigNameNotEqualTo(String value) { - addCriterion("config_name <>", value, "configName"); - return (Criteria) this; - } - - public Criteria andConfigNameGreaterThan(String value) { - addCriterion("config_name >", value, "configName"); - return (Criteria) this; - } - - public Criteria andConfigNameGreaterThanOrEqualTo(String value) { - addCriterion("config_name >=", value, "configName"); - return (Criteria) this; - } - - public Criteria andConfigNameLessThan(String value) { - addCriterion("config_name <", value, "configName"); - return (Criteria) this; - } - - public Criteria andConfigNameLessThanOrEqualTo(String value) { - addCriterion("config_name <=", value, "configName"); - return (Criteria) this; - } - - public Criteria andConfigNameLike(String value) { - addCriterion("config_name like", value, "configName"); - return (Criteria) this; - } - - public Criteria andConfigNameNotLike(String value) { - addCriterion("config_name not like", value, "configName"); - return (Criteria) this; - } - - public Criteria andConfigNameIn(List values) { - addCriterion("config_name in", values, "configName"); - return (Criteria) this; - } - - public Criteria andConfigNameNotIn(List values) { - addCriterion("config_name not in", values, "configName"); - return (Criteria) this; - } - - public Criteria andConfigNameBetween(String value1, String value2) { - addCriterion("config_name between", value1, value2, "configName"); - return (Criteria) this; - } - - public Criteria andConfigNameNotBetween(String value1, String value2) { - addCriterion("config_name not between", value1, value2, "configName"); - return (Criteria) this; - } - - public Criteria andConfigValueIsNull() { - addCriterion("config_value is null"); - return (Criteria) this; - } - - public Criteria andConfigValueIsNotNull() { - addCriterion("config_value is not null"); - return (Criteria) this; - } - - public Criteria andConfigValueEqualTo(String value) { - addCriterion("config_value =", value, "configValue"); - return (Criteria) this; - } - - public Criteria andConfigValueNotEqualTo(String value) { - addCriterion("config_value <>", value, "configValue"); - return (Criteria) this; - } - - public Criteria andConfigValueGreaterThan(String value) { - addCriterion("config_value >", value, "configValue"); - return (Criteria) this; - } - - public Criteria andConfigValueGreaterThanOrEqualTo(String value) { - addCriterion("config_value >=", value, "configValue"); - return (Criteria) this; - } - - public Criteria andConfigValueLessThan(String value) { - addCriterion("config_value <", value, "configValue"); - return (Criteria) this; - } - - public Criteria andConfigValueLessThanOrEqualTo(String value) { - addCriterion("config_value <=", value, "configValue"); - return (Criteria) this; - } - - public Criteria andConfigValueLike(String value) { - addCriterion("config_value like", value, "configValue"); - return (Criteria) this; - } - - public Criteria andConfigValueNotLike(String value) { - addCriterion("config_value not like", value, "configValue"); - return (Criteria) this; - } - - public Criteria andConfigValueIn(List values) { - addCriterion("config_value in", values, "configValue"); - return (Criteria) this; - } - - public Criteria andConfigValueNotIn(List values) { - addCriterion("config_value not in", values, "configValue"); - return (Criteria) this; - } - - public Criteria andConfigValueBetween(String value1, String value2) { - addCriterion("config_value between", value1, value2, "configValue"); - return (Criteria) this; - } - - public Criteria andConfigValueNotBetween(String value1, String value2) { - addCriterion("config_value not between", value1, value2, "configValue"); - return (Criteria) this; - } - - public Criteria andNameSpaceIsNull() { - addCriterion("name_space is null"); - return (Criteria) this; - } - - public Criteria andNameSpaceIsNotNull() { - addCriterion("name_space is not null"); - return (Criteria) this; - } - - public Criteria andNameSpaceEqualTo(String value) { - addCriterion("name_space =", value, "nameSpace"); - return (Criteria) this; - } - - public Criteria andNameSpaceNotEqualTo(String value) { - addCriterion("name_space <>", value, "nameSpace"); - return (Criteria) this; - } - - public Criteria andNameSpaceGreaterThan(String value) { - addCriterion("name_space >", value, "nameSpace"); - return (Criteria) this; - } - - public Criteria andNameSpaceGreaterThanOrEqualTo(String value) { - addCriterion("name_space >=", value, "nameSpace"); - return (Criteria) this; - } - - public Criteria andNameSpaceLessThan(String value) { - addCriterion("name_space <", value, "nameSpace"); - return (Criteria) this; - } - - public Criteria andNameSpaceLessThanOrEqualTo(String value) { - addCriterion("name_space <=", value, "nameSpace"); - return (Criteria) this; - } - - public Criteria andNameSpaceLike(String value) { - addCriterion("name_space like", value, "nameSpace"); - return (Criteria) this; - } - - public Criteria andNameSpaceNotLike(String value) { - addCriterion("name_space not like", value, "nameSpace"); - return (Criteria) this; - } - - public Criteria andNameSpaceIn(List values) { - addCriterion("name_space in", values, "nameSpace"); - return (Criteria) this; - } - - public Criteria andNameSpaceNotIn(List values) { - addCriterion("name_space not in", values, "nameSpace"); - return (Criteria) this; - } - - public Criteria andNameSpaceBetween(String value1, String value2) { - addCriterion("name_space between", value1, value2, "nameSpace"); - return (Criteria) this; - } - - public Criteria andNameSpaceNotBetween(String value1, String value2) { - addCriterion("name_space not between", value1, value2, "nameSpace"); - return (Criteria) this; - } - - public Criteria andConfigStatusIsNull() { - addCriterion("config_status is null"); - return (Criteria) this; - } - - public Criteria andConfigStatusIsNotNull() { - addCriterion("config_status is not null"); - return (Criteria) this; - } - - public Criteria andConfigStatusEqualTo(Byte value) { - addCriterion("config_status =", value, "configStatus"); - return (Criteria) this; - } - - public Criteria andConfigStatusNotEqualTo(Byte value) { - addCriterion("config_status <>", value, "configStatus"); - return (Criteria) this; - } - - public Criteria andConfigStatusGreaterThan(Byte value) { - addCriterion("config_status >", value, "configStatus"); - return (Criteria) this; - } - - public Criteria andConfigStatusGreaterThanOrEqualTo(Byte value) { - addCriterion("config_status >=", value, "configStatus"); - return (Criteria) this; - } - - public Criteria andConfigStatusLessThan(Byte value) { - addCriterion("config_status <", value, "configStatus"); - return (Criteria) this; - } - - public Criteria andConfigStatusLessThanOrEqualTo(Byte value) { - addCriterion("config_status <=", value, "configStatus"); - return (Criteria) this; - } - - public Criteria andConfigStatusIn(List values) { - addCriterion("config_status in", values, "configStatus"); - return (Criteria) this; - } - - public Criteria andConfigStatusNotIn(List values) { - addCriterion("config_status not in", values, "configStatus"); - return (Criteria) this; - } - - public Criteria andConfigStatusBetween(Byte value1, Byte value2) { - addCriterion("config_status between", value1, value2, "configStatus"); - return (Criteria) this; - } - - public Criteria andConfigStatusNotBetween(Byte value1, Byte value2) { - addCriterion("config_status not between", value1, value2, "configStatus"); - return (Criteria) this; - } - - public Criteria andOperatorIsNull() { - addCriterion("`operator` is null"); - return (Criteria) this; - } - - public Criteria andOperatorIsNotNull() { - addCriterion("`operator` is not null"); - return (Criteria) this; - } - - public Criteria andOperatorEqualTo(String value) { - addCriterion("`operator` =", value, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorNotEqualTo(String value) { - addCriterion("`operator` <>", value, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorGreaterThan(String value) { - addCriterion("`operator` >", value, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorGreaterThanOrEqualTo(String value) { - addCriterion("`operator` >=", value, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorLessThan(String value) { - addCriterion("`operator` <", value, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorLessThanOrEqualTo(String value) { - addCriterion("`operator` <=", value, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorLike(String value) { - addCriterion("`operator` like", value, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorNotLike(String value) { - addCriterion("`operator` not like", value, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorIn(List values) { - addCriterion("`operator` in", values, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorNotIn(List values) { - addCriterion("`operator` not in", values, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorBetween(String value1, String value2) { - addCriterion("`operator` between", value1, value2, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorNotBetween(String value1, String value2) { - addCriterion("`operator` not between", value1, value2, "operator"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/accompany-base/accompany-core/src/main/resources/META-INF/spring.factories b/accompany-base/accompany-core/src/main/resources/META-INF/spring.factories deleted file mode 100644 index c31ac1a30..000000000 --- a/accompany-base/accompany-core/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ \ No newline at end of file diff --git a/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/constant/PayChannelConstant.java b/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/constant/PayChannelConstant.java deleted file mode 100644 index f45b0c520..000000000 --- a/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/constant/PayChannelConstant.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.accompany.payment.constant; - -/** - * @author: liaozetao - * @date: 2023/12/26 15:25 - * @description: - */ -public interface PayChannelConstant { - - String PAYER_MAX = "payermax"; - - String MY_CARD = "MyCard"; -} diff --git a/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/constant/PayConstant.java b/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/constant/PayConstant.java index 8295e6a56..4ba75c82d 100644 --- a/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/constant/PayConstant.java +++ b/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/constant/PayConstant.java @@ -9,101 +9,6 @@ import java.math.BigDecimal; */ public class PayConstant { - /** - * 支付宝数据格式(仅支持JSON格式) - */ - public static final String ALIPAY_FORMAT = "JSON"; - /** - * 支付宝请求编码格式(统一使用UTF-8) - */ - public static final String ALIPAY_CHATSET = "UTF-8"; - /** - * 支付宝签名方式* - */ - public static final String ALIPAY_SIGN_TYPE = "RSA2"; - /** - * 支付宝收款方账户类型(统一使用账号方式) - */ - public static final String ALIPAY_PAYEE_TYPE = "ALIPAY_LOGONID"; - /** - * 支付宝转账成功返回码* - */ - public static final String ALIPAY_TRANSFER_SUCCESS_CODE = "10000"; - - /** - * 微信交易方式 - */ - public static class WxTradeType { - /** - * 公众号支付 - */ - public static String JSAPI = "JSAPI"; - /** - * 扫码支付 - */ - public static String NATIVE = "NATIVE"; - /** - * APP支付 - */ - public static String APP = "APP"; - /** - * 网页支付 - */ - public static String MWEB = "MWEB"; - } - - /** - * 阿里支付的产品销售码(固定值) - */ - public static class alipayProdCode { - /** - * app支付 - */ - public static final String QUICK_MSECURITY_PAY = "QUICK_MSECURITY_PAY"; - - /** - * 网页支付 - */ - public static final String QUICK_WAP_WAY = "QUICK_WAP_WAY"; - } - - /** - * 支付宝回调支付状态* - */ - public static class AlipayTradeStatus { - - public static String TRADE_SUCCESS = "TRADE_SUCCESS"; - - public static String TRADE_FINISHED = "TRADE_FINISHED"; - } - - /** - * 微信回调支付结果* - */ - public static class WeChatTradeStatus { - - public static String TRADE_SUCCESS = "SUCCESS"; - - public static String TRADE_FAIL = "FAIL"; - } - - /** - * 第三方支付渠道类型 - */ - public static class PayType { - /** - * 原生支付* - */ - public static final byte nativepay = (byte) 1; - /** - * 汇聚支付* - */ - public static final byte joinpay = (byte) 2; - /** - * 汇卡支付* - */ - public static final byte huikaPay = (byte) 3; - } public static final BigDecimal HUNDRED = new BigDecimal("100"); @@ -122,22 +27,4 @@ public class PayConstant { */ public final static String H5_PAY_ERBANNO_FIELD = "erbanNo"; - /** - * 支付实体切换模式 - */ - public final static class AgentChangeMode { - /** - * 手动 模式1 - */ - public final static String MANUAL = "manual"; - - /** - * 自动 模式2 - */ - public final static String AUTO = "auto"; - } - - public interface MyCardReturnCode { - String SUCCESS = "1"; - } } diff --git a/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/BaseResult.java b/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/BaseResult.java deleted file mode 100644 index 59504cbee..000000000 --- a/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/BaseResult.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.accompany.payment.mycard; - -import cn.hutool.core.util.StrUtil; -import com.accompany.payment.constant.PayConstant; -import com.alibaba.fastjson.annotation.JSONField; -import lombok.Data; - -/** - * @author: liaozetao - * @date: 2023/12/25 15:24 - * @description: - */ -@Data -public class BaseResult { - - /** - * 授權結果代碼 - * 1 為成功 - * 其他則為失敗 - */ - @JSONField(name = "ReturnCode") - private String returnCode; - - /** - * ReturnCode 訊息描述 - */ - @JSONField(name = "ReturnMsg") - private String returnMsg; - - public boolean isSuccess() { - return StrUtil.isNotEmpty(returnCode) && returnCode.equals(PayConstant.MyCardReturnCode.SUCCESS); - } -} diff --git a/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/dto/CallbackDto.java b/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/dto/CallbackDto.java deleted file mode 100644 index 992250dce..000000000 --- a/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/dto/CallbackDto.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.accompany.payment.mycard.dto; - -import com.accompany.payment.mycard.BaseResult; -import com.alibaba.fastjson.annotation.JSONField; -import lombok.Data; - -/** - * @author: liaozetao - * @date: 2023/12/26 16:14 - * @description: - */ -@Data -public class CallbackDto extends BaseResult { - - /** - * 交易結果代碼 - * 交易成功為 3; 交易失敗為 0 - */ - @JSONField(name = "PayResult") - private String payResult; - - /** - * 廠商交易序號 - */ - @JSONField(name = "FacTradeSeq") - private String facTradeSeq; - - /** - * 付費方式 - */ - @JSONField(name = "PaymentType") - private String paymentType; - - /** - * 金額 - */ - @JSONField(name = "Amount") - private String amount; - - /** - * 幣別 - */ - @JSONField(name = "Currency") - private String currency; - - /** - * 1.PaymentType = INGAME 時，傳 MyCard 卡 - * 片號碼 - * 2.PaymentType = COSTPOINT 時，傳會員扣 - * 點交易序號，格式為 CGM 開頭+數字 - * 3.其餘 PaymentType 為 Billing 小額付款交 - * 易，傳 Billing 交易序號 - * 若 BILLING 為卡片儲值時，此欄位傳 MyCard 卡片號碼 - * 特別注意: 交易時，同一個 MyCard 卡片號 - * 碼、會員扣點交易序號和 Billing 交易序號 - * 只能被儲值成功一次，請廠商留意，以免 - * 造成重複儲值的情形。 - */ - @JSONField(name = "MyCardTradeNo") - private String myCardTradeNo; - - /** - * 通路代碼 - * PaymentType = INGAME 時才有值 - * 介接時額外提供代碼對照表 - */ - @JSONField(name = "MyCardType") - private String myCardType; - - /** - * 活動代碼 - * 配合促銷活動辨識使用。 - */ - @JSONField(name = "PromoCode") - private String promoCode; - - /** - * 驗證碼 - */ - @JSONField(name = "Hash") - private String hash; - -} diff --git a/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/dto/ReplenishDto.java b/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/dto/ReplenishDto.java deleted file mode 100644 index 41bbbc156..000000000 --- a/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/dto/ReplenishDto.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.accompany.payment.mycard.dto; - -import com.accompany.payment.mycard.BaseResult; -import com.alibaba.fastjson.annotation.JSONField; -import lombok.Data; - -import java.util.List; - -/** - * @author: liaozetao - * @date: 2023/12/26 14:11 - * @description: - */ -@Data -public class ReplenishDto extends BaseResult { - - /** - * 廠商服務代碼 - * 由 MyCard 編列 - */ - @JSONField(name = "FacServiceId") - private String facServiceId; - - /** - * 交易筆數 - */ - @JSONField(name = "TotalNum") - private Integer totalNum; - - /** - * 廠商交易序號 - */ - @JSONField(name = "FacTradeSeq") - private List facTradeSeq; -} diff --git a/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/enums/PaymentTypeEnum.java b/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/enums/PaymentTypeEnum.java deleted file mode 100644 index 5d54d993b..000000000 --- a/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/enums/PaymentTypeEnum.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.accompany.payment.mycard.enums; - -/** - * @author: liaozetao - * @date: 2023/12/25 14:33 - * @description: - */ -public enum PaymentTypeEnum { - - //卡片儲值 - INGAME, - - //會員扣點 - COSTPOINT; - -} diff --git a/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/params/AuthCodeParam.java b/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/params/AuthCodeParam.java deleted file mode 100644 index c18cff1cf..000000000 --- a/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/params/AuthCodeParam.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.accompany.payment.mycard.params; - -import com.alibaba.fastjson.annotation.JSONField; -import lombok.Data; - -/** - * @author: liaozetao - * @date: 2023/12/25 17:56 - * @description: - */ -@Data -public class AuthCodeParam { - - /** - * 交易授权码 - */ - @JSONField(name = "AuthCode") - private String authCode; -} diff --git a/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/params/AuthGlobalParam.java b/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/params/AuthGlobalParam.java deleted file mode 100644 index 4b45e7c54..000000000 --- a/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/params/AuthGlobalParam.java +++ /dev/null @@ -1,148 +0,0 @@ -package com.accompany.payment.mycard.params; - -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.annotation.JSONField; -import lombok.Data; - -/** - * @author: liaozetao - * @date: 2023/12/25 11:19 - * @description: - */ -@Data -public class AuthGlobalParam { - - /** - * 廠商服務代碼 - */ - @JSONField(name = "FacServiceId") - private String facServiceId = StrUtil.EMPTY; - - /** - * 廠商交易序號 - * 廠商自訂，每筆訂單編號不得 - * 重覆，為訂單資料 key 值 - * 只能用英數、底線(_)及連字號 (-) - */ - @JSONField(name = "FacTradeSeq") - private String facTradeSeq = StrUtil.EMPTY; - - /** - * 遊戲代碼 - * 不可輸入中文 - * 僅允許 0-9 a-z A-Z . _ -# $ % & - * * ~ : / ^ ! + @ - */ - @JSONField(name = "FacGameId") - private String facGameId = StrUtil.EMPTY; - - /** - * 遊戲名稱 - * 不可以輸入' < > "其他皆可 - */ - @JSONField(name = "FacGameName") - private String facGameName = StrUtil.EMPTY; - - /** - * 交易模式 - * 1:Android SDK (手遊適用) - * 2:WEB - */ - @JSONField(name = "TradeType") - private String tradeType = String.valueOf(2); - - /** - * 伺服器代號 - * 用戶在廠商端的伺服器編號 - * 不可輸入中文 - * 僅允許 0-9 a-z A-Z . _ - - */ - @JSONField(name = "ServerId") - private String serverId = StrUtil.EMPTY; - - /** - * 會員代號 - * 用戶在廠商端的會員唯一識別 - * 編號 - * 僅允許 0-9 a-z A-Z . _ -# $ % & - * * ~ : / ^ ! + @ - */ - @JSONField(name = "CustomerId") - private String customerId = StrUtil.EMPTY; - - /** - * 付費方式 / 付費方式群組代 - * 碼 - * 參閱 4.1 付費方式和品項代碼 - * 查詢 - * 此參數非必填，參數為空時將 - * 依交易金額(Amount)和幣別 - * (Currency)判斷可用的付費方式 - * 呈現給用戶選擇 - */ - @JSONField(name = "PaymentType") - private String paymentType = StrUtil.EMPTY; - - /** - * 品項代碼 - * 參閱 4.1 付費方式和品項代碼 - * 查詢 - * 此參數非必填，參數為空時將 - * 依交易金額(Amount)和幣別 - * (Currency)判斷可用的付費方式 - * 呈現給用戶選擇 - */ - @JSONField(name = "ItemCode") - private String itemCode = StrUtil.EMPTY; - - /** - * 產品名稱 - * 用戶所購買的產品名稱如遊戲 - * 鑽石商品，禮包、月卡；中文 - * 字及全型符號一個字算兩個字 - * 元 不可以輸入 ' < > 其他皆可 - * (EX:鑽石 150、禮包 150、月卡 150) - */ - @JSONField(name = "ProductName") - private String productName = StrUtil.EMPTY; - - /** - * 交易金額 - * 可以為整數，若有小數點最多 - * 2 位 - */ - @JSONField(name = "Amount") - private String amount = StrUtil.EMPTY; - - /** - * TWD/HKD/USD - */ - @JSONField(name = "Currency") - private String currency = StrUtil.EMPTY; - - /** - * 是否為測試環境 - */ - @JSONField(name = "SandBoxMode") - private String sandBoxMode = Boolean.FALSE.toString(); - - /** - * 廠商回傳網址 - * 「FacReturnURL」參數回傳有 - * 值，會以此 URL 為交易最終通 - * 知的主要網址；反之，則抓取 - * MyCard 後端設定網址。 - * 不可以輸入 ' < > 其他皆可 - * 如果網址有多個參數使用&作 - * 串聯，需先進行 urlencode 後傳 - * 送 - */ - @JSONField(name = "FacReturnURL") - private String facReturnURL = StrUtil.EMPTY; - - /** - * 驗證碼 - */ - @JSONField(name = "Hash") - private String hash = StrUtil.EMPTY; -} diff --git a/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/params/FacServiceIdParam.java b/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/params/FacServiceIdParam.java deleted file mode 100644 index ffeeb63d6..000000000 --- a/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/params/FacServiceIdParam.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.accompany.payment.mycard.params; - -import com.alibaba.fastjson.annotation.JSONField; -import lombok.Data; - -/** - * @author: liaozetao - * @date: 2023/12/27 15:27 - * @description: - */ -@Data -public class FacServiceIdParam { - - /** - * 廠商服務代碼 - */ - @JSONField(name = "FacServiceId") - private String facServiceId; -} diff --git a/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/resp/AuthGlobalResp.java b/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/resp/AuthGlobalResp.java deleted file mode 100644 index 42cc197ae..000000000 --- a/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/resp/AuthGlobalResp.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.accompany.payment.mycard.resp; - -import com.accompany.payment.mycard.BaseResult; -import com.alibaba.fastjson.annotation.JSONField; -import lombok.Data; - -/** - * @author: liaozetao - * @date: 2023/12/25 15:26 - * @description: - */ -@Data -public class AuthGlobalResp extends BaseResult { - - /** - * 交易授權碼 - * 交易授權碼長度不固定，記錄至資料庫時， - * 建議設置欄位長度為 VARCHAR(256) - */ - @JSONField(name = "AuthCode") - private String authCode; - - /** - * MyCard 交易序號 - */ - @JSONField(name = "TradeSeq") - private String tradeSeq; - - /** - * 儲值服務的使用者介面: 1: server-side; 2: web-side - * 當交易模式為 WEB 即 TradeType 為 2 和付費 - * 方式為卡片儲值即 PaymentType 為 INGAME - * 時，需判斷該值。 若 InGameSaveType=1，CP 需自行開發儲值 - * 的頁面，並於用戶輸入 MyCard 卡號密碼後 - * 執行步驟 3.5 - */ - @JSONField(name = "InGameSaveType") - private String inGameSaveType; - - /** - * 導頁至 MyCard 交易網址 - * ReturnCode 為 1 成功才會有值 - */ - @JSONField(name = "TransactionUrl") - private String transactionUrl; - - /** - * 成功回调地址 - */ - private String successUrl; - - /** - * 失败回调地址 - */ - private String failureUrl; -} diff --git a/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/resp/ItemResp.java b/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/resp/ItemResp.java deleted file mode 100644 index d5839d18c..000000000 --- a/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/resp/ItemResp.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.accompany.payment.mycard.resp; - -import com.alibaba.fastjson.annotation.JSONField; -import lombok.Data; - -/** - * @author: liaozetao - * @date: 2023/12/27 12:06 - * @description: - */ -@Data -public class ItemResp { - - /** - * 卡片儲值品項代碼 - */ - @JSONField(name = "ItemCode") - private String itemCode; - - /** - * 卡片儲值品項代碼描述 - */ - @JSONField(name = "ItemCodeDesc") - private String itemCodeDesc; - - /** - * 卡片儲值品項交易型態 - * 1:任意點;2:固定點 - */ - @JSONField(name = "TradePointType") - private String tradePointType; - - /** - * 可交易金額 - * TradePointType = 1 表示可交易金額上限值 - */ - @JSONField(name = "Amount") - private String amount; - - /** - * 幣別 - */ - @JSONField(name = "Currency") - private String currency; - - /** - * 交易金額下限值 - */ - @JSONField(name = "MinimumPrice") - private String minimumPrice; -} diff --git a/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/resp/PayItemQueryResp.java b/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/resp/PayItemQueryResp.java deleted file mode 100644 index 745d97b55..000000000 --- a/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/resp/PayItemQueryResp.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.accompany.payment.mycard.resp; - -import com.accompany.payment.mycard.BaseResult; -import com.alibaba.fastjson.annotation.JSONField; -import lombok.Data; - -import java.util.List; - -/** - * @author: liaozetao - * @date: 2023/12/27 12:14 - * @description: - */ -@Data -public class PayItemQueryResp extends BaseResult { - - /** - * 卡片儲值大項 - */ - @JSONField(name = "IngameItems") - private List inGameItems; - - /** - * 會員扣點大項 - */ - @JSONField(name = "MemberItems") - private List memberItems; - - /** - * 小額付費大項 - */ - @JSONField(name = "BillingItems") - private List billingItems; - -} diff --git a/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/resp/PaymentTypeResp.java b/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/resp/PaymentTypeResp.java deleted file mode 100644 index 3540830b7..000000000 --- a/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/resp/PaymentTypeResp.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.accompany.payment.mycard.resp; - -import com.alibaba.fastjson.annotation.JSONField; -import lombok.Data; - -import java.util.List; - -/** - * @author: liaozetao - * @date: 2023/12/27 12:09 - * @description: - */ -@Data -public class PaymentTypeResp { - - /** - * 小額付費付費方式代碼 - */ - @JSONField(name = "PaymentType") - private String paymentType; - - /** - * 小額付費付費方式代碼描述 - */ - @JSONField(name = "PaymentTypeDesc") - private String paymentTypeDesc; - - /** - * 小額付費付費方式群組代碼 - */ - @JSONField(name = "PaymentGroup") - private String paymentGroup; - - /** - * 小額付費付費方式群組代碼描述 - */ - @JSONField(name = "PaymentGroupDesc") - private String paymentGroupDesc; - - /** - * 项目列表 - */ - @JSONField(name = "ItemList") - private List itemList; -} diff --git a/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/resp/QueryOrderResp.java b/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/resp/QueryOrderResp.java deleted file mode 100644 index 2ac5691fc..000000000 --- a/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/resp/QueryOrderResp.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.accompany.payment.mycard.resp; - -import com.alibaba.fastjson.annotation.JSONField; -import lombok.Data; - -/** - * @author: liaozetao - * @date: 2023/12/26 14:22 - * @description: - */ -@Data -public class QueryOrderResp { - - /** - * 付費方式 - */ - @JSONField(name = "PaymentType") - private String paymentType; - - /** - * MyCard 交易序號 - */ - @JSONField(name = "TradeSeq") - private String tradeSeq; - - /** - * 1.PaymentType = INGAME 時，傳 MyCard 卡 - * 片號碼 - * 2.PaymentType = COSTPOINT 時，傳會員扣 - * 點交易序號，格式為 CGM 開頭+數字 - * 3.其餘 PaymentType 為 Billing 小額付款交 - * 易，傳 Billing 交易序號 - * 若 BILLING 為卡片儲值時，此欄位傳 MyCard 卡片號碼 - * 特別注意: 交易時，同一個 MyCard 卡片號 - * 碼、會員扣點交易序號和 Billing 交易序號 - * 只能被儲值成功一次，請廠商留意，以免 - * 造成重複儲值的情形。 - */ - @JSONField(name = "MyCardTradeNo") - private String myCardTradeNo; - - /** - * 廠商交易序號 - */ - @JSONField(name = "FacTradeSeq") - private String facTradeSeq; - - - /** - * 會員代號 - * 用戶在廠商端的會員唯一識別 - * 編號 - * 僅允許 0-9 a-z A-Z . _ -# $ % & - * * ~ : / ^ ! + @ - */ - @JSONField(name = "CustomerId") - private String customerId; - - /** - * 金額 - */ - @JSONField(name = "Amount") - private String amount; - - /** - * 幣別 - */ - @JSONField(name = "Currency") - private String currency; - - /** - * 交易成功時間(UTC+8) - * yyyy-mm-ddThr:mi:se(24 小時制) - */ - @JSONField(name = "TradeDateTime") - private String tradeDateTime; - - /** - * 創立帳號時間 - */ - @JSONField(name = "CreateAccountDateTime") - private String createAccountDateTime; - - /** - * 創立帳號 IP - */ - @JSONField(name = "CreateAccountIP") - private String createAccountIP; -} diff --git a/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/resp/TradeQueryResp.java b/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/resp/TradeQueryResp.java deleted file mode 100644 index 932d6245d..000000000 --- a/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/mycard/resp/TradeQueryResp.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.accompany.payment.mycard.resp; - -import com.accompany.payment.mycard.BaseResult; -import com.alibaba.fastjson.annotation.JSONField; -import lombok.Data; - -/** - * @author: liaozetao - * @date: 2023/12/25 17:44 - * @description: - */ -@Data -public class TradeQueryResp extends BaseResult { - - /** - * 交易結果代碼 - * 交易成功為 3;交易失敗為 0 - */ - @JSONField(name = "PayResult") - private String payResult; - - /** - * 廠商交易序號 - */ - @JSONField(name = "FacTradeSeq") - private String facTradeSeq; - - /** - * 付費方式 - */ - @JSONField(name = "PaymentType") - private String paymentType; - - /** - * 金額 - */ - @JSONField(name = "Amount") - private String amount; - - /** - * 幣別 - */ - @JSONField(name = "Currency") - private String currency; - - /** - * 1.PaymentType = INGAME 時，傳 MyCard 卡 - * 片號碼 - * 2.PaymentType = COSTPOINT 時，傳會員扣 - * 點交易序號，格式為 CGM 開頭+數字 - * 3.其餘 PaymentType 為 Billing 小額付款交 - * 易，傳 Billing 交易序號 - * 若 BILLING 為卡片儲值時，此欄位傳 MyCard 卡片號碼 - * 特別注意: 交易時，同一個 MyCard 卡片號 - * 碼、會員扣點交易序號和 Billing 交易序號 - * 只能被儲值成功一次，請廠商留意，以免 - * 造成重複儲值的情形。 - */ - @JSONField(name = "MyCardTradeNo") - private String myCardTradeNo; - - /** - * 通路代碼 - * PaymentType = INGAME 時才有值 - * 若 BILLING 為卡片儲值時，此欄位也會有值 - * 介接時額外提供代碼對照表 - */ - @JSONField(name = "MyCardType") - private String myCardType; - - /** - * 活動代碼 - * 配合促銷活動辨識使用。 - */ - @JSONField(name = "PromoCode") - private String promoCode; - - /** - * MyCard 交易序號 - */ - @JSONField(name = "TradeSeq") - private String tradeSeq; - - /** - * 訂閱代碼 - */ - @JSONField(name = "SerialId") - private String SerialId; -} diff --git a/accompany-base/accompany-payment/accompany-payment-service/src/main/java/com/accompany/payment/mycard/MyCardService.java b/accompany-base/accompany-payment/accompany-payment-service/src/main/java/com/accompany/payment/mycard/MyCardService.java deleted file mode 100644 index 00d06dc53..000000000 --- a/accompany-base/accompany-payment/accompany-payment-service/src/main/java/com/accompany/payment/mycard/MyCardService.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.accompany.payment.mycard; - -import cn.hutool.core.util.StrUtil; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.EnvComponent; -import com.accompany.core.dto.HttpForm; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.util.OkHttpUtils; -import com.accompany.payment.constant.PayConstant; -import com.accompany.payment.mycard.config.MyCardConfig; -import com.accompany.payment.mycard.params.AuthCodeParam; -import com.accompany.payment.mycard.params.AuthGlobalParam; -import com.accompany.payment.mycard.params.FacServiceIdParam; -import com.accompany.payment.mycard.resp.AuthGlobalResp; -import com.accompany.payment.mycard.resp.PayItemQueryResp; -import com.accompany.payment.mycard.resp.TradeQueryResp; -import com.alibaba.fastjson.JSONObject; -import lombok.SneakyThrows; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.codec.digest.DigestUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.validation.constraints.NotNull; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -/** - * @author: liaozetao - * @date: 2023/12/25 11:11 - * @description: - */ -@Slf4j -@Service -public class MyCardService { - - /** - * 交易授权码 - */ - private static final String AUTH_GLOBAL = "/MyBillingPay/v1.2/AuthGlobal"; - - /** - * 验证MyCard交易结果 - */ - private static final String TRADE_QUERY = "/MyBillingPay/v1.2/TradeQuery"; - - /** - * 付費方式和品項代碼查詢 - */ - private static final String PAY_ITEM_QUERY = "/MyBillingPay/v1.2/PayItemQuery2"; - - /** - * 確認 MyCard 交易，並進行請款 - */ - private static final String PAYMENT_CONFIRM = "/MyBillingPay/v1.2/PaymentConfirm"; - - @Autowired - private MyCardConfig myCardConfig; - - @Autowired - private EnvComponent envComponent; - - @SneakyThrows - public AuthGlobalResp authGlobal(String facTradeSeq, String serverId, String customerId, String paymentType, String itemCode, String productName, String amount, String currency) { - AuthGlobalParam param = new AuthGlobalParam(); - param.setFacServiceId(myCardConfig.getFacServiceId()); - param.setFacGameId(myCardConfig.getFacGameId()); - param.setFacGameName(myCardConfig.getFacGameName()); - param.setFacTradeSeq(facTradeSeq); - param.setServerId(serverId); - param.setCustomerId(customerId); - param.setPaymentType(paymentType); - param.setItemCode(itemCode); - param.setProductName(productName); - param.setAmount(amount); - param.setCurrency(currency); - param.setSandBoxMode(envComponent.getDevEnv().toString()); - //生成Hash - String preHashValue = param.getFacServiceId() + param.getFacTradeSeq() + param.getFacGameId() + param.getFacGameName() + param.getTradeType() + param.getServerId() + param.getCustomerId() + param.getPaymentType() + param.getItemCode() + param.getProductName() + param.getAmount() + param.getCurrency() + param.getSandBoxMode() + param.getFacReturnURL() + myCardConfig.getSecretKey(); - String encodeHashValue = URLEncoder.encode(preHashValue, StandardCharsets.UTF_8.name()).toLowerCase(); - String hash = DigestUtils.sha256Hex(encodeHashValue).replaceAll(StrUtil.DASHED, StrUtil.EMPTY).toLowerCase(); - param.setHash(hash); - List params = buildParams(param); - String result = OkHttpUtils.postWithForm(myCardConfig.getDomain() + AUTH_GLOBAL, params); - log.info("serverId : {}, customerId : {}, result : {}", serverId, customerId, result); - AuthGlobalResp response = JSONObject.parseObject(result, AuthGlobalResp.class); - //检查响应体 - checkResponseBody(response); - return response; - } - - public TradeQueryResp tradeQuery(String authCode) { - AuthCodeParam param = new AuthCodeParam(); - param.setAuthCode(authCode); - List params = buildParams(param); - String result = OkHttpUtils.postWithForm(myCardConfig.getDomain() + TRADE_QUERY, params); - log.info("tradeQuery authCode : {}, result : {}", authCode, result); - TradeQueryResp response = JSONObject.parseObject(result, TradeQueryResp.class); - checkResponseBody(response); - return response; - } - - public PayItemQueryResp payItemQuery(String facServiceId) { - FacServiceIdParam param = new FacServiceIdParam(); - param.setFacServiceId(facServiceId); - List params = buildParams(param); - String result = OkHttpUtils.postWithForm(myCardConfig.getDomain() + PAY_ITEM_QUERY, params); - log.info("payItemQuery facServiceId : {}, result : {}", facServiceId, result); - PayItemQueryResp response = JSONObject.parseObject(result, PayItemQueryResp.class); - checkResponseBody(response); - return response; - } - - public TradeQueryResp paymentConfirm(String authCode) { - AuthCodeParam param = new AuthCodeParam(); - param.setAuthCode(authCode); - List params = buildParams(param); - String result = OkHttpUtils.postWithForm(myCardConfig.getDomain() + PAYMENT_CONFIRM, params); - log.info("paymentConfirm authCode : {}, result : {}", authCode, result); - TradeQueryResp response = JSONObject.parseObject(result, TradeQueryResp.class); - checkResponseBody(response); - return response; - } - - /** - * 构建参数 - * - * @param param - * @return - */ - @NotNull - private static List buildParams(Object param) { - List params = new ArrayList<>(); - JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(param)); - for (Map.Entry entry : jsonObject.entrySet()) { - HttpForm form = new HttpForm(); - form.setName(entry.getKey()); - Object value = entry.getValue(); - if (value != null) { - form.setValue(value.toString()); - } - params.add(form); - } - log.info("params : {}", jsonObject.toJSONString()); - return params; - } - - /** - * 校验返回结果 - * - * @param response - */ - private void checkResponseBody(BaseResult response) { - String returnCode = response.getReturnCode(); - String returnMsg = response.getReturnMsg(); - log.info("returnCode : {}, returnMsg : {}", returnCode, returnMsg); - //成功 - switch (returnCode) { - case PayConstant.MyCardReturnCode.SUCCESS: - //參數有誤 - break; - case "MBP001": - throw new ServiceException(BusiStatus.PARAMERROR); - case "MBP002": - throw new ServiceException(BusiStatus.SERVERBUSY); - case "MBP003": - throw new ServiceException(BusiStatus.PARAMETERILLEGAL); - case "MBP004": - throw new ServiceException(returnMsg); - case "MBP005": - throw new ServiceException(BusiStatus.SERVERERROR); - case "MBP098": - throw new ServiceException(BusiStatus.INVALID_REQUEST); - case "MBP099": - throw new ServiceException(BusiStatus.INVALID_REQUEST); - } - } - -} diff --git a/accompany-base/accompany-payment/accompany-payment-service/src/main/java/com/accompany/payment/mycard/config/MyCardConfig.java b/accompany-base/accompany-payment/accompany-payment-service/src/main/java/com/accompany/payment/mycard/config/MyCardConfig.java deleted file mode 100644 index 2f5816cbb..000000000 --- a/accompany-base/accompany-payment/accompany-payment-service/src/main/java/com/accompany/payment/mycard/config/MyCardConfig.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.accompany.payment.mycard.config; - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.stereotype.Component; - -/** - * @author: liaozetao - * @date: 2023/12/25 10:45 - * @description: - */ -@Component -@ConfigurationProperties("mycard") -@Data -public class MyCardConfig { - - /** - * 域名 - */ - private String domain; - - /** - * 厂商服务代码 - */ - private String facServiceId; - - /** - * 游戏代码 - */ - private String facGameId; - - /** - * 游戏名称 - */ - private String facGameName; - - /** - * 厂商key - */ - private String secretKey; -} diff --git a/accompany-base/accompany-payment/accompany-payment-service/src/main/java/com/accompany/payment/strategy/MyCardStrategy.java b/accompany-base/accompany-payment/accompany-payment-service/src/main/java/com/accompany/payment/strategy/MyCardStrategy.java deleted file mode 100644 index e4e23a3aa..000000000 --- a/accompany-base/accompany-payment/accompany-payment-service/src/main/java/com/accompany/payment/strategy/MyCardStrategy.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.accompany.payment.strategy; - -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.StrUtil; -import com.accompany.common.constant.Constant; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.base.UidContextHolder; -import com.accompany.core.exception.ServiceException; -import com.accompany.payment.annotation.PayChannelSupport; -import com.accompany.payment.constant.ChargeUserLimitConstant; -import com.accompany.payment.constant.PayConstant; -import com.accompany.payment.mapper.ChargeChannelMapper; -import com.accompany.payment.model.ChargeChannel; -import com.accompany.payment.model.ChargeProd; -import com.accompany.payment.model.ChargeRecord; -import com.accompany.payment.mycard.MyCardService; -import com.accompany.payment.mycard.resp.AuthGlobalResp; -import com.accompany.payment.service.ChargeUserLimitService; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * @author: liaozetao - * @date: 2023/12/25 16:47 - * @description: - */ -@Slf4j -@Service -@PayChannelSupport(Constant.ChargeChannel.my_card) -public class MyCardStrategy extends AbstractPayStrategy { - - @Autowired - private ChargeChannelMapper chargeChannelMapper; - - @Autowired - private ChargeUserLimitService chargeUserLimitService; - - @Autowired - private MyCardService myCardService; - - @Override - public Object pay(PayContext context) throws Exception { - //渠道黑名單 - chargeUserLimitService.chargeLimitCheck(UidContextHolder.get(), ChargeUserLimitConstant.LIMIT_TYPE_OF_H5); - //发起充值 - ChargeRecord chargeRecord = context.getChargeRecord(); - ChargeProd chargeProd = context.getChargeProd(); - String country = chargeProd.getCountry(); - String payChannel = chargeProd.getPayChannel(); - String chargeRecordId = chargeRecord.getChargeRecordId(); - Long uid = chargeRecord.getUid(); - String productName = null != chargeProd.getChargeGoldNum() && chargeProd.getChargeGoldNum() > 0L ? - chargeProd.getChargeGoldNum() + "鉆石" : - chargeProd.getProdName(); - String amount = BigDecimal.valueOf(chargeRecord.getLocalAmount()).divide(Constant.HUNDRED, 2, RoundingMode.HALF_UP).toString(); - String currency = chargeRecord.getLocalCurrencyCode(); - List chargeChannels = chargeChannelMapper.selectList(Wrappers.lambdaQuery() - .eq(ChargeChannel::getRegionCode, country) - .eq(ChargeChannel::getPayChannel, payChannel) - .eq(ChargeChannel::getPaymentType, chargeProd.getPaymentType())); - if (CollectionUtil.isEmpty(chargeChannels)) { - throw new ServiceException(BusiStatus.PAYMENT_FAIL); - } - String[] paymentArray = chargeProd.getPaymentType().split(StrUtil.UNDERLINE); - String paymentType = StrUtil.EMPTY; - if (paymentArray.length > 0) { - paymentType = paymentArray[0]; - } - String itemCode = StrUtil.EMPTY; - if (paymentArray.length > 1) { - itemCode = paymentArray[1]; - ChargeChannel chargeChannel = chargeChannels.get(0); - List specialValues = chargeChannel.getSpecialValues(); - if (CollectionUtil.isNotEmpty(specialValues)) { - itemCode += amount.split("\\.")[0]; - } - } - //获取myCard的授权码和H5支付页面地址 - String failureUrl = context.getFailureUrl(); - if (failureUrl.contains("?")) { - failureUrl += "&"; - } else { - failureUrl += "?"; - } - failureUrl = failureUrl + "chargeRecordId=" + chargeRecordId; - AuthGlobalResp authGlobalResp = myCardService.authGlobal(chargeRecordId, String.valueOf(uid), String.valueOf(uid), paymentType, itemCode, productName, amount, currency); - authGlobalResp.setSuccessUrl(failureUrl); - authGlobalResp.setFailureUrl(failureUrl); - chargeRecord.setExtra(authGlobalResp.getAuthCode()); - chargeRecord.setMetadata(JSONObject.toJSONString(authGlobalResp)); - Map map = new HashMap<>(); - map.put(PayConstant.H5_PAY_URL_FIELD, authGlobalResp.getTransactionUrl()); - return map; - } - -} diff --git a/accompany-base/accompany-payment/accompany-payment-service/src/main/resources/mapper/ChargeRecordMapperMgr.xml b/accompany-base/accompany-payment/accompany-payment-service/src/main/resources/mapper/ChargeRecordMapperMgr.xml index fafdbf29b..36d8b171f 100644 --- a/accompany-base/accompany-payment/accompany-payment-service/src/main/resources/mapper/ChargeRecordMapperMgr.xml +++ b/accompany-base/accompany-payment/accompany-payment-service/src/main/resources/mapper/ChargeRecordMapperMgr.xml @@ -54,7 +54,6 @@ - @@ -181,7 +180,6 @@ max(CASE a.channel WHEN 'payermax' THEN a.amount ELSE 0 END ) payermax, max(CASE a.channel WHEN 'razer' THEN a.amount ELSE 0 END ) razer, max(CASE a.channel WHEN 'v5pay' THEN a.amount ELSE 0 END ) v5pay, - max(CASE a.channel WHEN 'MyCard' THEN a.amount ELSE 0 END ) my_card, max(CASE a.channel WHEN 'start_pay' THEN a.amount ELSE 0 END ) start_pay, max(CASE a.channel WHEN 'companyAccount' THEN a.amount ELSE 0 END ) companyAccount, convert(sum(a.amount),decimal(10,2)) as totalAmount @@ -201,7 +199,6 @@ max(CASE a.channel WHEN 'payermax' THEN a.count ELSE 0 END ) payermaxCount, max(CASE a.channel WHEN 'razer' THEN a.count ELSE 0 END ) razerCount, max(CASE a.channel WHEN 'v5pay' THEN a.count ELSE 0 END ) v5payCount, - max(CASE a.channel WHEN 'MyCard' THEN a.count ELSE 0 END ) myCardCount, max(CASE a.channel WHEN 'start_pay' THEN a.amount ELSE 0 END ) start_pay, max(CASE a.channel WHEN 'companyAccount' THEN a.count ELSE 0 END ) companyAccountCount, SUM(a.count) as totalCount diff --git a/accompany-base/accompany-sms/accompany-sms-sdk/src/main/java/com/accompany/sms/config/AliyunSmsConfig.java b/accompany-base/accompany-sms/accompany-sms-sdk/src/main/java/com/accompany/sms/config/AliyunSmsConfig.java deleted file mode 100644 index 0d97abce3..000000000 --- a/accompany-base/accompany-sms/accompany-sms-sdk/src/main/java/com/accompany/sms/config/AliyunSmsConfig.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.accompany.sms.config; - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.cloud.context.config.annotation.RefreshScope; -import org.springframework.context.annotation.Configuration; - -import java.util.Map; - - -/** - * @author chucheng - * @date 2019-08-16 - * @description 阿里云短信配置 - */ -@Data -@RefreshScope -@Configuration -@ConfigurationProperties(prefix = "aliyun.sms") -public class AliyunSmsConfig { - - private String accessKeyId; - private String accessKeySecret; - private String signName; - private String templateCode; - private String authSuccessTemplateCode; // 手机授权码 - 申请成功 - private String authFailTemplateCode; // 手机授权码 - 申请失败 - private String product; - private String domain; - private String regionId; - private String notifySignName; - private Map appSignNameDic; - /** 国际、港澳台短信配置 **/ - private String intlSignName; - private String intlTemplateCode; -} diff --git a/accompany-base/accompany-sms/accompany-sms-sdk/src/main/java/com/accompany/sms/enums/SmsTypeEnum.java b/accompany-base/accompany-sms/accompany-sms-sdk/src/main/java/com/accompany/sms/enums/SmsTypeEnum.java index 8e4c393b7..ee25537eb 100644 --- a/accompany-base/accompany-sms/accompany-sms-sdk/src/main/java/com/accompany/sms/enums/SmsTypeEnum.java +++ b/accompany-base/accompany-sms/accompany-sms-sdk/src/main/java/com/accompany/sms/enums/SmsTypeEnum.java @@ -7,7 +7,6 @@ package com.accompany.sms.enums; */ public enum SmsTypeEnum { - ALIYUN, TENCENT; } diff --git a/accompany-base/accompany-sms/accompany-sms-sdk/src/main/java/com/accompany/sms/result/AliyunSmsRet.java b/accompany-base/accompany-sms/accompany-sms-sdk/src/main/java/com/accompany/sms/result/AliyunSmsRet.java deleted file mode 100644 index a524fee25..000000000 --- a/accompany-base/accompany-sms/accompany-sms-sdk/src/main/java/com/accompany/sms/result/AliyunSmsRet.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.accompany.sms.result; - -/** - * 阿里云短信返回结果 - * - * @author xiaoyuyou - * @date 2018/10/29 11:32 - */ -public class AliyunSmsRet { - - private String code; - private String message; - private String bizId; - - private String requestId; - - public String getRequestId() { - return requestId; - } - - public void setRequestId(String requestId) { - this.requestId = requestId; - } - - public String getCode() { - return code; - } - - public void setCode(String code) { - this.code = code; - } - - public String getBizId() { - return bizId; - } - - public void setBizId(String bizId) { - this.bizId = bizId; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } -} diff --git a/accompany-base/accompany-sms/accompany-sms-service/src/main/java/com/accompany/sms/service/AliyunSmsService.java b/accompany-base/accompany-sms/accompany-sms-service/src/main/java/com/accompany/sms/service/AliyunSmsService.java deleted file mode 100644 index 8ef8cc121..000000000 --- a/accompany-base/accompany-sms/accompany-sms-service/src/main/java/com/accompany/sms/service/AliyunSmsService.java +++ /dev/null @@ -1,144 +0,0 @@ -package com.accompany.sms.service; - -import cn.hutool.core.util.StrUtil; -import com.accompany.common.constant.Constant; -import com.accompany.common.constant.SmsConstant; -import com.accompany.common.device.DeviceInfo; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.StringUtils; -import com.accompany.core.exception.ServiceException; -import com.accompany.sms.common.BeanMapper; -import com.accompany.sms.config.AliyunSmsConfig; -import com.accompany.sms.result.AliyunSmsRet; -import com.alibaba.fastjson.JSONObject; -import com.aliyuncs.DefaultAcsClient; -import com.aliyuncs.IAcsClient; -import com.aliyuncs.dysmsapi.model.v20170525.SendSmsRequest; -import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse; -import com.aliyuncs.exceptions.ClientException; -import com.aliyuncs.profile.DefaultProfile; -import com.aliyuncs.profile.IClientProfile; -import com.google.common.collect.ImmutableMap; -import com.google.gson.Gson; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Map; - -/** - * @author chucheng - * @date 2019-08-16 - * @description 阿里云短信服务 - */ -@Service -@Slf4j -public class AliyunSmsService implements InitializingBean { - - @Autowired - private AliyunSmsConfig aliyunSmsConfig; - - private final Gson gson = new Gson(); - - private IAcsClient acsClient; - - - public AliyunSmsRet sendSms(String mobile, String code, DeviceInfo deviceInfo) throws ClientException { - return sendSms(mobile, (deviceInfo != null ? deviceInfo.getApp() : null), code); - } - - public AliyunSmsRet sendSms(String mobile, String app, String code) throws ClientException { - log.info("aliYun mobile : {}, app : {}, code : {}", mobile, app, code); - //组装请求对象-具体描述见控制台-文档部分内容 - SendSmsRequest request = new SendSmsRequest(); - //必填:待发送手机号 - request.setPhoneNumbers(mobile); - //必填:短信签名-可在短信控制台中找到 - // 根据app参数选择不同的签名，如果没有配置特殊的，则使用默认的 - if (aliyunSmsConfig.getAppSignNameDic() != null && StrUtil.isNotEmpty(app) && aliyunSmsConfig.getAppSignNameDic().containsKey(app)) { - String signName = aliyunSmsConfig.getAppSignNameDic().get(app); - log.info("{} use signName {}", app, signName); - request.setSignName(signName); - } else { - request.setSignName(aliyunSmsConfig.getSignName()); - } - request.setTemplateCode(aliyunSmsConfig.getTemplateCode()); - // 国际区分 - if (!mobile.startsWith(Constant.CHINA_MAINLAND_PHONE_AREA_CODE)) { - request.setSignName(aliyunSmsConfig.getIntlSignName()); - request.setTemplateCode(aliyunSmsConfig.getIntlTemplateCode()); - } - //可选:模板中的变量替换JSON串,如模板内容为"亲爱的${name},您的验证码为${code}"时,此处的值为 - request.setTemplateParam(gson.toJson(ImmutableMap.of("code", code))); - //可选:outId为提供给业务方扩展字段,最终在短信回执消息中将此值带回给调用者 - //hint 此处可能会抛出异常，注意catch - SendSmsResponse acsResponse = acsClient.getAcsResponse(request); - log.info("acsResponse : {}", JSONObject.toJSON(acsResponse)); - return BeanMapper.map(acsResponse, AliyunSmsRet.class); - } - - /** - * 发送短信 - * - * @param mobile 手机号 - * @param templateId 模板id - * @param param 参数 - * @return - * @throws ClientException - */ - public AliyunSmsRet sendSms(String mobile, String templateId, Map param) - throws ClientException { - return sendSms(mobile, templateId, aliyunSmsConfig.getNotifySignName(), param); - } - - /** - * 发送短信 - * - * @param mobile 手机号 - * @param templateId 模板id - * @param signName 签名 - * @param param 参数 - * @return - * @throws ClientException - */ - public AliyunSmsRet sendSms(String mobile, String templateId, String signName, Map param) - throws ClientException { - SendSmsRequest request = new SendSmsRequest(); - //必填:待发送手机号 - request.setPhoneNumbers(mobile); - //必填:短信签名-可在短信控制台中找到 - request.setSignName(signName); - //必填:短信模板-可在短信控制台中找到 - request.setTemplateCode(templateId); - //可选:模板中的变量替换JSON串,如模板内容为"亲爱的${name},您的验证码为${code}"时,此处的值为 - request.setTemplateParam(gson.toJson(param)); - SendSmsResponse acsResponse = acsClient.getAcsResponse(request); - return BeanMapper.map(acsResponse, AliyunSmsRet.class); - } - - /** - * 校验 - * - * @param resCode - */ - public void validResponseCode(String resCode) { - if (StringUtils.isNotEmpty(resCode) && - resCode.equalsIgnoreCase(SmsConstant.AliyunSmsResponseCode.BUSINESS_LIMIT_CONTROL)) { - throw new ServiceException(BusiStatus.SMS_SENDING_FREQUENCY_TOO_HIGH); - } - if (StringUtils.isEmpty(resCode) || - (!resCode.equalsIgnoreCase(SmsConstant.AliyunSmsResponseCode.OK))) { - throw new ServiceException(BusiStatus.SMS_SEND_ERROR); - } - } - - - @Override - public void afterPropertiesSet() throws Exception { - //初始化acsClient,暂不支持region化 - IClientProfile profile = DefaultProfile.getProfile(aliyunSmsConfig.getRegionId(), aliyunSmsConfig.getAccessKeyId(), aliyunSmsConfig.getAccessKeySecret()); - DefaultProfile.addEndpoint(aliyunSmsConfig.getRegionId(), aliyunSmsConfig.getRegionId(), aliyunSmsConfig.getProduct(), aliyunSmsConfig.getDomain()); - acsClient = new DefaultAcsClient(profile); - } -} diff --git a/accompany-base/accompany-sms/accompany-sms-service/src/main/java/com/accompany/sms/service/SmsService.java b/accompany-base/accompany-sms/accompany-sms-service/src/main/java/com/accompany/sms/service/SmsService.java index 701ff4821..6e679c9e7 100644 --- a/accompany-base/accompany-sms/accompany-sms-service/src/main/java/com/accompany/sms/service/SmsService.java +++ b/accompany-base/accompany-sms/accompany-sms-service/src/main/java/com/accompany/sms/service/SmsService.java @@ -5,6 +5,7 @@ import com.accompany.common.constant.Constant; import com.accompany.common.constant.SmsConstant; import com.accompany.common.device.DeviceInfo; import com.accompany.common.redis.RedisKey; +import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.RandomUtil; import com.accompany.common.utils.StringUtils; @@ -44,6 +45,7 @@ public class SmsService extends BaseService { private RedissonClient redissonClient; @Autowired private SmsRecordService smsRecordService; + @Autowired private SysConfService sysConfService; @@ -78,7 +80,7 @@ public class SmsService extends BaseService { Phonenumber.PhoneNumber swissNumberProto = phoneUtil.parse(phone, null); String realPhone = swissNumberProto.getCountryCode() + String.valueOf(swissNumberProto.getNationalNumber()); //短信发送sdk - SmsStrategy smsStrategy = SmsFactory.getInstance(sysConfService.getDefaultSysConfValueById(Constant.SysConfId.SMS_SDK_TYPE, SmsTypeEnum.TENCENT.name().toLowerCase())); + SmsStrategy smsStrategy = SmsFactory.getInstance(SmsTypeEnum.TENCENT.name().toLowerCase()); SmsContext context = new SmsContext(); context.setMobile(mobile); if (deviceInfo != null) { diff --git a/accompany-base/accompany-sms/accompany-sms-service/src/main/java/com/accompany/sms/strategy/AliYunSmsStrategy.java b/accompany-base/accompany-sms/accompany-sms-service/src/main/java/com/accompany/sms/strategy/AliYunSmsStrategy.java deleted file mode 100644 index 6438a209b..000000000 --- a/accompany-base/accompany-sms/accompany-sms-service/src/main/java/com/accompany/sms/strategy/AliYunSmsStrategy.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.accompany.sms.strategy; - -import com.accompany.core.base.SpringContextHolder; -import com.accompany.sms.enums.SmsTypeEnum; -import com.accompany.sms.result.AliyunSmsRet; -import com.accompany.sms.service.AliyunSmsService; -import lombok.extern.slf4j.Slf4j; - -import java.util.Map; - -/** - * @author: liaozetao - * @date: 2023/8/14 15:17 - * @description: - */ -@Slf4j -public class AliYunSmsStrategy extends SmsStrategy { - - private final AliyunSmsService aliyunSmsService; - - public AliYunSmsStrategy() { - aliyunSmsService = SpringContextHolder.getBeanOfClass(AliyunSmsService.class); - } - - @Override - String type() { - return SmsTypeEnum.ALIYUN.name().toLowerCase(); - } - - @Override - SmsResponse doSendSmsCode(SmsContext context) { - SmsResponse response = new SmsResponse(); - String mobile = context.getMobile(); - String app = context.getApp(); - String code = context.getCode(); - try { - AliyunSmsRet aliyunSmsRet = aliyunSmsService.sendSms(mobile, app, code); - response.setCode(aliyunSmsRet.getCode()); - response.setMessage(aliyunSmsRet.getMessage()); - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new RuntimeException(e.getMessage()); - } - return response; - } - - @Override - SmsResponse doSendSms(SmsContext context) { - SmsResponse response = new SmsResponse(); - String mobile = context.getMobile(); - String templateId = context.getTemplateId(); - Map params = context.getParams(); - try { - AliyunSmsRet aliyunSmsRet = aliyunSmsService.sendSms(mobile, templateId, params); - response.setCode(aliyunSmsRet.getCode()); - response.setMessage(aliyunSmsRet.getMessage()); - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new RuntimeException(e.getMessage()); - } - return response; - } - - @Override - public void validResCode(String resCode) { - aliyunSmsService.validResponseCode(resCode); - } -} diff --git a/accompany-base/accompany-sms/accompany-sms-service/src/main/java/com/accompany/sms/strategy/SmsFactory.java b/accompany-base/accompany-sms/accompany-sms-service/src/main/java/com/accompany/sms/strategy/SmsFactory.java index 8c4296aec..dcac19b45 100644 --- a/accompany-base/accompany-sms/accompany-sms-service/src/main/java/com/accompany/sms/strategy/SmsFactory.java +++ b/accompany-base/accompany-sms/accompany-sms-service/src/main/java/com/accompany/sms/strategy/SmsFactory.java @@ -13,9 +13,7 @@ public class SmsFactory { public static SmsStrategy getInstance(String type) { SmsStrategy smsStrategy = null; - if (SmsTypeEnum.ALIYUN.name().toLowerCase().equalsIgnoreCase(type)) { - smsStrategy = new AliYunSmsStrategy(); - } else if (SmsTypeEnum.TENCENT.name().toLowerCase().equalsIgnoreCase(type)) { + if (SmsTypeEnum.TENCENT.name().toLowerCase().equalsIgnoreCase(type)) { smsStrategy = new TencentSmsStrategy(); } else { smsStrategy = new TencentSmsStrategy(); diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/annual/AnnualCpDao.java b/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/annual/AnnualCpDao.java deleted file mode 100644 index 95e87a01d..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/annual/AnnualCpDao.java +++ /dev/null @@ -1,205 +0,0 @@ -package com.accompany.business.annual; - -import com.accompany.business.annual.constant.AnnualConstant; -import com.accompany.business.christmas.constant.ChristmasConstant; -import com.accompany.business.common.dto.CpRankActConfigDto; -import com.accompany.business.common.dto.CpRankActCpProp; -import com.accompany.common.constant.AppEnum; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.base.SpringContextHolder; -import com.accompany.core.exception.ServiceException; -import lombok.extern.slf4j.Slf4j; -import org.redisson.api.RLock; -import org.redisson.api.RMap; -import org.redisson.api.RedissonClient; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.*; -import java.util.concurrent.TimeUnit; -import java.util.function.Function; -import java.util.stream.Collectors; - -@Service -@Slf4j -public class AnnualCpDao implements InitializingBean { - - private final String MODULE_NAME = "cp_rank"; - - @Autowired - private RedissonClient redissonClient; - - private RMap cpPropMap; - private RMap> userCpPropMap; - - @Override - public void afterPropertiesSet() throws Exception { - String cpPropKey = String.join("_", AppEnum.getCurApp().getValue(), AnnualConstant.actName, MODULE_NAME, "cp_prop"); - cpPropMap = redissonClient.getMap(cpPropKey); - String userCpProp = String.join("_", AppEnum.getCurApp().getValue(), AnnualConstant.actName, MODULE_NAME, "user_cp_prop"); - userCpPropMap = redissonClient.getMap(userCpProp); - } - - public List listCpByUid(Long uid, Long size) { - Map propMap = userCpPropMap.get(uid); - if (CollectionUtils.isEmpty(propMap)){ - return null; - } - if (null == size){ - size = Long.MAX_VALUE; - } - return propMap.values().stream() - .sorted(Comparator.comparing(CpRankActCpProp::getScore).reversed()).limit(size).collect(Collectors.toList()); - } - - public CpRankActCpProp getCpByUid(Long fromUid, Long toUid) { - Map propMap = userCpPropMap.get(fromUid); - if (CollectionUtils.isEmpty(propMap)){ - return null; - } - return propMap.get(toUid.toString()); - } - - public String getTheBestCpUidByUid(Long uid) { - Map propMap = userCpPropMap.get(uid); - if (CollectionUtils.isEmpty(propMap)){ - return null; - } - CpRankActCpProp prop = propMap.values().stream() - .max(Comparator.comparing(CpRankActCpProp::getScore)).get(); - return buildCpUid(prop.getFromUid(), prop.getToUid()); - } - - public String buildCpUid(Long fromUid, Long toUid){ - List uidList = new ArrayList<>(2); - uidList.add(fromUid); - uidList.add(toUid); - return uidList.stream().sorted() - .map(Object::toString) - .collect(Collectors.joining("_")); - } - - public List takeApartCpUid(String cpUid) { - return Arrays.stream(cpUid.split("_")).map(Long::parseLong).collect(Collectors.toList()); - } - - public CpRankActCpProp getCpPropByCpUid(String cpUid) { - return cpPropMap.get(cpUid); - } - - public Map mapCpPropByCpUidSet(Set cpUidSet) { - Map map = cpPropMap.getAll(cpUidSet); - if (CollectionUtils.isEmpty(map)){ - return Collections.emptyMap(); - } - return map; - } - - private R withLock(Long uid, String redisKey, Function, R> function){ - String lockKey = String.join("_", AppEnum.getCurApp().getValue(), ChristmasConstant.actName, MODULE_NAME, redisKey, uid.toString()); - RLock lock = redissonClient.getLock(lockKey); - boolean isLocked = false; - try { - isLocked = lock.tryLock(3, TimeUnit.SECONDS); - if (!isLocked){ - log.error("[2023年度盛典活动] {} 获取 {} 锁超时", uid, lockKey); - throw new ServiceException(BusiStatus.SERVERBUSY); - } - Map propMap = userCpPropMap.getOrDefault(uid, new HashMap<>()); - return function.apply(propMap); - } catch (InterruptedException e) { - log.error("[2023年度盛典活动] {} 获取 {} 锁异常", uid, lockKey, e); - throw new ServiceException(BusiStatus.SERVERBUSY); - } finally { - if (isLocked){ - lock.unlock(); - } - } - } - - public void saveCpProp(CpRankActCpProp cpProp) { - if (!cpPropMap.fastPutIfAbsent(cpProp.getCpUid(), cpProp)){ - return; - } - - saveUserCpProp(cpProp.getFromUid(), cpProp.getToUid(), cpProp); - saveUserCpProp(cpProp.getToUid(), cpProp.getFromUid(), cpProp); - } - - public boolean saveUserCpProp(Long fromUid, Long toUid, CpRankActCpProp userProp){ - return withLock(fromUid, "user_cp_prop_lock", propMap->{ - if (CollectionUtils.isEmpty(propMap)){ - propMap.put(toUid.toString(), userProp); - userCpPropMap.fastPut(fromUid, propMap); - return false; - } - - CpRankActCpProp cpUserProp = propMap.get(toUid.toString()); - if (null == cpUserProp){ - propMap.put(toUid.toString(), userProp); - userCpPropMap.fastPut(fromUid, propMap); - return false; - } - - if (cpUserProp.getScore() >= userProp.getScore()){ - return false; - } - - //更新分数 - cpUserProp.setScore(userProp.getScore()); - - userCpPropMap.fastPut(fromUid, propMap); - - return true; - }); - } - - public void updateCpScore(String cpUid, Double totalScore, CpRankActConfigDto config) { - CpRankActCpProp cpProp = getCpPropByCpUid(cpUid); - if (null == cpProp){ - return; - } - long score = BigDecimal.valueOf(totalScore).setScale(0, RoundingMode.DOWN).longValue(); - if (cpProp.getScore() >= score){ - return; - } - - boolean needUpdate = false; - boolean locked = false; - String lockKey = String.join("_", AppEnum.getCurApp().getValue(), ChristmasConstant.actName, MODULE_NAME, "cp_prop_lock", cpUid); - RLock lock = redissonClient.getLock(lockKey); - try { - locked = lock.tryLock(3, TimeUnit.SECONDS); - if (!locked){ - throw new ServiceException(BusiStatus.SERVERBUSY); - } - - cpProp = getCpPropByCpUid(cpUid); - if (cpProp.getScore() < score){ - cpProp.setScore(score); - cpPropMap.fastPut(cpUid, cpProp); - needUpdate = true; - } - - } catch (InterruptedException e) { - //todo log - throw new RuntimeException(e); - } finally { - if (locked){ - lock.unlock(); - } - } - - if (!needUpdate){ - return; - } - - SpringContextHolder.getBean(AnnualCpDao.class).saveUserCpProp(cpProp.getFromUid(), cpProp.getToUid(), cpProp); - SpringContextHolder.getBean(AnnualCpDao.class).saveUserCpProp(cpProp.getToUid(), cpProp.getFromUid(), cpProp); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/annual/AnnualTaskDao.java b/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/annual/AnnualTaskDao.java deleted file mode 100644 index b31d0f439..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/annual/AnnualTaskDao.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.accompany.business.annual; - -import com.accompany.business.annual.constant.AnnualConstant; -import com.accompany.business.common.constant.RankTypeEnum; -import com.accompany.common.constant.AppEnum; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.ServiceException; -import lombok.extern.slf4j.Slf4j; -import org.redisson.api.RLock; -import org.redisson.api.RMap; -import org.redisson.api.RedissonClient; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.TimeUnit; -import java.util.function.Function; - -@Service -@Slf4j -public class AnnualTaskDao implements InitializingBean { - - private final String MODULE_NAME = "task"; - - @Autowired - private RedissonClient redissonClient; - - private RMap userSendScoreMap; - private RMap userReceiveScoreMap; - private RMap> userTaskStatusMap; - - public Integer getScoreByUidAndType(Long uid, RankTypeEnum typeEnum){ - if (RankTypeEnum.SEND_TOTAL.equals(typeEnum)){ - return userSendScoreMap.getOrDefault(uid, 0); - } else if (RankTypeEnum.RECEIVE_TOTAL.equals(typeEnum)){ - return userReceiveScoreMap.getOrDefault(uid, 0); - } - throw new ServiceException(BusiStatus.PARAMETERILLEGAL); - } - - public Integer addScore(Long uid, RankTypeEnum typeEnum, Integer score){ - if (RankTypeEnum.SEND_TOTAL.equals(typeEnum)){ - return userSendScoreMap.addAndGet(uid, score); - } else if (RankTypeEnum.RECEIVE_TOTAL.equals(typeEnum)){ - return userReceiveScoreMap.addAndGet(uid, score); - } - throw new ServiceException(BusiStatus.PARAMETERILLEGAL); - } - - public Map getTaskStatus(Long uid){ - Map taskStatusMap = userTaskStatusMap.get(uid); - if (CollectionUtils.isEmpty(taskStatusMap)){ - return Collections.emptyMap(); - } - return taskStatusMap; - } - - @Override - public void afterPropertiesSet() throws Exception { - String userSendScoreKey = String.join("_", AppEnum.getCurApp().getValue(), AnnualConstant.actName, MODULE_NAME, "user_send_score"); - userSendScoreMap = redissonClient.getMap(userSendScoreKey); - String userReceiveScoreKey = String.join("_", AppEnum.getCurApp().getValue(), AnnualConstant.actName, MODULE_NAME, "user_receive_score"); - userReceiveScoreMap = redissonClient.getMap(userReceiveScoreKey); - String userTaskKey = String.join("_", AppEnum.getCurApp().getValue(), AnnualConstant.actName, MODULE_NAME, "user_task_status"); - userTaskStatusMap = redissonClient.getMap(userTaskKey); - } - - public boolean saveStatus(Long uid, String taskIdKey) { - return withTaskStatusLock(uid, taskStatusMap->{ - boolean succeed = taskStatusMap.replace(taskIdKey, AnnualConstant.BtnStatus.CAN, AnnualConstant.BtnStatus.HAD); - if (succeed){ - userTaskStatusMap.fastPut(uid, taskStatusMap); - } - return succeed; - }); - } - - public void setStatus(Long uid, Set taskIdSet) { - withTaskStatusLock(uid, taskStatusMap->{ - - boolean succeed = false; - - for (String taskId: taskIdSet) { - Integer old = taskStatusMap.putIfAbsent(taskId, AnnualConstant.BtnStatus.CAN); - if (null != old){ - log.error("[2023年度盛典]-年度任务 {} 设置任务 {} 可领取状态失败 old {}", uid, taskId, old); - } - succeed = succeed || null == old; - } - - if (succeed){ - userTaskStatusMap.fastPut(uid, taskStatusMap); - } - - return succeed; - - }); - } - - private T withTaskStatusLock(Long uid, Function, T> function){ - String lockKey = String.join("_", AppEnum.getCurApp().getValue(), AnnualConstant.actName, MODULE_NAME, "user_task_status_lock", uid.toString()); - RLock lock = redissonClient.getLock(lockKey); - boolean isLocked = false; - try { - isLocked = lock.tryLock(3, TimeUnit.SECONDS); - if (!isLocked){ - log.error("[2023年度盛典]-年度任务 {} 获取 {} 锁超时", uid, lockKey); - throw new ServiceException(BusiStatus.SERVERBUSY); - } - Map userRedBagMap = userTaskStatusMap.getOrDefault(uid, new HashMap<>()); - return function.apply(userRedBagMap); - } catch (Exception e) { - log.error("[2023年度盛典]-年度任务 {} 获取 {} 锁异常", uid, lockKey, e); - throw new ServiceException(BusiStatus.SERVERBUSY); - } finally { - if (isLocked){ - lock.unlock(); - } - } - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/christmas/ChristmasCpDao.java b/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/christmas/ChristmasCpDao.java deleted file mode 100644 index be75db7d1..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/christmas/ChristmasCpDao.java +++ /dev/null @@ -1,270 +0,0 @@ -package com.accompany.business.christmas; - -import com.accompany.business.christmas.constant.ChristmasConstant; -import com.accompany.business.christmas.dto.ChristmasCpUserProp; -import com.accompany.business.common.dto.CpRankActConfigDto; -import com.accompany.business.common.dto.CpRankActCpProp; -import com.accompany.common.constant.AppEnum; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.base.SpringContextHolder; -import com.accompany.core.exception.ServiceException; -import lombok.extern.slf4j.Slf4j; -import org.redisson.api.RLock; -import org.redisson.api.RMap; -import org.redisson.api.RedissonClient; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.*; -import java.util.concurrent.TimeUnit; -import java.util.function.Function; -import java.util.stream.Collectors; - -@Service -@Slf4j -public class ChristmasCpDao implements InitializingBean { - - private final String MODULE_NAME = "cp_rank"; - - @Autowired - private RedissonClient redissonClient; - - private RMap userCpRewardMap; - private RMap cpPropMap; - private RMap> userCpPropMap; - - @Override - public void afterPropertiesSet() throws Exception { - String userCpRewardKey = String.join("_", AppEnum.getCurApp().getValue(), ChristmasConstant.actName, MODULE_NAME, "user_cp_reward"); - userCpRewardMap = redissonClient.getMap(userCpRewardKey); - String cpPropKey = String.join("_", AppEnum.getCurApp().getValue(), ChristmasConstant.actName, MODULE_NAME, "cp_prop"); - cpPropMap = redissonClient.getMap(cpPropKey); - String userCpProp = String.join("_", AppEnum.getCurApp().getValue(), ChristmasConstant.actName, MODULE_NAME, "user_cp_prop"); - userCpPropMap = redissonClient.getMap(userCpProp); - } - - public List listCpByUid(Long uid, Long size) { - Map propMap = userCpPropMap.get(uid); - if (CollectionUtils.isEmpty(propMap)){ - return null; - } - if (null == size){ - size = Long.MAX_VALUE; - } - return propMap.values().stream() - .sorted(Comparator.comparing(ChristmasCpUserProp::getScore).reversed()).limit(size).collect(Collectors.toList()); - } - - public ChristmasCpUserProp getCpByUid(Long fromUid, Long toUid) { - Map propMap = userCpPropMap.get(fromUid); - if (CollectionUtils.isEmpty(propMap)){ - return null; - } - return propMap.get(toUid.toString()); - } - - public Integer getCpRewardStatus(Long uid) { - return userCpRewardMap.getOrDefault(uid, ChristmasConstant.BtnStatus.NONE); - } - - public boolean saveCpRewardStatus(Long uid) { - return userCpRewardMap.replace(uid, ChristmasConstant.BtnStatus.CAN, ChristmasConstant.BtnStatus.HAD); - } - - public String getTheBestCpUidByUid(Long uid) { - Map propMap = userCpPropMap.get(uid); - if (CollectionUtils.isEmpty(propMap)){ - return null; - } - ChristmasCpUserProp prop = propMap.values().stream() - .max(Comparator.comparing(ChristmasCpUserProp::getScore)).get(); - return buildCpUid(prop.getFromUid(), prop.getToUid()); - } - - public String buildCpUid(Long fromUid, Long toUid){ - List uidList = new ArrayList<>(2); - uidList.add(fromUid); - uidList.add(toUid); - return uidList.stream().sorted() - .map(Object::toString) - .collect(Collectors.joining("_")); - } - - public List takeApartCpUid(String cpUid) { - return Arrays.stream(cpUid.split("_")).map(Long::parseLong).collect(Collectors.toList()); - } - - public CpRankActCpProp getCpPropByCpUid(String cpUid) { - return cpPropMap.get(cpUid); - } - - public Map mapCpPropByCpUidSet(Set cpUidSet) { - Map map = cpPropMap.getAll(cpUidSet); - if (CollectionUtils.isEmpty(map)){ - return Collections.emptyMap(); - } - return map; - } - - private R withLock(Long uid, String redisKey, Function, R> function){ - String lockKey = String.join("_", AppEnum.getCurApp().getValue(), ChristmasConstant.actName, MODULE_NAME, redisKey, uid.toString()); - RLock lock = redissonClient.getLock(lockKey); - boolean isLocked = false; - try { - isLocked = lock.tryLock(3, TimeUnit.SECONDS); - if (!isLocked){ - log.error("[2023圣诞节活动] {} 获取 {} 锁超时", uid, lockKey); - throw new ServiceException(BusiStatus.SERVERBUSY); - } - Map propMap = userCpPropMap.getOrDefault(uid, new HashMap<>()); - return function.apply(propMap); - } catch (InterruptedException e) { - log.error("[2023圣诞节活动] {} 获取 {} 锁异常", uid, lockKey, e); - throw new ServiceException(BusiStatus.SERVERBUSY); - } finally { - if (isLocked){ - lock.unlock(); - } - } - } - - public boolean saveUserCpPropTaskStatus(Long fromUid, Long toUid, Integer taskId, Integer status){ - return withLock(fromUid, "user_cp_prop_lock", propMap->{ - if (CollectionUtils.isEmpty(propMap)){ - return false; - } - - ChristmasCpUserProp cpUserProp = propMap.get(toUid.toString()); - if (null == cpUserProp){ - return false; - } - - Integer curStatus = cpUserProp.getCpTaskStatus().get(taskId); - if (null == curStatus){ - return false; - } - - if (status.compareTo(curStatus) <= 0){ - return false; - } - - cpUserProp.getCpTaskStatus().put(taskId, status); - userCpPropMap.fastPut(fromUid, propMap); - return true; - }); - } - - public void saveCpRewardStatus(Long senderUid, Long recvUid){ - userCpRewardMap.fastPutIfAbsent(senderUid, ChristmasConstant.BtnStatus.CAN); - userCpRewardMap.fastPutIfAbsent(recvUid, ChristmasConstant.BtnStatus.CAN); - } - - public void saveCpProp(CpRankActCpProp cpProp) { - if (!cpPropMap.fastPutIfAbsent(cpProp.getCpUid(), cpProp)){ - return; - } - - ChristmasCpUserProp userProp = new ChristmasCpUserProp(); - BeanUtils.copyProperties(cpProp, userProp); - userProp.setCpTaskStatus(new HashMap<>()); - - saveUserCpProp(cpProp.getFromUid(), cpProp.getToUid(), userProp); - saveUserCpProp(cpProp.getToUid(), cpProp.getFromUid(), userProp); - } - - public boolean saveUserCpProp(Long fromUid, Long toUid, ChristmasCpUserProp userProp){ - return withLock(fromUid, "user_cp_prop_lock", propMap->{ - if (CollectionUtils.isEmpty(propMap)){ - propMap.put(toUid.toString(), userProp); - userCpPropMap.fastPut(fromUid, propMap); - return false; - } - - ChristmasCpUserProp cpUserProp = propMap.get(toUid.toString()); - if (null == cpUserProp){ - propMap.put(toUid.toString(), userProp); - userCpPropMap.fastPut(fromUid, propMap); - return false; - } - - if (cpUserProp.getScore() >= userProp.getScore()){ - return false; - } - - //更新分数 - cpUserProp.setScore(userProp.getScore()); - - //更新任务状态 - for (Map.Entry entry: userProp.getCpTaskStatus().entrySet()) { - Integer taskId = entry.getKey(); - Integer taskStatus = entry.getValue(); - Integer curStatus = cpUserProp.getCpTaskStatus().getOrDefault(taskId, ChristmasConstant.BtnStatus.NONE); - if (taskStatus.compareTo(curStatus) > 0){ - cpUserProp.getCpTaskStatus().put(taskId, taskStatus); - } - } - - userCpPropMap.fastPut(fromUid, propMap); - - return true; - }); - } - - public void updateCpScore(String cpUid, Double totalScore, CpRankActConfigDto config) { - CpRankActCpProp cpProp = getCpPropByCpUid(cpUid); - if (null == cpProp){ - return; - } - long score = BigDecimal.valueOf(totalScore).setScale(0, RoundingMode.DOWN).longValue(); - if (cpProp.getScore() >= score){ - return; - } - - boolean needUpdate = false; - boolean locked = false; - String lockKey = String.join("_", AppEnum.getCurApp().getValue(), ChristmasConstant.actName, MODULE_NAME, "cp_prop_lock", cpUid); - RLock lock = redissonClient.getLock(lockKey); - try { - locked = lock.tryLock(3, TimeUnit.SECONDS); - if (!locked){ - throw new ServiceException(BusiStatus.SERVERBUSY); - } - - cpProp = getCpPropByCpUid(cpUid); - if (cpProp.getScore() < score){ - cpProp.setScore(score); - cpPropMap.fastPut(cpUid, cpProp); - needUpdate = true; - } - - } catch (InterruptedException e) { - //todo log - throw new RuntimeException(e); - } finally { - if (locked){ - lock.unlock(); - } - } - - if (!needUpdate){ - return; - } - - Map taskMap = config.getCpScoreTasks().stream() - .filter(task-> score >= task.getScore()) - .collect(Collectors.toMap(CpRankActConfigDto.CpScoreTask::getId, task->ChristmasConstant.BtnStatus.CAN)); - - ChristmasCpUserProp userProp = new ChristmasCpUserProp(); - BeanUtils.copyProperties(cpProp, userProp); - userProp.setCpTaskStatus(taskMap); - - SpringContextHolder.getBean(ChristmasCpDao.class).saveUserCpProp(cpProp.getFromUid(), cpProp.getToUid(), userProp); - SpringContextHolder.getBean(ChristmasCpDao.class).saveUserCpProp(cpProp.getToUid(), cpProp.getFromUid(), userProp); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/christmas/ChristmasFirstLetterNumDao.java b/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/christmas/ChristmasFirstLetterNumDao.java deleted file mode 100644 index 4c0bee655..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/christmas/ChristmasFirstLetterNumDao.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.accompany.business.christmas; - -import com.accompany.business.base.BaseTicketActDao; -import com.accompany.business.christmas.constant.ChristmasConstant; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -@Service -@Slf4j -public class ChristmasFirstLetterNumDao extends BaseTicketActDao { - - @Override - protected String getActName() { - return ChristmasConstant.actName + "_first"; - } - - @Override - protected void logAfterAddUserTicketNum(Long uid, Integer num, Integer curTicketNum, Integer totalTicketNum) { - log.info("[2023圣诞节活动]-任务 {} 增加 {} 个first情书， 剩余 {} 个first情书， 累计获得 {} 个first情书", uid, num, curTicketNum, totalTicketNum); - } - - @Override - protected void logAfterReduceUserTicketNum(Long uid, Integer num, Integer curTicketNum) { - log.info("[2023圣诞节活动]-任务 {} 消耗 {} 个first情书， 剩余 {} 个first情书", uid, num, curTicketNum); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/christmas/ChristmasFourthLetterNumDao.java b/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/christmas/ChristmasFourthLetterNumDao.java deleted file mode 100644 index f2d00771f..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/christmas/ChristmasFourthLetterNumDao.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.accompany.business.christmas; - -import com.accompany.business.base.BaseTicketActDao; -import com.accompany.business.christmas.constant.ChristmasConstant; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -@Service -@Slf4j -public class ChristmasFourthLetterNumDao extends BaseTicketActDao { - - @Override - protected String getActName() { - return ChristmasConstant.actName + "_fourth"; - } - - @Override - protected void logAfterAddUserTicketNum(Long uid, Integer num, Integer curTicketNum, Integer totalTicketNum) { - log.info("[2023圣诞节活动]-任务 {} 增加 {} 个fourth情书， 剩余 {} 个fourth情书， 累计获得 {} 个fourth情书", uid, num, curTicketNum, totalTicketNum); - } - - @Override - protected void logAfterReduceUserTicketNum(Long uid, Integer num, Integer curTicketNum) { - log.info("[2023圣诞节活动]-任务 {} 消耗 {} 个fourth情书， 剩余 {} 个fourth情书", uid, num, curTicketNum); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/christmas/ChristmasLetterDao.java b/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/christmas/ChristmasLetterDao.java deleted file mode 100644 index 17f5018fe..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/christmas/ChristmasLetterDao.java +++ /dev/null @@ -1,132 +0,0 @@ -package com.accompany.business.christmas; - -import com.accompany.business.christmas.constant.ChristmasConstant; -import com.accompany.business.christmas.dto.ChristmasLetterDto; -import com.accompany.common.constant.AppEnum; -import com.accompany.common.constant.Constant; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.base.SpringContextHolder; -import com.accompany.core.exception.ServiceException; -import com.alibaba.fastjson.JSON; -import lombok.extern.slf4j.Slf4j; -import org.redisson.api.RLock; -import org.redisson.api.RMap; -import org.redisson.api.RScoredSortedSet; -import org.redisson.api.RedissonClient; -import org.redisson.client.protocol.ScoredEntry; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.util.*; -import java.util.concurrent.TimeUnit; -import java.util.function.Supplier; -import java.util.stream.Collectors; - -@Service -@Slf4j -public class ChristmasLetterDao implements InitializingBean { - - private final String MODULE_NAME = "letter"; - - @Autowired - private RedissonClient redissonClient; - private RMap> userSendLetterMap; - private RMap> userRecvLetterMap; - private RScoredSortedSet letterSortedSet; - - public List listUserLetter(Long uid, Byte type){ - if (Constant.SexType.male.equals(type)){ - return userSendLetterMap.getOrDefault(uid, Collections.emptyList()); - } else if (Constant.SexType.female.equals(type)) { - return userRecvLetterMap.getOrDefault(uid, Collections.emptyList()); - } - return Collections.emptyList(); - } - - public List listUserSquare(){ - Collection> uidScoreList = letterSortedSet.entryRangeReversed(0, 29); - if (CollectionUtils.isEmpty(uidScoreList)){ - return Collections.emptyList(); - } - return uidScoreList.stream() - .map(ScoredEntry::getValue) - .collect(Collectors.toList()); - } - - public void saveLetter(Long uid, Long toUid, Integer letterType, String text) { - Date now = new Date(); - ChristmasLetterDto dto = new ChristmasLetterDto(); - dto.setFromUid(uid); - dto.setToUid(toUid); - dto.setLetterId(letterType); - dto.setContext(text); - dto.setCreateTime(now); - - boolean sendSucceed = withLock(uid, ()->{ - //扣费 - SpringContextHolder.getBean(ChristmasLetterNumDao.class).consumeLetter(uid, letterType); - - List uidLetterList = userSendLetterMap.get(uid); - if (CollectionUtils.isEmpty(uidLetterList)){ - uidLetterList = new ArrayList<>(); - } - - uidLetterList.add(dto); - uidLetterList.sort(Comparator.comparing(ChristmasLetterDto::getCreateTime).reversed()); - - return userSendLetterMap.fastPut(uid, uidLetterList); - }); - log.info("[2023-圣诞节活动]-信 {} 给 {} 发出情信 {} 结果 {}", uid, toUid, JSON.toJSONString(dto), sendSucceed); - - boolean recvSucceed = withLock(toUid, ()->{ - List uidLetterList = userRecvLetterMap.get(toUid); - if (CollectionUtils.isEmpty(uidLetterList)){ - uidLetterList = new ArrayList<>(); - } - - uidLetterList.add(dto); - uidLetterList.sort(Comparator.comparing(ChristmasLetterDto::getCreateTime).reversed()); - - return userRecvLetterMap.fastPut(toUid, uidLetterList); - }); - log.info("[2023-圣诞节活动]-信 {} 给 {} 接收情信 {} 结果 {}", uid, toUid, JSON.toJSONString(dto), recvSucceed); - - double score = now.getTime(); - boolean success = letterSortedSet.add(score, dto); - log.info("[2023-圣诞节活动]-信 添加 fromUid {} toUid {} 情信 {} 到告白广场， score {} 结果 {}", uid, toUid, JSON.toJSONString(dto), score, success); - } - - private boolean withLock(Long uid, Supplier function){ - String lockKey = String.join("_", AppEnum.getCurApp().getValue(), ChristmasConstant.actName, MODULE_NAME, "save_letter_lock", uid.toString()); - RLock lock = redissonClient.getLock(lockKey); - boolean isLocked = false; - try { - isLocked = lock.tryLock(3, TimeUnit.SECONDS); - if (!isLocked){ - log.error("[2023圣诞活动]-保存情书 {} 获取 {} 锁超时", uid, lockKey); - throw new ServiceException(BusiStatus.SERVERBUSY); - } - return function.get(); - } catch (Exception e) { - log.error("[2023圣诞活动]-红线 {} 获取 {} 锁异常", uid, lockKey, e); - throw new ServiceException(BusiStatus.SERVERBUSY); - } finally { - if (isLocked){ - lock.unlock(); - } - } - } - - @Override - public void afterPropertiesSet() throws Exception { - String userSendLetterKey = String.join("_", AppEnum.getCurApp().getValue(), ChristmasConstant.actName, MODULE_NAME, "user_send_letter"); - userSendLetterMap = redissonClient.getMap(userSendLetterKey); - String userRecvLetterKey = String.join("_", AppEnum.getCurApp().getValue(), ChristmasConstant.actName, MODULE_NAME, "user_recv_letter"); - userRecvLetterMap = redissonClient.getMap(userRecvLetterKey); - String letterKey = String.join("_", AppEnum.getCurApp().getValue(), ChristmasConstant.actName, MODULE_NAME, "letter_square"); - letterSortedSet = redissonClient.getScoredSortedSet(letterKey); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/christmas/ChristmasLetterNumDao.java b/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/christmas/ChristmasLetterNumDao.java deleted file mode 100644 index 7017faf0b..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/christmas/ChristmasLetterNumDao.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.accompany.business.christmas; - -import com.accompany.business.base.BaseTicketActDao; -import com.accompany.business.christmas.constant.ChristmasConstant; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.ServiceException; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeansException; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.context.ApplicationContext; -import org.springframework.context.ApplicationContextAware; -import org.springframework.core.annotation.Order; -import org.springframework.stereotype.Service; - -import java.util.HashMap; -import java.util.Map; -import java.util.stream.Collectors; - -@Service -@Order(-1) -@Slf4j -public class ChristmasLetterNumDao implements InitializingBean, ApplicationContextAware { - - private ApplicationContext applicationContext; - private Map map; - - public BaseTicketActDao getTicketActDao(Integer type) { - BaseTicketActDao dao = map.get(type); - if (null == dao){ - throw new ServiceException(BusiStatus.PARAMERROR); - } - return dao; - } - - public Integer getUserCurLetterNum(Long uid, Integer type) { - return map.get(type).getUserCurTicketNum(uid); - } - - public Map getUserCurLetterNumMap(Long uid) { - return map.entrySet() - .parallelStream() - .collect(Collectors.toMap(Map.Entry::getKey, - e->e.getValue().getUserCurTicketNum(uid))); - } - - public void consumeLetter(Long uid, Integer type){ - BaseTicketActDao dao = map.get(type); - Integer curNum = dao.getUserCurTicketNum(uid); - if (curNum < 1){ - throw new ServiceException(BusiStatus.PARAMERROR, ChristmasConstant.BusiStatus.LETTER_NUM_UN_ENOUGH); - } - dao.reduceUserTicketNum(uid, 1); - } - - @Override - public void afterPropertiesSet() throws Exception { - map = new HashMap<>(); - map.put(ChristmasConstant.LetterTaskId.ORANGE, applicationContext.getBean(ChristmasFirstLetterNumDao.class)); - map.put(ChristmasConstant.LetterTaskId.BLUE, applicationContext.getBean(ChristmasSecondLetterNumDao.class)); - map.put(ChristmasConstant.LetterTaskId.PINK, applicationContext.getBean(ChristmasThirdLetterNumDao.class)); - map.put(ChristmasConstant.LetterTaskId.GOLD, applicationContext.getBean(ChristmasFourthLetterNumDao.class)); - } - - @Override - public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { - this.applicationContext = applicationContext; - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/christmas/ChristmasSecondLetterNumDao.java b/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/christmas/ChristmasSecondLetterNumDao.java deleted file mode 100644 index 7ffd2900b..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/christmas/ChristmasSecondLetterNumDao.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.accompany.business.christmas; - -import com.accompany.business.base.BaseTicketActDao; -import com.accompany.business.christmas.constant.ChristmasConstant; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -@Service -@Slf4j -public class ChristmasSecondLetterNumDao extends BaseTicketActDao { - - @Override - protected String getActName() { - return ChristmasConstant.actName + "_second"; - } - - @Override - protected void logAfterAddUserTicketNum(Long uid, Integer num, Integer curTicketNum, Integer totalTicketNum) { - log.info("[2023圣诞节活动]-任务 {} 增加 {} 个second情书， 剩余 {} 个second情书， 累计获得 {} 个second情书", uid, num, curTicketNum, totalTicketNum); - } - - @Override - protected void logAfterReduceUserTicketNum(Long uid, Integer num, Integer curTicketNum) { - log.info("[2023圣诞节活动]-任务 {} 消耗 {} 个second情书， 剩余 {} 个second情书", uid, num, curTicketNum); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/christmas/ChristmasThirdLetterNumDao.java b/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/christmas/ChristmasThirdLetterNumDao.java deleted file mode 100644 index ab888c870..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/christmas/ChristmasThirdLetterNumDao.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.accompany.business.christmas; - -import com.accompany.business.base.BaseTicketActDao; -import com.accompany.business.christmas.constant.ChristmasConstant; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -@Service -@Slf4j -public class ChristmasThirdLetterNumDao extends BaseTicketActDao { - - @Override - protected String getActName() { - return ChristmasConstant.actName + "_third"; - } - - @Override - protected void logAfterAddUserTicketNum(Long uid, Integer num, Integer curTicketNum, Integer totalTicketNum) { - log.info("[2023圣诞节活动]-任务 {} 增加 {} 个third情书， 剩余 {} 个third情书， 累计获得 {} 个third情书", uid, num, curTicketNum, totalTicketNum); - } - - @Override - protected void logAfterReduceUserTicketNum(Long uid, Integer num, Integer curTicketNum) { - log.info("[2023圣诞节活动]-任务 {} 消耗 {} 个third情书， 剩余 {} 个third情书", uid, num, curTicketNum); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/christmas/ChristmasTicketTaskDao.java b/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/christmas/ChristmasTicketTaskDao.java deleted file mode 100644 index 8834351f9..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/christmas/ChristmasTicketTaskDao.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.accompany.business.christmas; - -import com.accompany.business.base.BaseTicketTaskActDao; -import com.accompany.business.christmas.constant.ChristmasConstant; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -@Service -@Slf4j -public class ChristmasTicketTaskDao extends BaseTicketTaskActDao { - - @Override - protected String getActName() { - return ChristmasConstant.actName; - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/doubleeleven/DoubleElevenTaskDao.java b/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/doubleeleven/DoubleElevenTaskDao.java deleted file mode 100644 index 9a9a84c5d..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/doubleeleven/DoubleElevenTaskDao.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.accompany.business.doubleeleven; - -import com.accompany.business.base.BaseRewardTaskActDao; -import com.accompany.business.doubleeleven.constant.DoubleElevenConstant; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -@Service -@Slf4j -public class DoubleElevenTaskDao extends BaseRewardTaskActDao { - - @Override - protected String getActName() { - return DoubleElevenConstant.actName; - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/halloween/HalloweenBoxLevelDao.java b/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/halloween/HalloweenBoxLevelDao.java deleted file mode 100644 index df7e0580a..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/halloween/HalloweenBoxLevelDao.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.accompany.business.halloween; - -import com.accompany.business.halloween.constant.HalloweenConstant; -import com.accompany.business.halloween.dto.HalloweenDrawConfigDto; -import com.accompany.common.constant.AppEnum; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.ServiceException; -import lombok.extern.slf4j.Slf4j; -import org.redisson.api.RLock; -import org.redisson.api.RMap; -import org.redisson.api.RedissonClient; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.concurrent.TimeUnit; - -@Service -@Slf4j -public class HalloweenBoxLevelDao implements InitializingBean { - - @Autowired - private RedissonClient redissonClient; - - private RMap userBoxLevel; - - private RMap userTaskProgress; - - private String getActName(){ - return HalloweenConstant.actName; - }; - - public Integer getUserBoxLevel(Long uid) { - return userBoxLevel.getOrDefault(uid, 0); - } - - public boolean processTask(String taskKey, HalloweenDrawConfigDto.Task task, Long uid, Integer process) { - Integer needNum = task.getNeedNum(); - - // 过滤宝箱等级 - Integer boxLevel = getUserBoxLevel(uid); - if (boxLevel >= task.getBoxLevel()){ - return false; - } - - boolean locked = false; - String lockKey = String.join("_", AppEnum.getCurApp().getValue(), getActName(), - "draw_box_level_lock", uid.toString()); - RLock lock = redissonClient.getLock(lockKey); - try { - locked = lock.tryLock(5, TimeUnit.SECONDS); - if (!locked){ - //todo log - throw new ServiceException(BusiStatus.SERVERBUSY); - } - - boxLevel = getUserBoxLevel(uid); - if (boxLevel >= task.getBoxLevel()){ - return false; - } - - Integer cur = userTaskProgress.getOrDefault(taskKey, 0); - if (cur > needNum){ - userTaskProgress.fastPut(taskKey, needNum); - } else if (cur < needNum) { - Integer afterCur = userTaskProgress.addAndGet(taskKey, process); - if (afterCur >= needNum){ - userTaskProgress.fastPut(taskKey, needNum); - userBoxLevel.fastPut(uid, task.getBoxLevel()); - return true; - } - } - return false; - - } catch (InterruptedException e) { - //todo log - throw new ServiceException(BusiStatus.SERVERBUSY); - } finally { - if (locked){ - lock.unlock(); - } - } - } - - @Override - public void afterPropertiesSet() { - String levelCacheKey = String.join("_", AppEnum.getCurApp().getValue(), getActName(), "draw_box_level"); - userBoxLevel = redissonClient.getMap(levelCacheKey); - String taskCacheKey = String.join("_", AppEnum.getCurApp().getValue(), getActName(), "draw_box_task"); - userTaskProgress = redissonClient.getMap(taskCacheKey); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/halloween/HalloweenCandyNumDao.java b/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/halloween/HalloweenCandyNumDao.java deleted file mode 100644 index 532a5515f..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/halloween/HalloweenCandyNumDao.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.accompany.business.halloween; - -import com.accompany.business.base.BaseTicketActDao; -import com.accompany.business.halloween.constant.HalloweenConstant; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -@Service -@Slf4j -public class HalloweenCandyNumDao extends BaseTicketActDao { - - @Override - protected String getActName() { - return HalloweenConstant.actName; - } - - @Override - protected void logAfterAddUserTicketNum(Long uid, Integer num, Integer curTicketNum, Integer totalTicketNum) { - log.info("[2023万圣节活动]-任务 {} 增加 {} 个糖果， 剩余 {} 个糖果， 累计获得 {} 个糖果", uid, num, curTicketNum, totalTicketNum); - } - - @Override - protected void logAfterReduceUserTicketNum(Long uid, Integer num, Integer curTicketNum) { - log.info("[2023万圣节活动]-任务 {} 消耗 {} 个糖果， 剩余 {} 个糖果", uid, num, curTicketNum); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/halloween/HalloweenMapPosDao.java b/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/halloween/HalloweenMapPosDao.java deleted file mode 100644 index 0428e7778..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/halloween/HalloweenMapPosDao.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.accompany.business.halloween; - -import com.accompany.business.halloween.constant.HalloweenConstant; -import com.accompany.business.halloween.dto.HalloweenDrawConfigDto; -import com.accompany.common.constant.AppEnum; -import lombok.extern.slf4j.Slf4j; -import org.redisson.api.RMap; -import org.redisson.api.RedissonClient; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -@Service -@Slf4j -public class HalloweenMapPosDao implements InitializingBean { - - @Autowired - private RedissonClient redissonClient; - - private RMap userMapPos; - - private String getActName(){ - return HalloweenConstant.actName; - }; - - public Integer getUserMapPos(Long uid) { - return userMapPos.getOrDefault(uid, 0); - } - - public Integer getUserMapPos(Long uid, HalloweenDrawConfigDto config) { - return getUserMapPos(uid) % config.getMap().size(); - } - - - public void resetPos(Long uid) { - userMapPos.fastRemove(uid); - } - - /*public boolean processTask(String taskKey, HalloweenDrawConfigDto.Task task, Long uid, Integer process) { - Integer needNum = task.getNeedNum(); - - // 过滤宝箱等级 - Integer boxLevel = getUserBoxLevel(uid); - if (boxLevel >= task.getBoxLevel()){ - return false; - } - - boolean locked = false; - String lockKey = String.join("_", AppEnum.getCurApp().getValue(), getActName(), - "draw_box_level_lock", uid.toString()); - RLock lock = redissonClient.getLock(lockKey); - try { - locked = lock.tryLock(5, TimeUnit.SECONDS); - if (!locked){ - //todo log - throw new ServiceException(BusiStatus.SERVERBUSY); - } - - boxLevel = getUserBoxLevel(uid); - if (boxLevel >= task.getBoxLevel()){ - return false; - } - - Integer cur = userTaskProgress.getOrDefault(taskKey, 0); - if (cur > needNum){ - userTaskProgress.fastPut(taskKey, needNum); - } else if (cur < needNum) { - Integer afterCur = userTaskProgress.addAndGet(taskKey, process); - if (afterCur >= needNum){ - userTaskProgress.fastPut(taskKey, needNum); - userBoxLevel.fastPut(uid, task.getBoxLevel()); - return true; - } - } - return false; - - } catch (InterruptedException e) { - //todo log - throw new ServiceException(BusiStatus.SERVERBUSY); - } finally { - if (locked){ - lock.unlock(); - } - } - }*/ - - @Override - public void afterPropertiesSet() { - String cacheKey = String.join("_", AppEnum.getCurApp().getValue(), getActName(), "draw_map_pos"); - userMapPos = redissonClient.getMap(cacheKey); - } - - public Integer addPos(Long uid, Integer step) { - return userMapPos.addAndGet(uid, step); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/halloween/HalloweenTicketTaskDao.java b/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/halloween/HalloweenTicketTaskDao.java deleted file mode 100644 index a9cf7571b..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/halloween/HalloweenTicketTaskDao.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.accompany.business.halloween; - -import com.accompany.business.base.BaseTicketTaskActDao; -import com.accompany.business.halloween.constant.HalloweenConstant; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -@Service -@Slf4j -public class HalloweenTicketTaskDao extends BaseTicketTaskActDao { - - @Override - protected String getActName() { - return HalloweenConstant.actName; - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/mapper/DoubleElevenTaskRecordDao.java b/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/mapper/DoubleElevenTaskRecordDao.java deleted file mode 100644 index bff621578..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/mapper/DoubleElevenTaskRecordDao.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.accompany.business.mapper; - -import com.accompany.business.doubleeleven.model.DoubleElevenTaskRecord; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface DoubleElevenTaskRecordDao extends BaseMapper { - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/mapper/HalloweenDrawBoxRecordDao.java b/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/mapper/HalloweenDrawBoxRecordDao.java deleted file mode 100644 index 8b94aa4e7..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/mapper/HalloweenDrawBoxRecordDao.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.accompany.business.mapper; - -import com.accompany.business.halloween.model.HalloweenDrawBoxRecord; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface HalloweenDrawBoxRecordDao extends BaseMapper { - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/mapper/HalloweenDrawRecordDao.java b/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/mapper/HalloweenDrawRecordDao.java deleted file mode 100644 index 9b80c1cc5..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/mapper/HalloweenDrawRecordDao.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.accompany.business.mapper; - -import com.accompany.business.halloween.model.HalloweenDrawUserRecord; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface HalloweenDrawRecordDao extends BaseMapper { - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/mapper/HalloweenTaskRecordDao.java b/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/mapper/HalloweenTaskRecordDao.java deleted file mode 100644 index 2bc2a794f..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/mapper/HalloweenTaskRecordDao.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.accompany.business.mapper; - -import com.accompany.business.halloween.model.HalloweenTaskRecord; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface HalloweenTaskRecordDao extends BaseMapper { - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/mapper/MidAutumnDrawRecordDao.java b/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/mapper/MidAutumnDrawRecordDao.java deleted file mode 100644 index a017dfe37..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/mapper/MidAutumnDrawRecordDao.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.accompany.business.mapper; - -import com.accompany.business.midautumn.model.MidAutumnDrawUserRecord; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface MidAutumnDrawRecordDao extends BaseMapper { - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/mapper/MidAutumnJackpotContributionDao.java b/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/mapper/MidAutumnJackpotContributionDao.java deleted file mode 100644 index 00a5851c4..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/mapper/MidAutumnJackpotContributionDao.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.accompany.business.mapper; - -import com.accompany.business.midautumn.model.MidAutumnJackpotContribution; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface MidAutumnJackpotContributionDao extends BaseMapper { - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/mapper/MidAutumnTaskRecordDao.java b/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/mapper/MidAutumnTaskRecordDao.java deleted file mode 100644 index 3eb2499c6..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/mapper/MidAutumnTaskRecordDao.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.accompany.business.mapper; - -import com.accompany.business.midautumn.model.MidAutumnTaskRecord; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface MidAutumnTaskRecordDao extends BaseMapper { - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/mapper/QixiRankDao.java b/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/mapper/QixiRankDao.java deleted file mode 100644 index a6a145258..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/mapper/QixiRankDao.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.accompany.business.mapper; - -import com.accompany.business.qixi.model.QixiRankHourCp; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.Set; - -@Mapper -public interface QixiRankDao { - - QixiRankHourCp getHourCp(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("actGiftIds") Set actGiftIds); - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/mapper/QixiRedLineRecordDao.java b/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/mapper/QixiRedLineRecordDao.java deleted file mode 100644 index 16eca159b..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/mapper/QixiRedLineRecordDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.accompany.business.mapper; - -import com.accompany.business.qixi.model.QixiRedLineUserRecord; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -@Mapper -public interface QixiRedLineRecordDao { - - List pageUserRecord(@Param("uid") Long uid, @Param("page") Integer page, @Param("size") Integer size); - - int insertRecord(@Param("record") QixiRedLineUserRecord record); -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/midautumn/MidAutumnMoonCakeNumDao.java b/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/midautumn/MidAutumnMoonCakeNumDao.java deleted file mode 100644 index 24f67db15..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/midautumn/MidAutumnMoonCakeNumDao.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.accompany.business.midautumn; - -import com.accompany.business.base.BaseTicketActDao; -import com.accompany.business.midautumn.constant.MidAutumnConstant; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -@Service -@Slf4j -public class MidAutumnMoonCakeNumDao extends BaseTicketActDao { - - @Override - protected String getActName() { - return MidAutumnConstant.actName; - } - - @Override - protected void logAfterAddUserTicketNum(Long uid, Integer num, Integer curTicketNum, Integer totalTicketNum) { - log.info("[2023中秋活动]-任务 {} 增加 {} 个月饼， 剩余 {} 个月饼， 累计获得 {} 个月饼", uid, num, curTicketNum, totalTicketNum); - } - - @Override - protected void logAfterReduceUserTicketNum(Long uid, Integer num, Integer curTicketNum) { - log.info("[2023中秋活动]-任务 {} 消耗 {} 个月饼， 剩余 {} 个月饼", uid, num, curTicketNum); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/midautumn/MidAutumnTicketTaskDao.java b/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/midautumn/MidAutumnTicketTaskDao.java deleted file mode 100644 index 6b696258d..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/midautumn/MidAutumnTicketTaskDao.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.accompany.business.midautumn; - -import com.accompany.business.base.BaseTicketTaskActDao; -import com.accompany.business.midautumn.constant.MidAutumnConstant; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -@Service -@Slf4j -public class MidAutumnTicketTaskDao extends BaseTicketTaskActDao { - - @Override - protected String getActName() { - return MidAutumnConstant.actName; - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/qixi/QixiRedBagDao.java b/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/qixi/QixiRedBagDao.java deleted file mode 100644 index ddfaefba2..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/qixi/QixiRedBagDao.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.accompany.business.qixi; - -import com.accompany.business.qixi.constant.QixiConstant; -import com.accompany.business.qixi.dto.QixiUserRedBagDto; -import lombok.extern.slf4j.Slf4j; -import org.redisson.api.RMap; -import org.redisson.api.RedissonClient; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.util.HashMap; -import java.util.Map; - -@Service -@Slf4j -public class QixiRedBagDao implements InitializingBean { - - @Autowired - private RedissonClient redissonClient; - private RMap> userRedBagMap; - - public Map getUserRedBagMap(Long uid){ - Map userRedBag = userRedBagMap.get(uid); - if (CollectionUtils.isEmpty(userRedBag)){ - userRedBag = buildInitRedBag(); - } - return userRedBag; - } - - private Map buildInitRedBag() { - Map redBagMap = new HashMap<>(); - for (int redBagId = 1; redBagId <= 4; redBagId++){ - QixiUserRedBagDto dto = new QixiUserRedBagDto(); - dto.setId(redBagId); - dto.setAble(Boolean.TRUE); - - redBagMap.put(String.valueOf(redBagId), dto); - } - return redBagMap; - } - - public void updateUserRedBagMap(Long uid, Map redBagMap) { - userRedBagMap.put(uid, redBagMap); - } - - public void freshRedBag(Long uid) { - userRedBagMap.remove(uid); - } - - @Override - public void afterPropertiesSet() { - userRedBagMap = redissonClient.getMap(QixiConstant.RedisKey.QIXI_REDLINE_USER_RED_BAG); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/qixi/QixiRedLineNumDao.java b/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/qixi/QixiRedLineNumDao.java deleted file mode 100644 index de3a8d382..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/qixi/QixiRedLineNumDao.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.accompany.business.qixi; - -import com.accompany.business.qixi.constant.QixiConstant; -import lombok.extern.slf4j.Slf4j; -import org.redisson.api.RMap; -import org.redisson.api.RedissonClient; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -@Service -@Slf4j -public class QixiRedLineNumDao implements InitializingBean { - - @Autowired - private RedissonClient redissonClient; - - private RMap userTotalRedLineNum; - private RMap userRedLineNum; - - public Integer getUserRedLineNum(Long uid){ - return userRedLineNum.getOrDefault(uid, 0); - } - - public Integer getUserTotalRedLineNum(Long uid){ - return userTotalRedLineNum.getOrDefault(uid, 0); - } - - public Integer addUserRedLineNum(Long uid, Integer num) { - Integer totalNum = userTotalRedLineNum.addAndGet(uid, num); - Integer curNum = userRedLineNum.addAndGet(uid, num); - log.info("[2023七夕活动]-红线 {} 增加 {} 红线，当前剩余 {} 红线，累计获得 {} 红线", uid, num, curNum, totalNum); - return curNum; - } - - public Integer reduceUserRedLineNum(Long uid) { - return userRedLineNum.addAndGet(uid, -1); - } - - @Override - public void afterPropertiesSet() { - userTotalRedLineNum = redissonClient.getMap(QixiConstant.RedisKey.QIXI_REDLINE_USER_TOTAL_REDLINE_NUM); - userRedLineNum = redissonClient.getMap(QixiConstant.RedisKey.QIXI_REDLINE_USER_REDLINE_NUM); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/qixi/QixiXiqueNumDao.java b/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/qixi/QixiXiqueNumDao.java deleted file mode 100644 index df6d5a7d5..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/qixi/QixiXiqueNumDao.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.accompany.business.qixi; - -import com.accompany.business.qixi.constant.QixiConstant; -import lombok.extern.slf4j.Slf4j; -import org.redisson.api.RAtomicLong; -import org.redisson.api.RMap; -import org.redisson.api.RedissonClient; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -@Service -@Slf4j -public class QixiXiqueNumDao implements InitializingBean { - - @Autowired - private RedissonClient redissonClient; - - private RAtomicLong serverXiqueNum; - - private RMap userDevotedXiQueNum; - - private RMap userTotalXiqueNum; - private RMap userCurXiqueNum; - - public Integer getUserXiqueNum(Long uid) { - return userCurXiqueNum.getOrDefault(uid, 0); - } - - public Integer addUserXiqueNum(Long uid, Integer num){ - Integer totalXiqueNum = userTotalXiqueNum.addAndGet(uid, num); - Integer curXiqueNum = userCurXiqueNum.addAndGet(uid, num); - log.info("[2023七夕活动]-喜鹊 {} 增加 {} 喜鹊， 剩余 {} 喜鹊， 累计获得 {} 喜鹊", uid, num, curXiqueNum, totalXiqueNum); - return curXiqueNum; - } - - public Integer getUserTotalXiqueNum(Long uid) { - return userTotalXiqueNum.getOrDefault(uid, 0); - } - - public Long getServerCurXiqueNum() { - return serverXiqueNum.get(); - } - - public Long devotedXique(Long uid, Integer num){ - Long serverAfterNum = serverXiqueNum.addAndGet(num); - Integer userDevotedAfterNum = userDevotedXiQueNum.addAndGet(uid, num); - Integer userCurAfterNum = userCurXiqueNum.addAndGet(uid, -num); - log.info("[2023七夕活动]-喜鹊 {} 投放喜鹊 {} 个后，全服累计 {} 个，用户累计投放 {} 个， 用户当前拥有 {} 个", - uid, num, serverAfterNum, userDevotedAfterNum, userCurAfterNum); - return serverAfterNum; - } - - public Integer getUserDevotedXiqueNum(Long uid) { - return userDevotedXiQueNum.get(uid); - } - - public boolean updateDevotedStatus(Long uid) { - Integer userXiqueNum = userDevotedXiQueNum.get(uid); - if (userXiqueNum <= 0){ - return false; - } - Integer afterNum = userDevotedXiQueNum.addAndGet(uid, -userXiqueNum); - if (afterNum < 0){ - userDevotedXiQueNum.put(uid, 0); - return false; - } - return true; - } - - @Override - public void afterPropertiesSet() { - serverXiqueNum = redissonClient.getAtomicLong(QixiConstant.RedisKey.QIXI_XIQUE_SERVER_NUM); - userDevotedXiQueNum = redissonClient.getMap(QixiConstant.RedisKey.QIXI_XIQUE_USER_DEVOTED_NUM); - userTotalXiqueNum = redissonClient.getMap(QixiConstant.RedisKey.QIXI_XIQUE_USER_TOTAL_NUM); - userCurXiqueNum = redissonClient.getMap(QixiConstant.RedisKey.QIXI_XIQUE_USER_CUR_NUM); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/qixi/QixiXiqueTaskDao.java b/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/qixi/QixiXiqueTaskDao.java deleted file mode 100644 index a06b816ed..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/qixi/QixiXiqueTaskDao.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.accompany.business.qixi; - -import com.accompany.business.qixi.constant.QixiConstant; -import com.accompany.business.qixi.dto.QixiXiqueConfigDto; -import lombok.extern.slf4j.Slf4j; -import org.redisson.api.RMap; -import org.redisson.api.RedissonClient; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Map; -import java.util.Set; - -@Service -@Slf4j -public class QixiXiqueTaskDao implements InitializingBean { - - @Autowired - private RedissonClient redissonClient; - - private RMap userDailyTaskProgress; - - public Map getUserDailyTaskProgress(Set keySet){ - return userDailyTaskProgress.getAll(keySet); - } - - public int processTask(String taskKey, QixiXiqueConfigDto.QixiXiqueDailyTask task, Integer process) { - Integer cur = userDailyTaskProgress.getOrDefault(taskKey, 0); - - Integer maxNeed = task.getNeedMap().keySet().stream().mapToInt(Integer::intValue).max().getAsInt(); - - if (cur > maxNeed){ - userDailyTaskProgress.put(taskKey, maxNeed); - } else if (cur < maxNeed) { - Integer afterCur = userDailyTaskProgress.addAndGet(taskKey, process); - if (afterCur > maxNeed){ - userDailyTaskProgress.put(taskKey, maxNeed); - } - - return task.getNeedMap().keySet().stream() - .filter(need-> afterCur >= need && cur < need) - .mapToInt(key-> task.getNeedMap().get(key)).sum(); - } - return 0; - } - - @Override - public void afterPropertiesSet() throws Exception { - userDailyTaskProgress = redissonClient.getMap(QixiConstant.RedisKey.QIXI_XIQUE_USER_DAILY_TASK); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/valentine/ValentinesCpDao.java b/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/valentine/ValentinesCpDao.java deleted file mode 100644 index 3176e5b6e..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/valentine/ValentinesCpDao.java +++ /dev/null @@ -1,215 +0,0 @@ -package com.accompany.business.valentine; - -import com.accompany.business.common.dto.CpRankActConfigDto; -import com.accompany.business.common.dto.CpRankActCpProp; -import com.accompany.business.valentine.constant.ValentinesConstant; -import com.accompany.common.constant.AppEnum; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.base.SpringContextHolder; -import com.accompany.core.exception.ServiceException; -import lombok.extern.slf4j.Slf4j; -import org.redisson.api.RLock; -import org.redisson.api.RMap; -import org.redisson.api.RedissonClient; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.*; -import java.util.concurrent.TimeUnit; -import java.util.function.Function; -import java.util.stream.Collectors; - -@Service -@Slf4j -public class ValentinesCpDao implements InitializingBean { - - private final String MODULE_NAME = "cp_rank"; - - @Autowired - private RedissonClient redissonClient; - - private RMap cpPropMap; - private RMap> userCpPropMap; - - @Override - public void afterPropertiesSet() throws Exception { - String cpPropKey = String.join("_", AppEnum.getCurApp().getValue(), ValentinesConstant.actName, MODULE_NAME, "cp_prop"); - cpPropMap = redissonClient.getMap(cpPropKey); - String userCpProp = String.join("_", AppEnum.getCurApp().getValue(), ValentinesConstant.actName, MODULE_NAME, "user_cp_prop"); - userCpPropMap = redissonClient.getMap(userCpProp); - } - - public Long getTheMaxScoreByUid(Long uid) { - Map propMap = userCpPropMap.get(uid); - if (CollectionUtils.isEmpty(propMap)){ - return 0L; - } - return propMap.values().stream().max(Comparator.comparing(CpRankActCpProp::getScore)).map(CpRankActCpProp::getScore).orElse(0L); - } - - public List listCpByUid(Long uid, Long size) { - Map propMap = userCpPropMap.get(uid); - if (CollectionUtils.isEmpty(propMap)){ - return null; - } - if (null == size){ - size = Long.MAX_VALUE; - } - return propMap.values().stream() - .sorted(Comparator.comparing(CpRankActCpProp::getScore).reversed()).limit(size).collect(Collectors.toList()); - } - - public String buildCpUid(Long fromUid, Long toUid){ - List uidList = new ArrayList<>(2); - uidList.add(fromUid); - uidList.add(toUid); - return uidList.stream().sorted() - .map(Object::toString) - .collect(Collectors.joining("_")); - } - - public List takeApartCpUid(String cpUid) { - return Arrays.stream(cpUid.split("_")).map(Long::parseLong).collect(Collectors.toList()); - } - - public CpRankActCpProp getCpPropByCpUid(String cpUid) { - return cpPropMap.get(cpUid); - } - - public Map mapCpPropByCpUidSet(Set cpUidSet) { - Map map = cpPropMap.getAll(cpUidSet); - if (CollectionUtils.isEmpty(map)){ - return Collections.emptyMap(); - } - return map; - } - - private R withLock(Long uid, String redisKey, Function, R> function){ - String lockKey = String.join("_", AppEnum.getCurApp().getValue(), ValentinesConstant.actName, MODULE_NAME, redisKey, uid.toString()); - RLock lock = redissonClient.getLock(lockKey); - boolean isLocked = false; - try { - isLocked = lock.tryLock(3, TimeUnit.SECONDS); - if (!isLocked){ - log.error("[2024情人节活动] {} 获取 {} 锁超时", uid, lockKey); - throw new ServiceException(BusiStatus.SERVERBUSY); - } - Map propMap = userCpPropMap.getOrDefault(uid, new HashMap<>()); - return function.apply(propMap); - } catch (InterruptedException e) { - log.error("[2024情人节活动] {} 获取 {} 锁异常", uid, lockKey, e); - throw new ServiceException(BusiStatus.SERVERBUSY); - } finally { - if (isLocked){ - lock.unlock(); - } - } - } - - public void saveCpProp(CpRankActCpProp cpProp, CpRankActConfigDto configDto) { - if (!cpPropMap.fastPutIfAbsent(cpProp.getCpUid(), cpProp)){ - return; - } - - saveUserCpProp(cpProp.getFromUid(), cpProp.getToUid(), cpProp, configDto); - saveUserCpProp(cpProp.getToUid(), cpProp.getFromUid(), cpProp, configDto); - } - - public List saveUserCpProp(Long fromUid, Long toUid, CpRankActCpProp userProp, CpRankActConfigDto config){ - return withLock(fromUid, "user_cp_prop_lock", propMap->{ - if (CollectionUtils.isEmpty(propMap)){ - propMap.put(toUid.toString(), userProp); - userCpPropMap.fastPut(fromUid, propMap); - return null; - } - - CpRankActCpProp cpUserProp = propMap.get(toUid.toString()); - if (null == cpUserProp){ - propMap.put(toUid.toString(), userProp); - userCpPropMap.fastPut(fromUid, propMap); - return null; - } - - if (cpUserProp.getScore() >= userProp.getScore()){ - return null; - } - - Long maxScore = getTheMaxScoreByUid(fromUid); - - //更新分数 - cpUserProp.setScore(userProp.getScore()); - - userCpPropMap.fastPut(fromUid, propMap); - - if (cpUserProp.getScore().compareTo(maxScore) > 0){ - List taskIds = config.getCpScoreTasks().stream() - .filter(task->maxScore.compareTo(task.getScore()) < 0 - && cpUserProp.getScore().compareTo(task.getScore()) >= 0) - .map(CpRankActConfigDto.CpScoreTask::getId).collect(Collectors.toList()); - return taskIds; - } - - return null; - }); - } - - public Map> updateCpScore(String cpUid, Double totalScore, CpRankActConfigDto config) { - CpRankActCpProp cpProp = getCpPropByCpUid(cpUid); - if (null == cpProp){ - return null; - } - long score = BigDecimal.valueOf(totalScore).setScale(0, RoundingMode.DOWN).longValue(); - if (cpProp.getScore() >= score){ - return null; - } - - boolean needUpdate = false; - boolean locked = false; - String lockKey = String.join("_", AppEnum.getCurApp().getValue(), ValentinesConstant.actName, MODULE_NAME, "cp_prop_lock", cpUid); - RLock lock = redissonClient.getLock(lockKey); - try { - locked = lock.tryLock(3, TimeUnit.SECONDS); - if (!locked){ - throw new ServiceException(BusiStatus.SERVERBUSY); - } - - cpProp = getCpPropByCpUid(cpUid); - if (cpProp.getScore() < score){ - cpProp.setScore(score); - cpPropMap.fastPut(cpUid, cpProp); - needUpdate = true; - } - - } catch (InterruptedException e) { - //todo log - throw new RuntimeException(e); - } finally { - if (locked){ - lock.unlock(); - } - } - - if (!needUpdate){ - return null; - } - - Map> taskMap = new HashMap<>(); - - List taskIds = SpringContextHolder.getBean(ValentinesCpDao.class).saveUserCpProp(cpProp.getFromUid(), cpProp.getToUid(), cpProp, config); - if (!CollectionUtils.isEmpty(taskIds)){ - taskMap.put(cpProp.getFromUid(), taskIds); - } - - List taskIdsList = SpringContextHolder.getBean(ValentinesCpDao.class).saveUserCpProp(cpProp.getToUid(), cpProp.getFromUid(), cpProp, config); - if (!CollectionUtils.isEmpty(taskIdsList)){ - taskMap.put(cpProp.getToUid(), taskIdsList); - } - - return taskMap; - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/resources/com/accompany/business/mapper/DoubleElevenTaskRecordDao.xml b/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/resources/com/accompany/business/mapper/DoubleElevenTaskRecordDao.xml deleted file mode 100644 index bec9ed8e4..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/resources/com/accompany/business/mapper/DoubleElevenTaskRecordDao.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/resources/com/accompany/business/mapper/HalloweenDrawBoxRecordDao.xml b/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/resources/com/accompany/business/mapper/HalloweenDrawBoxRecordDao.xml deleted file mode 100644 index 23e9cdc45..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/resources/com/accompany/business/mapper/HalloweenDrawBoxRecordDao.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/resources/com/accompany/business/mapper/HalloweenDrawRecordDao.xml b/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/resources/com/accompany/business/mapper/HalloweenDrawRecordDao.xml deleted file mode 100644 index c2047678a..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/resources/com/accompany/business/mapper/HalloweenDrawRecordDao.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/resources/com/accompany/business/mapper/HalloweenTaskRecordDao.xml b/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/resources/com/accompany/business/mapper/HalloweenTaskRecordDao.xml deleted file mode 100644 index a2e4d3239..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/resources/com/accompany/business/mapper/HalloweenTaskRecordDao.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/resources/com/accompany/business/mapper/MidAutumnDrawRecordDao.xml b/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/resources/com/accompany/business/mapper/MidAutumnDrawRecordDao.xml deleted file mode 100644 index 553b0d043..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/resources/com/accompany/business/mapper/MidAutumnDrawRecordDao.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/resources/com/accompany/business/mapper/MidAutumnJackpotContributionDao.xml b/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/resources/com/accompany/business/mapper/MidAutumnJackpotContributionDao.xml deleted file mode 100644 index 2c4f6d4fb..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/resources/com/accompany/business/mapper/MidAutumnJackpotContributionDao.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/resources/com/accompany/business/mapper/MidAutumnTaskRecordDao.xml b/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/resources/com/accompany/business/mapper/MidAutumnTaskRecordDao.xml deleted file mode 100644 index 93baeb8a4..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/resources/com/accompany/business/mapper/MidAutumnTaskRecordDao.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/resources/com/accompany/business/mapper/QixiRankDao.xml b/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/resources/com/accompany/business/mapper/QixiRankDao.xml deleted file mode 100644 index 8305f4d40..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/resources/com/accompany/business/mapper/QixiRankDao.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/resources/com/accompany/business/mapper/QixiRedLineRecordDao.xml b/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/resources/com/accompany/business/mapper/QixiRedLineRecordDao.xml deleted file mode 100644 index fb8819703..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/resources/com/accompany/business/mapper/QixiRedLineRecordDao.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - insert into qi_xi_red_line_user_record(uid,red_bag_id,`type`,ref_id,`name`,num, unit, create_time) - value (#{record.uid},#{record.redBagId},#{record.type},#{record.refId},#{record.name},#{record.num},#{record.unit},#{record.createTime}) - - - \ No newline at end of file diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/annual/AnnualCpRankTask.java b/accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/annual/AnnualCpRankTask.java deleted file mode 100644 index 7ba94d476..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/annual/AnnualCpRankTask.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.accompany.scheduler.annual; - -import com.accompany.business.annual.service.AnnualCpRankService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; - -import java.time.LocalDateTime; - -@Component -@Slf4j -public class AnnualCpRankTask { - - @Autowired - private AnnualCpRankService service; - - @Scheduled(cron = "1 0 0 * * ?") - public void settlement(){ - LocalDateTime now = LocalDateTime.now(); - service.settlement(now); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/annual/AnnualPopularRankTask.java b/accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/annual/AnnualPopularRankTask.java deleted file mode 100644 index f8b38d944..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/annual/AnnualPopularRankTask.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.accompany.scheduler.annual; - -import com.accompany.business.annual.service.AnnualPopularRankService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; - -import java.time.LocalDateTime; - -@Component -@Slf4j -public class AnnualPopularRankTask { - - @Autowired - private AnnualPopularRankService service; - - @Scheduled(cron = "1 0 0 * * ?") - public void settlement(){ - LocalDateTime now = LocalDateTime.now(); - service.settlement(now); - service.initRank(now); - } - - @Scheduled(cron = "1 0 * * * ?") - public void hourTopOne(){ - LocalDateTime now = LocalDateTime.now(); - service.notifyHourTopOne(now); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/annual/AnnualRoomRankTask.java b/accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/annual/AnnualRoomRankTask.java deleted file mode 100644 index 393afb837..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/annual/AnnualRoomRankTask.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.accompany.scheduler.annual; - -import com.accompany.business.annual.service.AnnualRoomRankService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; - -import java.time.LocalDateTime; - -@Component -@Slf4j -public class AnnualRoomRankTask { - - @Autowired - private AnnualRoomRankService service; - - @Scheduled(cron = "1 0 0 * * ?") - public void settlement(){ - LocalDateTime now = LocalDateTime.now(); - service.settlement(now); - service.initRank(now); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/annual/AnnualTyrantRankTask.java b/accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/annual/AnnualTyrantRankTask.java deleted file mode 100644 index 40946a851..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/annual/AnnualTyrantRankTask.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.accompany.scheduler.annual; - -import com.accompany.business.annual.service.AnnualTyrantRankService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; - -import java.time.LocalDateTime; - -@Component -@Slf4j -public class AnnualTyrantRankTask { - - @Autowired - private AnnualTyrantRankService service; - - @Scheduled(cron = "1 0 0 * * ?") - public void settlement(){ - LocalDateTime now = LocalDateTime.now(); - service.settlement(now); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/christmas/ChristmasRankTask.java b/accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/christmas/ChristmasRankTask.java deleted file mode 100644 index e173c4131..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/christmas/ChristmasRankTask.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.accompany.scheduler.christmas; - -import com.accompany.business.christmas.service.ChristmasRankService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; - -import java.time.LocalDateTime; - -@Component -@Slf4j -public class ChristmasRankTask { - - @Autowired - private ChristmasRankService service; - - @Scheduled(cron = "1 0 0 * * ?") - public void settlement(){ - LocalDateTime now = LocalDateTime.now(); - service.settlement(now); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/doubleeleven/DoubleElevenRankTask.java b/accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/doubleeleven/DoubleElevenRankTask.java deleted file mode 100644 index 6351c6fff..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/doubleeleven/DoubleElevenRankTask.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.accompany.scheduler.doubleeleven; - -import com.accompany.business.doubleeleven.service.DoubleElevenRankService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; - -import java.time.LocalDateTime; - -@Component -@Slf4j -public class DoubleElevenRankTask { - - @Autowired - private DoubleElevenRankService service; - - @Scheduled(cron = "1 0 0 * * ?") - public void settlement(){ - LocalDateTime now = LocalDateTime.now(); - service.settlement(now); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/exp/ExpBattleRankTask.java b/accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/exp/ExpBattleRankTask.java deleted file mode 100644 index 065295e58..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/exp/ExpBattleRankTask.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.accompany.scheduler.exp; - -import com.accompany.business.exp.service.ExpBattleActService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; - -import java.time.ZonedDateTime; - -@Component -@Slf4j -public class ExpBattleRankTask { - - @Autowired - private ExpBattleActService service; - - @Scheduled(cron = "1 0 0,5 * * ?") - public void settlement(){ - ZonedDateTime zonedDateTime = ZonedDateTime.now(); - service.settlement(zonedDateTime, true); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/halloween/HalloweenRankTask.java b/accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/halloween/HalloweenRankTask.java deleted file mode 100644 index 1c52ddf7e..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/halloween/HalloweenRankTask.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.accompany.scheduler.halloween; - -import com.accompany.business.halloween.service.HalloweenRankService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; - -import java.time.LocalDateTime; - -@Component -@Slf4j -public class HalloweenRankTask { - - @Autowired - private HalloweenRankService service; - - @Scheduled(cron = "1 0 0 * * ?") - public void settlement(){ - LocalDateTime now = LocalDateTime.now(); - service.settlement(now); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/midautumn/MidAutumnJackpotTask.java b/accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/midautumn/MidAutumnJackpotTask.java deleted file mode 100644 index 842eb078a..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/midautumn/MidAutumnJackpotTask.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.accompany.scheduler.midautumn; - -import com.accompany.business.midautumn.service.MidAutumnJackpotCalculateService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; - -@Component -@Slf4j -public class MidAutumnJackpotTask { - - @Autowired - private MidAutumnJackpotCalculateService service; - - @Scheduled(cron = "0 35 20 * * ?") - public void allotJackpot() { - service.calculateJackpot(null); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/midautumn/MidAutumnRankTask.java b/accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/midautumn/MidAutumnRankTask.java deleted file mode 100644 index 27fef0663..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/midautumn/MidAutumnRankTask.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.accompany.scheduler.midautumn; - -import com.accompany.business.midautumn.service.MidAutumnRankService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; - -import java.time.LocalDateTime; - -@Component -@Slf4j -public class MidAutumnRankTask { - - @Autowired - private MidAutumnRankService service; - - @Scheduled(cron = "1 0 0 * * ?") - public void settlement(){ - LocalDateTime now = LocalDateTime.now(); - service.settlement(now); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/qixi/QixiRankTask.java b/accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/qixi/QixiRankTask.java deleted file mode 100644 index 386617979..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/qixi/QixiRankTask.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.accompany.scheduler.qixi; - -import com.accompany.business.qixi.service.QixiRankService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; - -import java.time.LocalDateTime; - -@Component -@Slf4j -public class QixiRankTask { - - @Autowired - private QixiRankService service; - - @Scheduled(cron = "1 0 0 * * ?") - public void settlement(){ - LocalDateTime now = LocalDateTime.now(); - service.settlement(now); - } - - @Scheduled(cron = "0 0 * * * ?") - public void buildCpHourRank(){ - LocalDateTime now = LocalDateTime.now(); - service.buildCpHourRank(now); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/special/SpecialRankTask.java b/accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/special/SpecialRankTask.java deleted file mode 100644 index 4d22526a3..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/special/SpecialRankTask.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.accompany.scheduler.special; - -import com.accompany.business.special.service.SpecialGiftRankService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; - -import java.time.LocalDateTime; - -@Component -@Slf4j -public class SpecialRankTask { - - @Autowired - private SpecialGiftRankService service; - - @Scheduled(cron = "1 0 0 * * ?") - public void settlement(){ - LocalDateTime now = LocalDateTime.now(); - service.settlement(now); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/valentines/ValentinesCpRankTask.java b/accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/valentines/ValentinesCpRankTask.java deleted file mode 100644 index dca92e927..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-scheduler/src/main/java/com/accompany/scheduler/valentines/ValentinesCpRankTask.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.accompany.scheduler.valentines; - -import com.accompany.business.valentine.service.ValentinesCpRankService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; - -import java.time.LocalDateTime; - -@Component -@Slf4j -public class ValentinesCpRankTask { - - @Autowired - private ValentinesCpRankService service; - - @Scheduled(cron = "1 0 0 * * ?") - public void settlement(){ - LocalDateTime now = LocalDateTime.now(); - service.settlement(now); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/activity/constant/ValentinesDayConstant.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/activity/constant/ValentinesDayConstant.java deleted file mode 100644 index 383c1596a..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/activity/constant/ValentinesDayConstant.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.accompany.business.activity.constant; - -/** - * @author: liaozetao - * @date: 2024/1/31 17:17 - * @description: - */ -public interface ValentinesDayConstant { - - String actName = "valentines_day_2024"; -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/annual/constant/AnnualConstant.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/annual/constant/AnnualConstant.java deleted file mode 100644 index 4fbb68048..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/annual/constant/AnnualConstant.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.accompany.business.annual.constant; - -public class AnnualConstant { - - public static String actName = "act_annual_2023"; - - public static class SysConfId { - public static final String TASK_CONFIG = actName + "_task_config"; - public static final String POPULAR_CONFIG = actName + "_popular_config"; - public static final String TYRANT_CONFIG = actName + "_tyrant_config"; - public static final String ROOM_CONFIG = actName + "_room_config"; - public static final String CP_CONFIG = actName + "_cp_config"; - public static final String GIFT_CONFIG = actName + "_gift_config"; - } - - public static class BtnStatus { - public static final Integer NONE = 0; - public static final Integer CAN = 1; - public static final Integer HAD = 2; - } - - public static class Tip { - public static final String POPULAR_HOUR_TOP_ONE_TIP = "恭喜，您已成功登頂年度盛典上一小時的TOP人氣主播，將享有10分鐘的20%榜單人氣值的加成！你的額外銘牌獎勵【巔峰時刻】已發放至個人裝扮，請前往查看~"; - public static final String ROOM_PK_TOP_ONE_TIP = "恭喜，您已助力房间【%s】获得本场PK的胜利！你的额外铭牌奖励【首席豪友】已发放至个人装扮，请前往查看~"; - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/annual/constant/AnnualGiftRankTypeEnum.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/annual/constant/AnnualGiftRankTypeEnum.java deleted file mode 100644 index e74c4b0bd..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/annual/constant/AnnualGiftRankTypeEnum.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.accompany.business.annual.constant; - -import com.accompany.business.common.constant.RankType; -import lombok.Getter; - -@Getter -public enum AnnualGiftRankTypeEnum implements RankType { - - GIFT1((byte)1, "冰晶之花", "rank_1"), - GIFT2((byte)2, "黎光勋章","rank_2"), - GIFT3((byte)3, "荣耀权杖", "rank_3"), - GIFT4((byte)4, "流光绮梦", "rank_4"), - GIFT5((byte)5, "冰霜王座", "rank_5"), - GIFT6((byte)6, "神祇荣光", "rank_6"), - ; - - private Byte type; - private String desc; - private String cacheKey; - - - AnnualGiftRankTypeEnum(Byte awardType, String desc, String cacheKey) { - this.type = awardType; - this.desc = desc; - this.cacheKey = cacheKey; - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/annual/dto/AnnualGiftRankActConfigDto.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/annual/dto/AnnualGiftRankActConfigDto.java deleted file mode 100644 index 5d850d211..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/annual/dto/AnnualGiftRankActConfigDto.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.accompany.business.annual.dto; - -import com.accompany.business.annual.constant.AnnualGiftRankTypeEnum; -import com.accompany.business.common.dto.MultiRankActConfigDto; -import lombok.Data; - -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -@Data -public class AnnualGiftRankActConfigDto extends MultiRankActConfigDto { - - public List getTypeByGiftId(Integer giftId){ - return getTypeConfigMap().entrySet().stream() - .filter(entry->entry.getValue().getActivityGiftId().contains(giftId)) - .map(Map.Entry::getKey) - .collect(Collectors.toList()); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/annual/dto/AnnualPopularConfigDto.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/annual/dto/AnnualPopularConfigDto.java deleted file mode 100644 index 76ed5e22f..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/annual/dto/AnnualPopularConfigDto.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.accompany.business.annual.dto; - -import com.accompany.business.common.dto.RewardDto; -import com.accompany.business.common.dto.RoundRankActConfigDto; -import com.accompany.common.utils.DateTimeUtil; -import lombok.Data; - -import java.time.LocalDateTime; -import java.time.LocalTime; -import java.time.format.DateTimeFormatter; -import java.util.Date; -import java.util.Map; - - -@Data -public class AnnualPopularConfigDto extends RoundRankActConfigDto { - - private Map popularGiftMap; - private HourRankConfig hourRankConfig; - - @Override - public double getScore(Long uid, Integer giftId, Integer giftNum, Long totalGoldNum, Date sendGiftTime) { - if (!popularGiftMap.containsKey(giftId)){ - return super.getScore(uid, giftId, giftNum, totalGoldNum, sendGiftTime); - } - return giftNum * popularGiftMap.get(giftId); - } - - @Data - public static class HourRankConfig { - private LocalTime startTime; - private LocalTime endTime; - - private Integer rankSize; - - private Double scoreRate; - private Integer rateMinute; - - private RewardDto reward; - private String skipUrl; - - public final static DateTimeFormatter HOUR_FORMATTER = DateTimeFormatter.ofPattern(DateTimeUtil.ACTIVITY_DATE_HOUR_PATTERN); - - public boolean inActTimeRange(LocalDateTime now){ - LocalTime nowTime = now.toLocalTime(); - return null != startTime && (nowTime.isAfter(startTime) || nowTime.equals(startTime)) - && null != endTime && (nowTime.isBefore(endTime) || nowTime.equals(endTime)); - } - - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/annual/dto/AnnualRoomConfigDto.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/annual/dto/AnnualRoomConfigDto.java deleted file mode 100644 index a5d36c82b..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/annual/dto/AnnualRoomConfigDto.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.accompany.business.annual.dto; - -import com.accompany.business.common.dto.RewardDto; -import com.accompany.business.common.dto.RoundRankActConfigDto; -import lombok.Data; - -import java.util.List; - - -@Data -public class AnnualRoomConfigDto extends RoundRankActConfigDto { - - private Double roomPkWinnerScorePercent; - private List roomPkTopOneRewardList; - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/annual/dto/AnnualTaskConfigDto.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/annual/dto/AnnualTaskConfigDto.java deleted file mode 100644 index 0b7eaef69..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/annual/dto/AnnualTaskConfigDto.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.accompany.business.annual.dto; - -import com.accompany.business.common.constant.RankTypeEnum; -import com.accompany.business.common.dto.RewardDto; -import com.accompany.business.common.dto.TimeRangeActConfigDto; -import lombok.Data; - -import java.util.List; -import java.util.Map; - -@Data -public class AnnualTaskConfigDto extends TimeRangeActConfigDto { - - private Map> tasks; - - @Data - public static class Task { - private Integer id; - private String desc; - private Integer need; - private List reward; - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/annual/vo/AnnualPopularHourRankVo.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/annual/vo/AnnualPopularHourRankVo.java deleted file mode 100644 index f67f51295..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/annual/vo/AnnualPopularHourRankVo.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.accompany.business.annual.vo; - -import com.accompany.business.common.vo.ActivityUserVo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.Date; -import java.util.List; - -@ApiModel -@NoArgsConstructor -@AllArgsConstructor -@Data -public class AnnualPopularHourRankVo { - - @ApiModelProperty("当前小时") - private Integer curHour; - @ApiModelProperty("当前小时结束时间") - private Date curHourEndTime; - @ApiModelProperty("排行榜") - private List rankList; - @ApiModelProperty("上小时榜一") - private RankItem lastTopOne; - - @Data - public static class RankItem extends AnnualPopularRankItemVo { - private ActivityUserVo assistance; - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/annual/vo/AnnualPopularRankItemVo.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/annual/vo/AnnualPopularRankItemVo.java deleted file mode 100644 index 60cb010d3..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/annual/vo/AnnualPopularRankItemVo.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.accompany.business.annual.vo; - -import com.accompany.business.common.vo.ActivityRankItemVo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -@ApiModel -public class AnnualPopularRankItemVo extends ActivityRankItemVo { - - @ApiModelProperty("直播中的rommUid") - private Long roomUid; - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/annual/vo/AnnualRoomPkInfoVo.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/annual/vo/AnnualRoomPkInfoVo.java deleted file mode 100644 index bd0363398..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/annual/vo/AnnualRoomPkInfoVo.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.accompany.business.annual.vo; - -import com.accompany.business.common.constant.RankRoundEnum; -import com.accompany.business.common.vo.ActivityCpItemVo; -import lombok.Data; - -import java.util.List; - -@Data -public class AnnualRoomPkInfoVo { - - private RankRoundEnum curRound; - - private List roomPkList; - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/annual/vo/AnnualRoomRankVo.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/annual/vo/AnnualRoomRankVo.java deleted file mode 100644 index 194a91144..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/annual/vo/AnnualRoomRankVo.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.accompany.business.annual.vo; - -import com.accompany.business.common.vo.RoundActivityRankVo; -import lombok.Data; - -@Data -public class AnnualRoomRankVo extends RoundActivityRankVo { - - private Boolean hasRoomPk; - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/annual/vo/AnnualTaskVo.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/annual/vo/AnnualTaskVo.java deleted file mode 100644 index 1c3578124..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/annual/vo/AnnualTaskVo.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.accompany.business.annual.vo; - -import com.accompany.business.common.vo.ActivityStageTaskItemVo; -import com.accompany.business.common.vo.ActivityUserVo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.Date; -import java.util.List; - -@ApiModel -@NoArgsConstructor -@AllArgsConstructor -@Data -public class AnnualTaskVo extends ActivityUserVo { - - @ApiModelProperty("开始时间") - private Date startTime; - @ApiModelProperty("结束时间") - private Date endTime; - @ApiModelProperty - private Byte type; - @ApiModelProperty - private Integer score; - @ApiModelProperty("下一阶段距离") - private Integer nextStageDist; - @ApiModelProperty("任务列表") - private List taskList; - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/children/dto/ChildrenDayConfigDto.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/children/dto/ChildrenDayConfigDto.java deleted file mode 100644 index ad5a4cbe2..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/children/dto/ChildrenDayConfigDto.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.accompany.business.children.dto; - -import lombok.Data; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author: liaozetao - * @date: 2024/5/23 18:16 - * @description: - */ -@Data -public class ChildrenDayConfigDto { - - /** - * 成功奖品列表 - */ - private List winRewardIdList = new ArrayList<>(); - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/children/vo/ChildrenDayTaskVo.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/children/vo/ChildrenDayTaskVo.java deleted file mode 100644 index d64c8ea3a..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/children/vo/ChildrenDayTaskVo.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.accompany.business.children.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author: liaozetao - * @date: 2024/5/23 10:00 - * @description: - */ -@Data -@ApiModel -public class ChildrenDayTaskVo { - - /** - * 登录活动页 - */ - @ApiModelProperty("登录活动页") - private Boolean isLoginTask = false; - - /** - * 关注新的好友数量 - */ - @ApiModelProperty("关注新的好友数量") - private Long userFollowCount = 0L; - - /** - * 关注一位新的好友 - */ - @ApiModelProperty("关注一位新的好友") - private Boolean isUserFollowTask = false; - - /** - * 停留超过10分钟次数 - */ - @ApiModelProperty("停留超过10分钟次数") - private Long keepTimeCount = 0L; - - /** - * 房间停留10min - */ - @ApiModelProperty("房间停留10min") - private Boolean isKeepTimeTask = false; - - /** - * 获得限定礼物金币数 - */ - @ApiModelProperty("获得限定礼物金币数") - private Long limitGiftCount = 0L; - - /** - * 送出or收到1000金币的61限定礼物 - */ - @ApiModelProperty("送出or收到1000金币的61限定礼物") - private Boolean isLimitGiftFor61Task = false; - - /** - * 参与许愿之星次数 - */ - @ApiModelProperty("参与许愿之星次数") - private Long joinPromiseStarCount = 0L; - - /** - * 参互许愿之星每参与10次 - */ - @ApiModelProperty("参与许愿之星每参与10次") - private Boolean isJoinPromiseStarFor10Task = false; - - /** - * 参与Greedy累计金币数 - */ - @ApiModelProperty("参与Greedy累计金币数") - private Long joinGreedyFor1000Count = 0L; - - /** - * 参与Greedy累计获得1000金币 - */ - @ApiModelProperty("参与Greedy累计获得1000金币") - private Boolean isJoinGreedyFor1000Task = false; - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/children/vo/ChildrenDrawRewardVo.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/children/vo/ChildrenDrawRewardVo.java deleted file mode 100644 index db29bf097..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/children/vo/ChildrenDrawRewardVo.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.accompany.business.children.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author: liaozetao - * @date: 2024/5/23 16:58 - * @description: - */ -@Data -@ApiModel -public class ChildrenDrawRewardVo { - - /** - * 当前用户头像 - */ - @ApiModelProperty("当前用户头像") - private String avatar; - - /** - * 主播房间UID - */ - @ApiModelProperty("主播房间UID") - private Long anchorRoomUid; - - /** - * 主播ID - */ - @ApiModelProperty("主播ID") - private Long anchorErBanNo; - - /** - * 主播昵称 - */ - @ApiModelProperty("主播昵称") - private String anchorNick; - - /** - * 主播头像 - */ - @ApiModelProperty("主播头像") - private String anchorAvatar; - - /** - * 是否直播中 - */ - @ApiModelProperty("是否直播中") - private Boolean isOnline = false; - - /** - * 是否中奖 - */ - @ApiModelProperty("是否中奖") - private Boolean isWin = false; - - /** - * 奖品图标 - */ - @ApiModelProperty("奖品图标") - private String rewardIcon; - - /** - * 奖品名称 - */ - @ApiModelProperty("奖品名称") - private String rewardName; -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/christmas/constant/ChristmasConstant.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/christmas/constant/ChristmasConstant.java deleted file mode 100644 index 98f376549..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/christmas/constant/ChristmasConstant.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.accompany.business.christmas.constant; - -public class ChristmasConstant { - - public static String actName = "act_christmas_2023"; - - public static class SysConfId { - public static final String ACT_LETTER_CONFIG = actName + "_letter_config"; - public static final String ACT_RANK_CONFIG = actName + "_rank_config"; - public static final String ACT_CP_RANK_CONFIG = actName + "_cp_rank_config"; - } - - public static class LetterTaskId { - public static final Integer ORANGE = 1; - public static final Integer BLUE = 2; - - public static final Integer PINK = 3; - public static final Integer GOLD = 4; - } - - public static class BusiStatus { - public static final String CHAR_LENGTH_LIMIT = "最多輸入50個字符"; - public static final String LETTER_NUM_UN_ENOUGH = "當前情書數量不足，請贈送對應禮物獲取"; - public static final String CONTEXT_SENSITIVE = "文案不符合規範，請重新輸入"; - } - - public static String LETTER_TIP = "用戶【%s】在【聖誕戀曲】活動中贈送了你一封情書，快去查看吧"; - - public static class BtnStatus { - public static final Integer NONE = 0; - public static final Integer CAN = 1; - public static final Integer HAD = 2; - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/christmas/dto/ChristmasCpProp.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/christmas/dto/ChristmasCpProp.java deleted file mode 100644 index 6698d5c14..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/christmas/dto/ChristmasCpProp.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.accompany.business.christmas.dto; - -import lombok.Data; - -import java.util.Date; - -@Data -public class ChristmasCpProp { - - private String cpUid; - private Long fromUid; - private Long toUid; - private Long score; - private Date createTime; - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/christmas/dto/ChristmasCpRankActConfigDto.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/christmas/dto/ChristmasCpRankActConfigDto.java deleted file mode 100644 index c5220f6dd..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/christmas/dto/ChristmasCpRankActConfigDto.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.accompany.business.christmas.dto; - -import com.accompany.business.common.dto.CpRankActConfigDto; -import com.accompany.business.common.dto.RewardDto; -import lombok.Data; - -import java.util.List; -import java.util.Set; - -@Data -public class ChristmasCpRankActConfigDto extends CpRankActConfigDto { - public Set cpRewardGiftIds; - public List cpRewardList; - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/christmas/dto/ChristmasCpUserProp.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/christmas/dto/ChristmasCpUserProp.java deleted file mode 100644 index 2d985ff4c..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/christmas/dto/ChristmasCpUserProp.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.accompany.business.christmas.dto; - -import com.accompany.business.common.dto.CpRankActCpProp; -import lombok.Data; - -import java.util.Map; - -@Data -public class ChristmasCpUserProp extends CpRankActCpProp { - - private Map cpTaskStatus; - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/christmas/dto/ChristmasLetterActConfigDto.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/christmas/dto/ChristmasLetterActConfigDto.java deleted file mode 100644 index b1077c805..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/christmas/dto/ChristmasLetterActConfigDto.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.accompany.business.christmas.dto; - -import com.accompany.business.common.dto.TaskActConfigDto; -import lombok.Data; - -@Data -public class ChristmasLetterActConfigDto extends TaskActConfigDto { - - private String skipUrl; - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/christmas/dto/ChristmasLetterDto.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/christmas/dto/ChristmasLetterDto.java deleted file mode 100644 index 5c418de4d..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/christmas/dto/ChristmasLetterDto.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.accompany.business.christmas.dto; - -import lombok.Data; - -import java.util.Date; - -@Data -public class ChristmasLetterDto { - - private Long fromUid; - private Long toUid; - private Integer letterId; - private String context; - private Date createTime; - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/christmas/vo/ChristmasCpUserPropVo.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/christmas/vo/ChristmasCpUserPropVo.java deleted file mode 100644 index 4902c3cb1..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/christmas/vo/ChristmasCpUserPropVo.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.accompany.business.christmas.vo; - -import com.accompany.business.common.vo.ActivityStageTaskItemVo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -@ApiModel -@Data -public class ChristmasCpUserPropVo { - - @ApiModelProperty("cpUid") - private String cpUid; - @ApiModelProperty("左uid") - private Long fromUid; - private Long fromErbanNo; - private String fromNick; - private String fromAvatar; - - @ApiModelProperty("右uid") - private Long toUid; - private Long toErbanNo; - private String toNick; - private String toAvatar; - - @ApiModelProperty("桃花值") - private Long score; - @ApiModelProperty("cp任务列表") - private List cpTaskList; - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/christmas/vo/ChristmasCpVo.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/christmas/vo/ChristmasCpVo.java deleted file mode 100644 index ceda7a131..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/christmas/vo/ChristmasCpVo.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.accompany.business.christmas.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -@ApiModel -@Data -public class ChristmasCpVo { - - private Long uid; - @ApiModelProperty("圣诞礼盒状态（0=未，1=可，2=已）") - private Integer boxStatus; - @ApiModelProperty("cp列表") - private List cpList; -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/christmas/vo/ChristmasLetterConfigVo.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/christmas/vo/ChristmasLetterConfigVo.java deleted file mode 100644 index 8cc297799..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/christmas/vo/ChristmasLetterConfigVo.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.accompany.business.christmas.vo; - -import com.accompany.business.common.vo.ActivityRankItemVo; -import com.accompany.business.common.vo.ActivityUserVo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -@ApiModel -@Data -public class ChristmasLetterConfigVo extends ActivityUserVo { - - @ApiModelProperty("开始时间") - private Date startTime; - @ApiModelProperty("结束时间") - private Date endTime; - @ApiModelProperty("情书券数") - private Map letterNumMap; - @ApiModelProperty("cp列表") - private List cpList; -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/christmas/vo/ChristmasLetterVo.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/christmas/vo/ChristmasLetterVo.java deleted file mode 100644 index 972ef5fa5..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/christmas/vo/ChristmasLetterVo.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.accompany.business.christmas.vo; - -import lombok.Data; - -import java.util.Date; - -@Data -public class ChristmasLetterVo { - - private Long fromUid; - private Long fromErbanNo; - private String fromNick; - private String fromAvatar; - - private Long toUid; - private Long toErbanNo; - private String toNick; - private String toAvatar; - - private Integer letterId; - private String context; - private Date createTime; - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/crossroompk/dto/CrossRoomPkActConfigDto.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/crossroompk/dto/CrossRoomPkActConfigDto.java deleted file mode 100644 index 076d98538..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/crossroompk/dto/CrossRoomPkActConfigDto.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.accompany.business.crossroompk.dto; - -import com.accompany.business.common.dto.RewardDto; -import lombok.Data; - -import java.util.List; - -/** - * @author: liaozetao - * @date: 2024/6/11 14:48 - * @description: - */ -@Data -public class CrossRoomPkActConfigDto { - - /** - * 是否开启 - */ - private Boolean open = false; - - /** - * 开始 - */ - private Integer startDayOfWeek; - - /** - * 结束 - */ - private Integer endDayOfWeek; - - /** - * 开始小时 - */ - private Integer startHour; - - /** - * 结束小时 - */ - private Integer endHour; - - /** - * 条件 - */ - private Integer condition; - - /** - * 限定条件 - */ - private Integer limit = 0; - - /** - * 分区 - */ - private Integer partitionFlag = 0b100; - - /** - * 奖品 - */ - private List> rankRewards; - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/doubleeleven/constant/DoubleElevenConstant.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/doubleeleven/constant/DoubleElevenConstant.java deleted file mode 100644 index d2aa30b69..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/doubleeleven/constant/DoubleElevenConstant.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.accompany.business.doubleeleven.constant; - -public class DoubleElevenConstant { - - public static String actName = "act_double_eleven_2023"; - - public static class SysConfId { - public static final String ACT_TASK_CONFIG = actName + "_task_config"; - public static final String ACT_RANK_CONFIG = actName + "_rank_config"; - } - - public static class TaskCondition { - public static final Integer SEND = 1; - public static final Integer RECEIVE = 2; - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/doubleeleven/dto/DoubleElevenRankConfigDto.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/doubleeleven/dto/DoubleElevenRankConfigDto.java deleted file mode 100644 index 8648ed20f..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/doubleeleven/dto/DoubleElevenRankConfigDto.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.accompany.business.doubleeleven.dto; - -import com.accompany.business.common.dto.RankActConfigDto; -import lombok.Data; - -@Data -public class DoubleElevenRankConfigDto extends RankActConfigDto { - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/doubleeleven/dto/DoubleElevenTaskConfigDto.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/doubleeleven/dto/DoubleElevenTaskConfigDto.java deleted file mode 100644 index a8eab1452..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/doubleeleven/dto/DoubleElevenTaskConfigDto.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.accompany.business.doubleeleven.dto; - -import com.accompany.business.common.dto.RewardTaskActConfigDto; -import lombok.Data; - -import java.util.Map; - -@Data -public class DoubleElevenTaskConfigDto extends RewardTaskActConfigDto { - - private Map dailyTaskCondition; - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/doubleeleven/model/DoubleElevenTaskRecord.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/doubleeleven/model/DoubleElevenTaskRecord.java deleted file mode 100644 index b0465ca14..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/doubleeleven/model/DoubleElevenTaskRecord.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.accompany.business.doubleeleven.model; - -import lombok.Data; - -import java.io.Serializable; - -@Data -public class DoubleElevenTaskRecord implements Serializable { - - private String date; - private Long uid; - private Byte type; - private Integer taskId; - private Integer proc; - private Integer need; - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/doubleeleven/vo/DoubleElevenTaskConfigVo.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/doubleeleven/vo/DoubleElevenTaskConfigVo.java deleted file mode 100644 index b3d14a664..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/doubleeleven/vo/DoubleElevenTaskConfigVo.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.accompany.business.doubleeleven.vo; - -import com.accompany.business.common.vo.ActivityTaskConfigVo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -@ApiModel -@Data -public class DoubleElevenTaskConfigVo extends ActivityTaskConfigVo { - - @ApiModelProperty("开始时间") - private Date startTime; - @ApiModelProperty("结束时间") - private Date endTime; - @ApiModelProperty("用户uid") - private Long uid; - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/exp/constant/ExpBattleActConstant.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/exp/constant/ExpBattleActConstant.java deleted file mode 100644 index 2a5b6df76..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/exp/constant/ExpBattleActConstant.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.accompany.business.exp.constant; - -public class ExpBattleActConstant { - - public static String ACT_NAME = "act_exp_battle"; - - public static String SYS_CONF_ID = ACT_NAME + "_config"; - - public static class Status { - public static int NONE = 0; - public static int CAN = 1; - public static int HAD = 2; - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/exp/dto/ExpBattleActConfigDto.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/exp/dto/ExpBattleActConfigDto.java deleted file mode 100644 index 677d32ff3..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/exp/dto/ExpBattleActConfigDto.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.accompany.business.exp.dto; - -import com.accompany.business.common.dto.RankActConfigDto; -import com.accompany.business.common.dto.RewardDto; -import com.accompany.core.util.DoubleUtil; -import lombok.Data; - -import java.util.*; - -@Data -public class ExpBattleActConfigDto extends RankActConfigDto { - - private Map giftScoreMap = new HashMap<>(); - private TreeMap expLevelMap = new TreeMap<>(); - private Map> levelRewardMap = new HashMap<>(); - private Integer roomScreenLevel = 30; - private String skipUrl; - - private Map vipExpRateMap = new HashMap<>(); - - @Override - public double getScore(Long uid, Integer giftId, Integer giftNum, Long totalGoldNum, Date sendGiftTime) { - Double giftScore = giftScoreMap.get(giftId); - if (null == giftScore){ - return 0d; - } - return DoubleUtil.mul(giftScore, giftNum.doubleValue()); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/exp/vo/ExpBattleActUserVo.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/exp/vo/ExpBattleActUserVo.java deleted file mode 100644 index e421db723..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/exp/vo/ExpBattleActUserVo.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.accompany.business.exp.vo; - -import com.accompany.business.common.vo.ActivityRankItemVo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@ApiModel -@Data -public class ExpBattleActUserVo extends ActivityRankItemVo { - - @ApiModelProperty("等级") - private Integer level; - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/exp/vo/ExpBattleActVo.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/exp/vo/ExpBattleActVo.java deleted file mode 100644 index d46a8cca0..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/exp/vo/ExpBattleActVo.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.accompany.business.exp.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Map; - -@Data -@ApiModel -public class ExpBattleActVo { - @ApiModelProperty - private Long startTime; - @ApiModelProperty - private Long endTime; - @ApiModelProperty("exp等级列表") - private Map expLevelMap; - @ApiModelProperty("exp等级任务状态（0=未、1=完成、2=已领取）") - private Map levelTaskStatusMap; - @ApiModelProperty("我") - private ExpBattleActUserVo me; - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/fools/vo/AprilFoolsDayRoomVo.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/fools/vo/AprilFoolsDayRoomVo.java deleted file mode 100644 index 5d3470a17..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/fools/vo/AprilFoolsDayRoomVo.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.accompany.business.fools.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author: liaozetao - * @date: 2024/3/21 18:39 - * @description: - */ -@Data -@ApiModel -public class AprilFoolsDayRoomVo { - - /** - * 房间UID - */ - @ApiModelProperty("房间UID") - private Long roomUid; - - /** - * 房间名称 - */ - @ApiModelProperty("房间名称") - private String roomTitle; - - /** - * 房间头像 - */ - @ApiModelProperty("房间头像") - private String roomAvatar; - - /** - * 活动值 - */ - @ApiModelProperty("活动值") - private Long activityValue; - - /** - * 条件值 - */ - @ApiModelProperty("条件值") - private Long conditionValue; - - /** - * 百分比 - */ - @ApiModelProperty("百分比") - private Double percentage; - - /** - * 是否进行中 - */ - @ApiModelProperty("是否进行中") - private Boolean isUnderway = false; - - /** - * 是否直播中 - */ - @ApiModelProperty("是否直播中") - private Boolean isLive = false; - - public Double getPercentage() { - if (activityValue != null && conditionValue != null) { - percentage = ((double) activityValue) / conditionValue * 100; - String percentageStr = String.format("%.2f",percentage); - percentage = Double.parseDouble(percentageStr); - return percentage; - } - return 0D; - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/constant/HalloweenConstant.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/constant/HalloweenConstant.java deleted file mode 100644 index 447a4c318..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/constant/HalloweenConstant.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.accompany.business.halloween.constant; - -public class HalloweenConstant { - - public static String actName = "act_halloween_2023"; - - public static class SysConfId { - public static final String ACT_DRAW_CONFIG = actName + "_draw_config"; - public static final String ACT_TASK_CONFIG = actName + "_task_config"; - public static final String ACT_RANK_CONFIG = actName + "_rank_config"; - } - - public static class BoxTaskType { - - public static final Byte SEND = 1; - public static final Byte RECEIVE = 2; - } - - public static class GridType { - - public static final Byte NONE = 1; - public static final Byte BOX = 2; - } - - public static class PoolType { - - public static final Integer LOW = 1; - public static final Integer MIDDLE = 2; - public static final Integer HIGH = 3; - public static final Integer MAGIC = 4; - } - - public static class TaskId { - public static final Integer VISIT = 1; - public static final Integer STAY_ROOM = 2; - - public static final Integer LUCKY_SEA = 1; - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/dto/HalloweenDrawConfigDto.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/dto/HalloweenDrawConfigDto.java deleted file mode 100644 index 9a341568f..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/dto/HalloweenDrawConfigDto.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.accompany.business.halloween.dto; - -import com.accompany.business.common.dto.MultiLinearDrawActConfigDto; -import lombok.Data; - -import java.time.LocalTime; -import java.util.List; - -@Data -public class HalloweenDrawConfigDto extends MultiLinearDrawActConfigDto { - - private List boxTasks; - private List map; - - private LocalTime magicStartTime; - private LocalTime magicEndTime; - - @Data - public static class Task { - private Integer id; - private Integer boxLevel; - private List giftIds; - private Byte type; - private Integer needNum; - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/dto/HalloweenRankConfigDto.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/dto/HalloweenRankConfigDto.java deleted file mode 100644 index 5af716111..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/dto/HalloweenRankConfigDto.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.accompany.business.halloween.dto; - -import com.accompany.business.common.dto.RankActConfigDto; -import lombok.Data; - -@Data -public class HalloweenRankConfigDto extends RankActConfigDto { - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/dto/HalloweenTaskConfigDto.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/dto/HalloweenTaskConfigDto.java deleted file mode 100644 index 84fee221d..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/dto/HalloweenTaskConfigDto.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.accompany.business.halloween.dto; - -import com.accompany.business.common.dto.TaskActConfigDto; -import lombok.Data; - -@Data -public class HalloweenTaskConfigDto extends TaskActConfigDto { - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/model/HalloweenDrawBoxRecord.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/model/HalloweenDrawBoxRecord.java deleted file mode 100644 index 1ba183e37..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/model/HalloweenDrawBoxRecord.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.accompany.business.halloween.model; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -@Data -public class HalloweenDrawBoxRecord implements Serializable { - - @TableId(type = IdType.AUTO) - private Long id; - private Long uid; - private Integer boxLevel; - private Date createTime; - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/model/HalloweenDrawUserRecord.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/model/HalloweenDrawUserRecord.java deleted file mode 100644 index 585fed7ed..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/model/HalloweenDrawUserRecord.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.accompany.business.halloween.model; - -import com.accompany.business.common.constant.RewardTypeEnum; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import lombok.Data; - -import java.util.Date; - -@Data -public class HalloweenDrawUserRecord { - - @TableId(type = IdType.AUTO) - private Long id; - private Long uid; - private Integer poolType; - private Byte type; - private Integer refId; - private String name; - private Integer num; - private String unit; - private Date createTime; - - public String getDesc(){ - if (RewardTypeEnum.EMPTY.getType().equals(this.type)){ - return "未获得奖励" + (num > 1? (" x"+ num): ""); - } - return name + num + unit; - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/model/HalloweenTaskRecord.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/model/HalloweenTaskRecord.java deleted file mode 100644 index af0e6da7e..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/model/HalloweenTaskRecord.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.accompany.business.halloween.model; - -import lombok.Data; - -import java.io.Serializable; - -@Data -public class HalloweenTaskRecord implements Serializable { - - private String date; - private Long uid; - private Byte type; - private Integer taskId; - private Integer proc; - private Integer need; - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/vo/HalloweenDrawConfigVo.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/vo/HalloweenDrawConfigVo.java deleted file mode 100644 index a9b5f1a39..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/vo/HalloweenDrawConfigVo.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.accompany.business.halloween.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -@ApiModel -@Data -public class HalloweenDrawConfigVo { - - @ApiModelProperty("开始时间") - private Date startTime; - @ApiModelProperty("结束时间") - private Date endTime; - @ApiModelProperty("用户uid") - private Long uid; - @ApiModelProperty("糖果数") - private Integer candyNum; - - @ApiModelProperty("等级") - private Integer boxLevel; - - @ApiModelProperty("当前格子下标") - private Integer mapPos; - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/vo/HalloweenDrawResultVo.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/vo/HalloweenDrawResultVo.java deleted file mode 100644 index a3b9ca6bf..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/vo/HalloweenDrawResultVo.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.accompany.business.halloween.vo; - -import com.accompany.business.common.vo.RewardVo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -@ApiModel -@Data -public class HalloweenDrawResultVo { - - private Long uid; - @ApiModelProperty("是否踩中宝箱") - private Boolean hasReward; - @ApiModelProperty("步数(=0时重置到起始位置)") - private List step; - @ApiModelProperty("奖励") - private List rewardList; - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/vo/HalloweenDrawUserRecordVo.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/vo/HalloweenDrawUserRecordVo.java deleted file mode 100644 index 424b196f0..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/vo/HalloweenDrawUserRecordVo.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.accompany.business.halloween.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -@ApiModel -@Data -public class HalloweenDrawUserRecordVo { - - @ApiModelProperty("用户uid") - private Long uid; - @ApiModelProperty("时间") - private Date createTime; - @ApiModelProperty("奖励描述") - private String rewardDesc; - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/vo/HalloweenTaskConfigVo.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/vo/HalloweenTaskConfigVo.java deleted file mode 100644 index f1bf4e30c..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/vo/HalloweenTaskConfigVo.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.accompany.business.halloween.vo; - -import com.accompany.business.common.vo.ActivityTaskConfigVo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -@ApiModel -@Data -public class HalloweenTaskConfigVo extends ActivityTaskConfigVo { - - @ApiModelProperty("开始时间") - private Date startTime; - @ApiModelProperty("结束时间") - private Date endTime; - @ApiModelProperty("用户uid") - private Long uid; - @ApiModelProperty("月饼券数") - private Integer candyNum; -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/luckyprocessbar/constant/LuckyProcessBarConstant.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/luckyprocessbar/constant/LuckyProcessBarConstant.java deleted file mode 100644 index 4bce7b946..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/luckyprocessbar/constant/LuckyProcessBarConstant.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.accompany.business.luckyprocessbar.constant; - -public class LuckyProcessBarConstant { - - public static String actName = "act_lucky_process_bar_2023"; - - public static class SysConfId { - public static final String ACT_CONFIG = actName + "_config"; - } - - public static String LUCKY_TIP = "恭喜您在【時空幸運兒】成為第%d個幸運兒獲得獎勵，獎勵已發放注意查收哦~"; -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/luckyprocessbar/dto/LuckyProcessBarConfigDto.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/luckyprocessbar/dto/LuckyProcessBarConfigDto.java deleted file mode 100644 index 4aa465290..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/luckyprocessbar/dto/LuckyProcessBarConfigDto.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.accompany.business.luckyprocessbar.dto; - -import com.accompany.business.common.dto.RewardDto; -import com.accompany.business.common.dto.TimeRangeActConfigDto; -import lombok.Data; - -import java.util.Comparator; -import java.util.List; -import java.util.Map; -import java.util.Set; - -@Data -public class LuckyProcessBarConfigDto extends TimeRangeActConfigDto { - - private Set giftIds; - private Map stageRewardMap; - - @Data - public static class StageReward { - private Long stage; - private List rewardList; - } - - public Long getMax(){ - return stageRewardMap.keySet().stream().max(Comparator.comparing(Long::longValue)).get(); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/luckyprocessbar/model/LuckyProcessBarRewardRecord.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/luckyprocessbar/model/LuckyProcessBarRewardRecord.java deleted file mode 100644 index 84bbce43e..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/luckyprocessbar/model/LuckyProcessBarRewardRecord.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.accompany.business.luckyprocessbar.model; - -import lombok.Data; - -import java.io.Serializable; - -@Data -public class LuckyProcessBarRewardRecord implements Serializable { - - private String date; - private Long uid; - private Byte type; - private Integer taskId; - private Integer proc; - private Integer need; - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/luckyprocessbar/vo/LuckyProcessBarConfigVo.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/luckyprocessbar/vo/LuckyProcessBarConfigVo.java deleted file mode 100644 index c1d138efa..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/luckyprocessbar/vo/LuckyProcessBarConfigVo.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.accompany.business.luckyprocessbar.vo; - -import com.accompany.business.common.vo.ActivityUserVo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; -import java.util.Map; - -@ApiModel -@Data -public class LuckyProcessBarConfigVo { - - @ApiModelProperty("开始时间") - private Date startTime; - @ApiModelProperty("结束时间") - private Date endTime; - @ApiModelProperty("用户uid") - private Long uid; - - @ApiModelProperty("上限") - private Long max; - @ApiModelProperty("当前") - private Long cur; - @ApiModelProperty("stage") - private Map stageMap; - - @Data - public static class StageReward { - private Long stage; - private ActivityUserVo luckyUser; - //private List rewardList; - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/constant/MidAutumnConstant.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/constant/MidAutumnConstant.java deleted file mode 100644 index 5e0562788..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/constant/MidAutumnConstant.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.accompany.business.midautumn.constant; - -public class MidAutumnConstant { - - public static String actName = "act_mid_autumn"; - - public static class SysConfId { - public static final String ACT_MID_AUTUMN_JACKPOT_CONFIG = "act_mid_autumn_jackpot_config"; - public static final String ACT_MID_AUTUMN_TASK_CONFIG = "act_mid_autumn_task_config"; - public static final String ACT_MID_AUTUMN_DRAW_CONFIG = "act_mid_autumn_draw_config"; - public static final String ACT_MID_AUTUMN_RANK_CONFIG = "act_mid_autumn_rank_config"; - } - - public static class RedisKey { - public static final String MID_AUTUMN_JACKPOT_POOL = "peko_mid_autumn_jackpot_pool"; - public static final String MID_AUTUMN_JACKPOT_POOL_LOCK = "peko_mid_autumn_jackpot_pool_lock"; - public static final String MID_AUTUMN_JACKPOT_USER_CONTRIBUTION = "peko_mid_autumn_jackpot_user_contribution"; - public static final String MID_AUTUMN_JACKPOT_USER_CONTRIBUTION_LOCK = "peko_mid_autumn_jackpot_user_contribution_lock"; - public static final String MID_AUTUMN_JACKPOT_USER_RECORD = "peko_mid_autumn_jackpot_user_record"; - - } - - public static class TaskId { - public static final Integer VISIT = 1; - public static final Integer DYNAMIC = 2; - public static final Integer FIND_LOVE_LOOP = 1; - } - - public static class BusiStatus { - public static final String UNENOUGH_MOONCAKE = "月餅券数量不足，参加任务获得吧~"; - public static final String NERVER_JOIN_JACKPOT = "今日结算期前未參与尋愛，无法参与瓜分"; - public static final String ALREADY_JACKPOT = "今日您已经瓜分过了"; - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/dto/MidAutumnDrawConfigDto.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/dto/MidAutumnDrawConfigDto.java deleted file mode 100644 index 8629e8cda..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/dto/MidAutumnDrawConfigDto.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.accompany.business.midautumn.dto; - -import com.accompany.business.common.dto.LinearDrawActConfigDto; -import lombok.Data; - -@Data -public class MidAutumnDrawConfigDto extends LinearDrawActConfigDto { - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/dto/MidAutumnJackpotConfig.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/dto/MidAutumnJackpotConfig.java deleted file mode 100644 index 1a91e891c..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/dto/MidAutumnJackpotConfig.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.accompany.business.midautumn.dto; - -import com.accompany.business.common.dto.TimeRangeActConfigDto; -import lombok.Data; - -import java.time.LocalTime; - -@Data -public class MidAutumnJackpotConfig extends TimeRangeActConfigDto { - - private LocalTime settlementTime; - private LocalTime getTime; - private Double jackpotMax; - private Double contributionRate; - -} - diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/dto/MidAutumnRankConfigDto.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/dto/MidAutumnRankConfigDto.java deleted file mode 100644 index acae4d4c2..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/dto/MidAutumnRankConfigDto.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.accompany.business.midautumn.dto; - -import com.accompany.business.common.dto.RankActConfigDto; -import com.accompany.common.utils.DateTimeUtil; -import lombok.Data; - -import java.time.LocalDateTime; -import java.time.LocalTime; -import java.util.Date; -import java.util.Map; - -@Data -public class MidAutumnRankConfigDto extends RankActConfigDto { - - private LocalTime doubleStartTime; - private LocalTime doubleEndTime; - - private Map moonCakeGoldNum; - - @Override - public double getScore(Long uid, Integer giftId, Integer giftNum, Long totalGoldNum, Date sendGiftTime) { - Long specialGoldNum = moonCakeGoldNum.get(giftId); - if (null != specialGoldNum){ - return specialGoldNum * giftNum; - } - LocalDateTime sendDateTime = DateTimeUtil.converDateToLocalDateTime(sendGiftTime); - return super.getScore(uid, giftId, giftNum, totalGoldNum, sendGiftTime) * getMultiple(sendDateTime); - } - - private double getMultiple(LocalDateTime sendDateTime){ - return null == doubleStartTime || doubleStartTime.isAfter(sendDateTime.toLocalTime()) - || null == doubleEndTime || doubleEndTime.isBefore(sendDateTime.toLocalTime())? 1D: 2D; - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/dto/MidAutumnTaskConfigDto.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/dto/MidAutumnTaskConfigDto.java deleted file mode 100644 index 3567dd754..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/dto/MidAutumnTaskConfigDto.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.accompany.business.midautumn.dto; - -import com.accompany.business.common.dto.TaskActConfigDto; -import lombok.Data; - -@Data -public class MidAutumnTaskConfigDto extends TaskActConfigDto { - - private Long midAutumnWorldId; - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/model/MidAutumnDrawUserRecord.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/model/MidAutumnDrawUserRecord.java deleted file mode 100644 index 6908b3140..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/model/MidAutumnDrawUserRecord.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.accompany.business.midautumn.model; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import lombok.Data; - -import java.util.Date; - -@Data -public class MidAutumnDrawUserRecord { - - @TableId(type = IdType.AUTO) - private Long id; - private Long uid; - private Byte type; - private Integer refId; - private String name; - private Integer num; - private String unit; - private Date createTime; - - public String getDesc(){ - return name + num + unit; - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/model/MidAutumnJackpotContribution.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/model/MidAutumnJackpotContribution.java deleted file mode 100644 index ebed9ed1e..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/model/MidAutumnJackpotContribution.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.accompany.business.midautumn.model; - -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; - -@Data -public class MidAutumnJackpotContribution implements Serializable { - - private String date; - private Long uid; - private Double showContribution; - private Double contribution; - private Byte status; - - private BigDecimal allotRate; - private BigDecimal firstAllot; - private Long allot; - -} - diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/model/MidAutumnTaskRecord.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/model/MidAutumnTaskRecord.java deleted file mode 100644 index 760a855e6..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/model/MidAutumnTaskRecord.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.accompany.business.midautumn.model; - -import lombok.Data; - -import java.io.Serializable; - -@Data -public class MidAutumnTaskRecord implements Serializable { - - private String date; - private Long uid; - private Byte type; - private Integer taskId; - private Integer proc; - private Integer need; - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/vo/MidAutumnDrawConfigVo.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/vo/MidAutumnDrawConfigVo.java deleted file mode 100644 index 5a08400f5..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/vo/MidAutumnDrawConfigVo.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.accompany.business.midautumn.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -@ApiModel -@Data -public class MidAutumnDrawConfigVo { - - @ApiModelProperty("开始时间") - private Date startTime; - @ApiModelProperty("结束时间") - private Date endTime; - @ApiModelProperty("用户uid") - private Long uid; - @ApiModelProperty("月饼券数") - private Integer moonCakeNum; - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/vo/MidAutumnDrawUserRecordVo.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/vo/MidAutumnDrawUserRecordVo.java deleted file mode 100644 index 802398a6d..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/vo/MidAutumnDrawUserRecordVo.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.accompany.business.midautumn.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -@ApiModel -@Data -public class MidAutumnDrawUserRecordVo { - - @ApiModelProperty("用户uid") - private Long uid; - @ApiModelProperty("时间") - private Date createTime; - @ApiModelProperty("奖励描述") - private String rewardDesc; - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/vo/MidAutumnJackpotConfigVo.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/vo/MidAutumnJackpotConfigVo.java deleted file mode 100644 index 0742ee4aa..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/vo/MidAutumnJackpotConfigVo.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.accompany.business.midautumn.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -@ApiModel -@Data -public class MidAutumnJackpotConfigVo { - - @ApiModelProperty("当前时间戳") - private Date curDateTime; - @ApiModelProperty("当前日期") - private String curDate; - @ApiModelProperty("当前奖池累计钻石数") - private Double jackpotDiamonds; - @ApiModelProperty("结束累计时间戳") - private Date jackpotEndTime; - - @ApiModelProperty("瓜分状态（0=没资格，不显示，1=可瓜分但未，2=已瓜分）") - private Byte allotStatus; - @ApiModelProperty("今日贡献钻石数") - private Double contribution; - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/vo/MidAutumnJackpotRecordVo.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/vo/MidAutumnJackpotRecordVo.java deleted file mode 100644 index b2532b809..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/vo/MidAutumnJackpotRecordVo.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.accompany.business.midautumn.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -@ApiModel -@Data -public class MidAutumnJackpotRecordVo { - - @ApiModelProperty("日期") - private Date time; - @ApiModelProperty("钻石数") - private Long diamonds; - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/vo/MidAutumnTaskConfigVo.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/vo/MidAutumnTaskConfigVo.java deleted file mode 100644 index 82b031784..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/midautumn/vo/MidAutumnTaskConfigVo.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.accompany.business.midautumn.vo; - -import com.accompany.business.common.vo.ActivityTaskConfigVo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -@ApiModel -@Data -public class MidAutumnTaskConfigVo extends ActivityTaskConfigVo { - - @ApiModelProperty("开始时间") - private Date startTime; - @ApiModelProperty("结束时间") - private Date endTime; - @ApiModelProperty("用户uid") - private Long uid; - @ApiModelProperty("月饼券数") - private Integer moonCakeNum; - @ApiModelProperty("话题任务指定id") - private Long worldId; -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/constant/QixiConstant.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/constant/QixiConstant.java deleted file mode 100644 index 4d936dceb..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/constant/QixiConstant.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.accompany.business.qixi.constant; - -public class QixiConstant { - - public static class SysConfId { - public static final String ACT_QIXI_XIQUE_CONFIG = "act_qixi_xique_config"; - public static final String ACT_QIXI_REDLINE_CONFIG = "act_qixi_redline_config"; - public static final String ACT_QIXI_ROOM_RANK_CONFIG = "act_qixi_room_rank_config"; - public static final String ACT_QIXI_RANK_CONFIG = "act_qixi_rank_config"; - } - - public static class RedisKey { - public static final String QIXI_XIQUE_SERVER_NUM = "ym_qixi_xique_server_num"; - public static final String QIXI_XIQUE_USER_DEVOTED_NUM = "ym_qixi_xique_user_devoted_num"; - public static final String QIXI_XIQUE_USER_TOTAL_NUM = "ym_qixi_xique_user_total_num"; - public static final String QIXI_XIQUE_USER_CUR_NUM = "ym_qixi_xique_user_cur_num"; - public static final String QIXI_XIQUE_USER_DAILY_TASK = "ym_qixi_xique_user_daily_task"; - public static final String QIXI_XIQUE_DEVOTED_LOCK = "ym_qixi_xique_devoted_lock"; - - public static final String QIXI_REDLINE_USER_TOTAL_REDLINE_NUM = "ym_qixi_redline_user_total_redline_num"; - public static final String QIXI_REDLINE_USER_REDLINE_NUM = "ym_qixi_redline_user_redline_num"; - public static final String QIXI_REDLINE_USER_RED_BAG = "ym_qixi_redline_user_red_bag"; - - public static final String QIXI_REDLINE_USER_RED_BAG_LOCK = "ym_qixi_redline_user_red_bag_lock"; - - public static final String QIXI_REDLINE_DRAW_POOL = "ym_qixi_redline_draw_pool"; - - public static final String QIXI_REDLINE_DRAW_DAY_STOCK = "ym_qixi_redline_draw_day_stock"; - public static final String QIXI_REDLINE_DRAW_TOTAL_STOCK = "ym_qixi_redline_draw_total_stock"; - - public static final String QIXI_ROOM_RANK = "ym_qixi_room_rank"; - - public static final String QIXI_RANK_HONEY_DAY_KEY = "ym_qixi_rank_send_day"; - public static final String QIXI_RANK_HONEY_TOTAL_KEY = "ym_qixi_rank_send_total"; - public static final String QIXI_RANK_LOVE_DAY_KEY = "ym_qixi_rank_receive_day"; - public static final String QIXI_RANK_LOVE_TOTAL_KEY = "ym_qixi_rank_receive_total"; - - public static final String QIXI_RANK_HOUR_CP = "ym_qixi_rank_hour_cp"; - } - - public static class XiqueTaskId { - public static final Integer VISIT = 1; - public static final Integer SEND_ROOM_MSG = 2; - public static final Integer STAY_ROOM = 3; - - } - - public static class XiqueDailyTaskBtnStatus { - public static final Byte UN_FINISH = 0; - public static final Byte HAS_FINISH = 1; - } - - public static class XiqueDevotedBtnStatus { - public static final Byte DEVOTED = 0; - public static final Byte CAN_GET = 1; - public static final Byte NOT_GET = 2; - public static final Byte HAS_GOT = -1; - } - - public static class BusiStatus { - public static final String UNENOUGH_XIQUE = "喜鹊数量不足，参加任务获得吧~"; - public static final String OVER_XIQUE_SERVER_MAX = "鹊桥已经完全搭建"; - public static final String UNENOUGH_XIQUE_SERVER_NUM = "鹊桥还没完全搭建"; - public static final String NEVER_DEVOTED_XIQUE = "您未参与搭建鹊桥活动，无法领取"; - public static final String HAS_GET_REWARD = "已经领取过奖励"; - public static final String NONE_ABLE_RED_BAG = "没有可祈愿的福袋，请先换一批福袋"; - public static final String UNABLE_RED_BAG = "福袋已经完成祈愿，换一个福袋再祈愿吧"; - public static final String UNENOUGH_RED_LINE_NUM = "祈愿红绳不足，快去通过喜鹊获得红绳吧"; - } - - public static class RankType { - - public static final Byte HONEY_DAY = 1; - public static final Byte HONEY_TOTAL = 2; - public static final Byte LOVE_DAY = 3; - public static final Byte LOVE_TOTAL = 4; - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/dto/QixiRankConfigDto.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/dto/QixiRankConfigDto.java deleted file mode 100644 index 9fb0757ea..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/dto/QixiRankConfigDto.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.accompany.business.qixi.dto; - -import com.accompany.business.common.dto.RewardDto; -import com.accompany.business.common.dto.TimeRangeActConfigDto; -import lombok.Data; - -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -@Data -public class QixiRankConfigDto extends TimeRangeActConfigDto { - - private Double normalGiftScorePercent; - private Double activityGiftScorePercent; - private Set activityGiftId = new HashSet<>(); - - private Map rankSettlentSizeMap; - private Map>> rankRewardMap; - - public Double getScorePercent(Integer giftId){ - return activityGiftId.contains(giftId)? activityGiftScorePercent : normalGiftScorePercent; - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/dto/QixiRedLineConfigDto.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/dto/QixiRedLineConfigDto.java deleted file mode 100644 index 5e7221e59..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/dto/QixiRedLineConfigDto.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.accompany.business.qixi.dto; - -import com.accompany.business.common.dto.RewardDtoLinearConfig; -import com.accompany.business.common.dto.TimeRangeActConfigDto; -import lombok.Data; - -import java.util.List; - -@Data -public class QixiRedLineConfigDto extends TimeRangeActConfigDto { - - private List rewardList; - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/dto/QixiRoomRankConfigDto.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/dto/QixiRoomRankConfigDto.java deleted file mode 100644 index cc3146240..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/dto/QixiRoomRankConfigDto.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.accompany.business.qixi.dto; - -public class QixiRoomRankConfigDto extends QixiRankConfigDto { - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/dto/QixiUserRedBagDto.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/dto/QixiUserRedBagDto.java deleted file mode 100644 index fcca84adf..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/dto/QixiUserRedBagDto.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.accompany.business.qixi.dto; - -import lombok.Data; - -@Data -public class QixiUserRedBagDto { - - private Integer id; - private Boolean able; - private Byte type; - private Integer refId; - private String name; - private Integer num; - private String unit; - private String pic; - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/dto/QixiXiqueConfigDto.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/dto/QixiXiqueConfigDto.java deleted file mode 100644 index eac12c8d8..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/dto/QixiXiqueConfigDto.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.accompany.business.qixi.dto; - -import com.accompany.business.common.dto.TimeRangeActConfigDto; -import lombok.Data; - -import java.util.HashMap; -import java.util.Map; - -@Data -public class QixiXiqueConfigDto extends TimeRangeActConfigDto { - - private Long serverMaxXiqueNum = 130000L; - private Integer xiqueHeadwearId; - private Integer xiqueHeadwearDay; - - private Map dailyTask = new HashMap<>(); - - private Map giftTask = new HashMap<>(); - - @Data - public class QixiXiqueDailyTask { - private Integer id; - private String desc; - private Map needMap; - } - - @Data - public class QixiXiqueGiftTask { - private Integer giftId; - private Integer senderXiqueNum; - private Integer receiverXiqueNum; - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/entity/QixiRankHourCp.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/entity/QixiRankHourCp.java deleted file mode 100644 index 0c96107c4..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/entity/QixiRankHourCp.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.accompany.business.qixi.entity; - -import lombok.Data; - -@Data -public class QixiRankHourCp { - - private Long senderUid; - private Long receiverUid; - private Double totalScore; -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/entity/QixiRedLineUserRecord.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/entity/QixiRedLineUserRecord.java deleted file mode 100644 index 766d55ccf..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/entity/QixiRedLineUserRecord.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.accompany.business.qixi.entity; - -import com.baomidou.mybatisplus.annotation.TableId; -import lombok.Data; - -import java.util.Date; - -@Data -public class QixiRedLineUserRecord { - - @TableId - private Long id; - private Long uid; - private Integer redBagId; - private Byte type; - private Integer refId; - private String name; - private Integer num; - private String unit; - private Date createTime; - - public String getDesc(){ - return name + num + unit; - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/model/QixiRankHourCp.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/model/QixiRankHourCp.java deleted file mode 100644 index 50e3d0a17..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/model/QixiRankHourCp.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.accompany.business.qixi.model; - -import lombok.Data; - -@Data -public class QixiRankHourCp { - - private Long senderUid; - private Long receiverUid; - private Double totalScore; -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/model/QixiRedLineUserRecord.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/model/QixiRedLineUserRecord.java deleted file mode 100644 index a1df0fa03..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/model/QixiRedLineUserRecord.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.accompany.business.qixi.model; - -import com.baomidou.mybatisplus.annotation.TableId; -import lombok.Data; - -import java.util.Date; - -@Data -public class QixiRedLineUserRecord { - - @TableId - private Long id; - private Long uid; - private Integer redBagId; - private Byte type; - private Integer refId; - private String name; - private Integer num; - private String unit; - private Date createTime; - - public String getDesc(){ - return name + num + unit; - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/vo/QixiRankHourCpVo.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/vo/QixiRankHourCpVo.java deleted file mode 100644 index 3dde67663..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/vo/QixiRankHourCpVo.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.accompany.business.qixi.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -@ApiModel -@Data -public class QixiRankHourCpVo { - - @ApiModelProperty("本轮左边，可能为空") - private Long senderUid; - private Long senderErbanNo; - private String senderNick; - private String senderAvatar; - - @ApiModelProperty("本轮右边，可能为空") - private Long receiverUid; - private Long receiverErbanNo; - private String receiverNick; - private String receiverAvatar; - - @ApiModelProperty("下一轮倒计时时间戳，可能为空") - private Date nextHourTimeStamp; - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/vo/QixiRedLineConfigVo.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/vo/QixiRedLineConfigVo.java deleted file mode 100644 index 668f1b56d..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/vo/QixiRedLineConfigVo.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.accompany.business.qixi.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -@ApiModel -@Data -public class QixiRedLineConfigVo { - - @ApiModelProperty("用户uid") - private Long uid; - @ApiModelProperty("喜鹊数") - private Integer redLineNum; - @ApiModelProperty("抽奖红包列表") - private List drawList; - - @ApiModel - @Data - public static class QixiUserRedBagVo { - @ApiModelProperty("红包id") - private Integer id; - @ApiModelProperty("是否可以抽（true=可抽，false=已抽）") - private Boolean able; - @ApiModelProperty("道具类型（1=头饰、2=铭牌、3=气泡、4=座驾、5=礼物）") - private Byte type; - @ApiModelProperty("奖励名称，当able=false才有值") - private String name; - @ApiModelProperty("钻石价值/天数，当able=false才有值") - private Integer num; - @ApiModelProperty("单位，当able=false才有值") - private String unit; - @ApiModelProperty("奖励图片url，当able=false才有值") - private String pic; - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/vo/QixiRedLineUserRecordVo.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/vo/QixiRedLineUserRecordVo.java deleted file mode 100644 index 1f5574477..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/vo/QixiRedLineUserRecordVo.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.accompany.business.qixi.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -@ApiModel -@Data -public class QixiRedLineUserRecordVo { - - @ApiModelProperty("用户uid") - private Long uid; - @ApiModelProperty("时间") - private Date createTime; - @ApiModelProperty("奖励描述") - private String rewardDesc; - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/vo/QixiXiqueConfigVo.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/vo/QixiXiqueConfigVo.java deleted file mode 100644 index 5e9283335..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/vo/QixiXiqueConfigVo.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.accompany.business.qixi.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; -import java.util.List; - -@ApiModel -@Data -public class QixiXiqueConfigVo { - - @ApiModelProperty("开始时间") - private Date startTime; - @ApiModelProperty("结束时间") - private Date endTime; - @ApiModelProperty("全服喜鹊上限") - private Long serverMaxXiqueNum; - @ApiModelProperty("全服喜鹊当前值") - private Long serverCurXiqueNum; - @ApiModelProperty("用户uid") - private Long uid; - @ApiModelProperty("喜鹊数") - private Integer xiqueNum; - @ApiModelProperty("投入按钮状态（0=可投入，1=可领取，2=不能领取，-1=已领取）") - private Byte devotedBtnStatus; - @ApiModelProperty("日常任务") - private List dailyTaskList; - - @ApiModel - @Data - public static class QixiXiqueDailyTask { - @ApiModelProperty("任务id（1=访问，2=房间内发消息，3=停留房间）") - private Integer id; - @ApiModelProperty("描述") - private String desc; - @ApiModelProperty("奖励喜鹊数量") - private Integer xiqueNum; - @ApiModelProperty("进度上限") - private Integer need; - @ApiModelProperty("进度当前值") - private Integer cur; - @ApiModelProperty("按钮状态（0=未完成，1=已完成）") - private Byte btnStatus; - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/snooker/constant/SnookerActConstant.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/snooker/constant/SnookerActConstant.java deleted file mode 100644 index 605719ef4..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/snooker/constant/SnookerActConstant.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.accompany.business.snooker.constant; - -public class SnookerActConstant { - - public static String actName = "act_snooker_2024"; - - public static class SysConfId { - public static final String ACT_RANK_CONFIG = actName + "_rank_config"; - } - - public static class CacheKey { - public static final String RANK_LOCK = actName + "rank_lock"; - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/snooker/dto/SnookerActConfigDto.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/snooker/dto/SnookerActConfigDto.java deleted file mode 100644 index 4341a3c52..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/snooker/dto/SnookerActConfigDto.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.accompany.business.snooker.dto; - -import com.accompany.business.common.dto.RoundRankActConfigDto; -import lombok.Data; - -@Data -public class SnookerActConfigDto extends RoundRankActConfigDto { - - private Integer durationCondition; - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/valentine/constant/ValentinesConstant.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/valentine/constant/ValentinesConstant.java deleted file mode 100644 index 5026175bc..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/valentine/constant/ValentinesConstant.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.accompany.business.valentine.constant; - -public class ValentinesConstant { - - public static String actName = "act_valentine_2024"; - - public static class SysConfId { - public static final String ACT_RANK_CONFIG = actName + "_cp_rank_config"; - } - - public static class BtnStatus { - public static final Integer NONE = 0; - public static final Integer CAN = 1; - public static final Integer HAD = 2; - } - - public static String cp_tip = "恭喜~你在「熱戀情人節」活動中的熱戀值突破了 %d，獲得 %s 獎勵（有效期24h），快去查看吧！＞＞"; - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/valentine/dto/ValentinesCpUserProp.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/valentine/dto/ValentinesCpUserProp.java deleted file mode 100644 index 7d9374ba5..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/valentine/dto/ValentinesCpUserProp.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.accompany.business.valentine.dto; - -import com.accompany.business.common.dto.CpRankActCpProp; -import lombok.Data; - -import java.util.Map; - -@Data -public class ValentinesCpUserProp extends CpRankActCpProp { - - private Map cpTaskStatus; - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/valentine/vo/ValentinesCpRankVo.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/valentine/vo/ValentinesCpRankVo.java deleted file mode 100644 index c18023c09..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/valentine/vo/ValentinesCpRankVo.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.accompany.business.valentine.vo; - -import com.accompany.business.common.vo.ActivityCpRankVo; -import com.accompany.business.common.vo.ActivityStageTaskItemVo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -@ApiModel -@Data -public class ValentinesCpRankVo extends ActivityCpRankVo { - - private Long uid; - @ApiModelProperty("当前最高分") - private Long score; - @ApiModelProperty("cp任务列表") - private List cpTaskList; -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualCpRankGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualCpRankGiftListener.java deleted file mode 100644 index a762d202f..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualCpRankGiftListener.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.accompany.business.annual.listener; - -import com.accompany.business.annual.service.AnnualCpRankService; -import com.accompany.business.base.listener.CpRankGiftListener; -import com.accompany.business.event.GiftMessageEvent; -import lombok.extern.slf4j.Slf4j; -import org.springframework.context.ApplicationListener; -import org.springframework.scheduling.annotation.Async; - -@Slf4j -//@Component -public class AnnualCpRankGiftListener extends CpRankGiftListener implements ApplicationListener{ - - @Async - @Override - public void onApplicationEvent(GiftMessageEvent giftMessageEvent) { - handleEvent(giftMessageEvent); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualGiftRankGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualGiftRankGiftListener.java deleted file mode 100644 index 392393e21..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualGiftRankGiftListener.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.accompany.business.annual.listener; - -import com.accompany.business.annual.constant.AnnualGiftRankTypeEnum; -import com.accompany.business.annual.dto.AnnualGiftRankActConfigDto; -import com.accompany.business.annual.service.AnnualGiftRankService; -import com.accompany.business.event.GiftMessageEvent; -import com.accompany.business.message.GiftMessage; -import com.accompany.business.model.Hall; -import com.accompany.business.service.hall.HallService; -import com.accompany.common.utils.DateTimeUtil; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.scheduling.annotation.Async; -import org.springframework.util.CollectionUtils; - -import java.time.LocalDateTime; -import java.util.Date; -import java.util.List; - -//@Component -public class AnnualGiftRankGiftListener implements ApplicationListener { - - @Autowired - private AnnualGiftRankService service; - @Autowired - private HallService hallService; - - @Async - @Override - public void onApplicationEvent(GiftMessageEvent giftMessageEvent) { - handleEvent(giftMessageEvent); - } - - public void handleEvent(GiftMessageEvent giftMessageEvent) { - GiftMessage giftMessage = (GiftMessage) giftMessageEvent.getSource(); - - Date sendGiftTime = DateTimeUtil.convertMsToDate(giftMessage.getMessTime()); - LocalDateTime sendGiftLocalDateTime = DateTimeUtil.converDateToLocalDateTime(sendGiftTime); - - AnnualGiftRankActConfigDto config = service.getConfig(); - if (!config.inActTimeRange(sendGiftLocalDateTime)){ - return; - } - - Integer giftId = giftMessage.getGiftId(); - List typeList = config.getTypeByGiftId(giftId); - if (CollectionUtils.isEmpty(typeList)){ - return; - } - - Integer giftNum = giftMessage.getGiftNum(); - Long totalGoldNum = giftMessage.getGoldNum(); - Long senderUid = giftMessage.getSendUid(); - - // 收礼榜不要大头 - Hall hall = hallService.getValidHallByUid(senderUid); - if (null != hall){ - return; - } - - for (AnnualGiftRankTypeEnum type: typeList){ - //收礼榜 - service.updateRank(senderUid, type, config, giftId, giftNum, totalGoldNum, sendGiftTime); - } - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualPopularRankGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualPopularRankGiftListener.java deleted file mode 100644 index 3c5b81c23..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualPopularRankGiftListener.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.accompany.business.annual.listener; - -import com.accompany.business.annual.service.AnnualPopularHourRankService; -import com.accompany.business.annual.service.AnnualPopularRankService; -import com.accompany.business.common.dto.RoundRankActConfigDto; -import com.accompany.business.event.GiftMessageEvent; -import com.accompany.business.message.GiftMessage; -import com.accompany.business.model.HallMember; -import com.accompany.business.service.hall.HallService; -import com.accompany.common.constant.Constant; -import com.accompany.common.utils.DateTimeUtil; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; - -import java.time.LocalDateTime; -import java.util.Date; - -//@Component -public class AnnualPopularRankGiftListener implements ApplicationListener { - - @Autowired - private AnnualPopularRankService service; - @Autowired - private AnnualPopularHourRankService hourRankService; - @Autowired - private HallService hallService; - - @Override - public void onApplicationEvent(GiftMessageEvent giftMessageEvent) { - handleEvent(giftMessageEvent); - } - - public void handleEvent(GiftMessageEvent giftMessageEvent) { - GiftMessage giftMessage = (GiftMessage) giftMessageEvent.getSource(); - - Date sendGiftTime = DateTimeUtil.convertMsToDate(giftMessage.getMessTime()); - LocalDateTime sendGiftLocalDateTime = DateTimeUtil.converDateToLocalDateTime(sendGiftTime); - - RoundRankActConfigDto config = service.getRankActConfig(); - if (!config.inActTimeRange(sendGiftLocalDateTime)){ - return; - } - - Long senderUid = giftMessage.getSendUid(); - Long receiverUid = giftMessage.getRecvUid(); - Integer giftId = giftMessage.getGiftId(); - Integer giftNum = giftMessage.getGiftNum(); - Long totalGoldNum = giftMessage.getGoldNum(); - - //送礼榜 - HallMember receiverHall = hallService.getHallMember(receiverUid); - if (null == receiverHall || Constant.HallRoleType.OWNER.equals(receiverHall.getRoleType())){ - return; - } - - //收礼榜 - if (!service.updateRank(receiverUid, config, giftId, giftNum, totalGoldNum, sendGiftTime)){ - return; - } - - double score = service.getScore(config, receiverUid, giftId, giftNum, totalGoldNum, sendGiftTime); - hourRankService.updateRank(service.getActName(), senderUid, receiverUid, config, score, sendGiftTime); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualRoomRankChatListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualRoomRankChatListener.java deleted file mode 100644 index 385a65d41..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualRoomRankChatListener.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.accompany.business.annual.listener; - -import com.accompany.business.annual.service.AnnualRoomRankService; -import com.accompany.business.common.dto.RoundRankActConfigDto; -import com.accompany.business.dto.netease.IMChatMsgDTO; -import com.accompany.business.event.RoomChatEvent; -import com.accompany.business.model.Hall; -import com.accompany.business.service.hall.HallService; -import com.accompany.business.service.room.RoomService; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.model.Room; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.stereotype.Component; - -import java.time.LocalDateTime; -import java.util.Date; - -//@Component -public class AnnualRoomRankChatListener implements ApplicationListener { - - @Autowired - private AnnualRoomRankService service; - @Autowired - private HallService hallService; - @Autowired - private RoomService roomService; - - @Override - public void onApplicationEvent(RoomChatEvent roomChatEvent) { - IMChatMsgDTO chatMsgDTO = (IMChatMsgDTO) roomChatEvent.getSource(); - Date chatTime = DateTimeUtil.convertMsToDate(chatMsgDTO.getMsgTimestamp()); - LocalDateTime chatLocalDateTime = DateTimeUtil.converDateToLocalDateTime(chatTime); - - RoundRankActConfigDto config = service.getConfig(); - if (!config.inActTimeRange(chatLocalDateTime)){ - return; - } - - if (null == chatMsgDTO.getRoomId()){ - return; - } - - Room room = roomService.getRoomByRoomId(chatMsgDTO.getRoomId()); - if (null == room){ - return; - } - - Hall hall = hallService.getValidHallByUid(room.getUid()); - if (null == hall){ - return; - } - - service.updateRankByRoomChat(config, room.getUid(), chatTime); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualRoomRankGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualRoomRankGiftListener.java deleted file mode 100644 index ab294ae9d..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualRoomRankGiftListener.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.accompany.business.annual.listener; - -import com.accompany.business.annual.service.AnnualRoomRankService; -import com.accompany.business.base.listener.RoundRankGiftListener; -import com.accompany.business.event.GiftMessageEvent; -import com.accompany.business.message.GiftMessage; -import com.accompany.business.model.Hall; -import com.accompany.business.service.hall.HallService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; - -//@Component -public class AnnualRoomRankGiftListener extends RoundRankGiftListener implements ApplicationListener { - - @Autowired - private HallService hallService; - - @Override - public void onApplicationEvent(GiftMessageEvent giftMessageEvent) { - handleEvent(giftMessageEvent); - } - - @Override - protected Long getVaildObjUid(GiftMessage giftMessage) { - Long roomUid = giftMessage.getRoomUid(); - if (null == roomUid){ - return null; - } - - Hall hall = hallService.getValidHallByUid(roomUid); - if (null == hall){ - return null; - } - - return roomUid; - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualTaskGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualTaskGiftListener.java deleted file mode 100644 index ed2b59675..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualTaskGiftListener.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.accompany.business.annual.listener; - -import com.accompany.business.annual.dto.AnnualTaskConfigDto; -import com.accompany.business.annual.service.AnnualTaskService; -import com.accompany.business.common.constant.RankTypeEnum; -import com.accompany.business.event.GiftMessageEvent; -import com.accompany.business.message.GiftMessage; -import com.accompany.common.utils.DateTimeUtil; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.scheduling.annotation.Async; - -import java.time.LocalDateTime; -import java.util.Date; - -@Slf4j -//@Component -public class AnnualTaskGiftListener implements ApplicationListener{ - - @Autowired - private AnnualTaskService service; - - @Async - @Override - public void onApplicationEvent(GiftMessageEvent giftMessageEvent) { - GiftMessage giftMessage = (GiftMessage) giftMessageEvent.getSource(); - Long roomUid = giftMessage.getRoomUid(); - if (null == roomUid){ - return; - } - - Date sendGiftTime = DateTimeUtil.convertMsToDate(giftMessage.getMessTime()); - LocalDateTime sendGiftLocalDateTime = DateTimeUtil.converDateToLocalDateTime(sendGiftTime); - - AnnualTaskConfigDto config = service.getConfig(); - if (!config.inActTimeRange(sendGiftLocalDateTime)){ - return; - } - - Long senderUid = giftMessage.getSendUid(); - Long receiverUid = giftMessage.getRecvUid(); - Long totalGoldNum = giftMessage.getGoldNum(); - - service.addScore(config, senderUid, RankTypeEnum.SEND_TOTAL, totalGoldNum.intValue()); - service.addScore(config, receiverUid, RankTypeEnum.RECEIVE_TOTAL, totalGoldNum.intValue()); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualTyrantRankGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualTyrantRankGiftListener.java deleted file mode 100644 index 2ee631825..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualTyrantRankGiftListener.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.accompany.business.annual.listener; - -import com.accompany.business.annual.service.AnnualTyrantRankService; -import com.accompany.business.base.listener.RankGiftListener; -import com.accompany.business.event.GiftMessageEvent; -import org.springframework.context.ApplicationListener; -import org.springframework.scheduling.annotation.Async; - -//@Component -public class AnnualTyrantRankGiftListener extends RankGiftListener implements ApplicationListener { - - @Async - @Override - public void onApplicationEvent(GiftMessageEvent giftMessageEvent) { - handleEvent(giftMessageEvent); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualTyrantStayRoomListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualTyrantStayRoomListener.java deleted file mode 100644 index ea1dda6ed..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualTyrantStayRoomListener.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.accompany.business.annual.listener; - -import com.accompany.business.annual.service.AnnualTyrantRankService; -import com.accompany.business.common.dto.RankActConfigDto; -import com.accompany.business.event.room.UserOutRoomEvent; -import com.accompany.business.message.room.UserOutRoomMessage; -import com.accompany.common.utils.DateTimeUtil; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; - -import java.time.LocalDateTime; -import java.util.Date; -import java.util.Objects; - -@Slf4j -//@Component -public class AnnualTyrantStayRoomListener implements ApplicationListener { - - @Autowired - private AnnualTyrantRankService service; - - @Async - @Override - public void onApplicationEvent(UserOutRoomEvent event) { - UserOutRoomMessage userOutRoomMessage = (UserOutRoomMessage) event.getSource(); - Date outTime = DateTimeUtil.convertMsToDate(userOutRoomMessage.getOutTimestamp()); - LocalDateTime outLocalDateTime = DateTimeUtil.converDateToLocalDateTime(outTime); - - RankActConfigDto config = service.getConfig(); - if (!config.inActTimeRange(outLocalDateTime)){ - return; - } - - Long uid = userOutRoomMessage.getUid(); - Long roomUid = userOutRoomMessage.getRoomUid(); - - if (Objects.equals(uid, roomUid)){ - return; - } - - int minute = (int) (userOutRoomMessage.getRemainMillisecond() / (1000 * 60)); - if (minute <= 0){ - return; - } - - service.addScoreByStayRoom(config, uid, (double) minute); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualCpRankService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualCpRankService.java deleted file mode 100644 index 4a15ae8f7..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualCpRankService.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.accompany.business.annual.service; - -import com.accompany.business.annual.AnnualCpDao; -import com.accompany.business.annual.constant.AnnualConstant; -import com.accompany.business.base.service.BaseCpRankActService; -import com.accompany.business.common.constant.CpRankTypeEnum; -import com.accompany.business.common.dto.CpRankActConfigDto; -import com.accompany.business.common.dto.CpRankActCpProp; -import com.accompany.business.common.vo.ActivityCpRankVo; -import com.accompany.business.common.vo.RewardVo; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.service.SysConfService; -import com.alibaba.fastjson.JSON; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; -import org.springframework.util.StringUtils; - -import java.util.Collections; -import java.util.Comparator; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -@Service -@Slf4j -public class AnnualCpRankService extends BaseCpRankActService { - - @Autowired - private SysConfService sysConfService; - @Autowired - private AnnualCpDao cpDao; - private final String MODULE_NAME = "cp"; - @Override - public String getActName() { - return AnnualConstant.actName + "_" + MODULE_NAME; - } - - @Override - public String addAndGetCpUid(CpRankActConfigDto config, Long fromUid, Long toUid, Integer giftId, Integer giftNum, Long totalGoldNum, Date sendGiftTime) { - if (null == fromUid || null == toUid || fromUid.equals(toUid)){ - throw new ServiceException(BusiStatus.PARAMERROR); - } - String cpUid = cpDao.buildCpUid(fromUid, toUid); - CpRankActCpProp cpProp = cpDao.getCpPropByCpUid(cpUid); - if (null != cpProp){ - return cpUid; - } - if (CollectionUtils.isEmpty(config.getCpGiftIds()) - || !config.getCpGiftIds().contains(giftId)) { - return null; - } - - cpProp = new CpRankActCpProp(); - cpProp.setCpUid(cpUid); - cpProp.setFromUid(fromUid); - cpProp.setToUid(toUid); - cpProp.setScore(0L); - cpProp.setCreateTime(sendGiftTime); - cpDao.saveCpProp(cpProp); - - log.info("[2023年度盛典活动]-cp榜 fromUid {} toUid {} 组成cp {}", fromUid, toUid, cpUid); - - return cpUid; - } - - @Override - public List takeApartCpUid(String cpUid) { - return cpDao.takeApartCpUid(cpUid); - } - - - @Override - protected void afterUpdateTotalRank(String cpUid, Double totalScore, CpRankActConfigDto config) { - cpDao.updateCpScore(cpUid, totalScore, config); - } - - public ActivityCpRankVo getRank(Long uid) { - List cpUserPropList = cpDao.listCpByUid(uid, 10L); - List cpUidList = !CollectionUtils.isEmpty(cpUserPropList)? - cpUserPropList.stream() - .sorted(Comparator.comparing(CpRankActCpProp::getScore).reversed()) - .map(CpRankActCpProp::getCpUid) - .collect(Collectors.toList()): - Collections.emptyList(); - return super.getRank(cpUidList, CpRankTypeEnum.TOTAL, null, 30); - } - - @Override - protected void logUpdateRank(String cpUid, Integer giftId, Integer giftNum, Long totalGoldNum, Double score) { - log.info("[2023年度盛典活动]-cp榜 {} 收礼 {} {} 个总价值 {} 钻石，增加值 {}", cpUid, giftId, giftNum, totalGoldNum, score); - } - - @Override - protected void logRankReward(CpRankTypeEnum rankType, String date, String rankKey, Integer rankIndex, Long uid, RewardVo reward) { - log.info("[2023年度盛典活动]-cp榜 {} 发奖励， 第 {} 名 {} 奖励 {}", rankKey, rankIndex, uid, JSON.toJSONString(reward)); - } - - @Override - public CpRankActConfigDto getRankActConfig() { - return getConfig(); - } - - public CpRankActConfigDto getConfig(){ - String configStr = sysConfService.getSysConfValueById(AnnualConstant.SysConfId.CP_CONFIG); - if (!StringUtils.hasText(configStr)){ - throw new ServiceException(BusiStatus.ALREADY_NOTEXISTS_CONFIG); - } - return JSON.parseObject(configStr, CpRankActConfigDto.class); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualCpUsersRankObjectProvider.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualCpUsersRankObjectProvider.java deleted file mode 100644 index a3ef9f1a0..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualCpUsersRankObjectProvider.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.accompany.business.annual.service; - -import com.accompany.business.annual.AnnualCpDao; -import com.accompany.business.base.rankobj.CpRankObject; -import com.accompany.business.base.rankobj.CpRankObjectProvider; -import com.accompany.business.common.dto.CpRankActCpProp; -import com.accompany.business.service.user.UsersService; -import com.accompany.core.model.Users; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.*; -import java.util.stream.Collectors; - -@Service -public class AnnualCpUsersRankObjectProvider implements CpRankObjectProvider { - - @Autowired - private AnnualCpDao cpDao; - @Autowired - private UsersService usersService; - - @Override - public Map mapRankObjectByUids(List cpUidList) { - Map map = new HashMap<>(); - - Map cpPropMap = cpDao.mapCpPropByCpUidSet(new HashSet<>(cpUidList)); - - List uidList = cpUidList.stream() - .map(cpUid->cpUid.split("_")) - .flatMap(Arrays::stream) - .map(Long::parseLong) - .distinct().collect(Collectors.toList()); - - Map userMap = usersService.getUsersMapByUids(uidList); - - for (String cpUid: cpUidList) { - CpRankObject obj = new CpRankObject(); - obj.setType(CpRankObject.CpRankObjectType.CP_USER); - obj.setCpUid(cpUid); - - String[] uidArray = cpUid.split("_"); - Long leftUid = Long.parseLong(uidArray[0]); - Long rightUid = Long.parseLong(uidArray[1]); - - CpRankActCpProp cpProp = cpPropMap.get(cpUid); - if (null != cpProp){ - leftUid = cpProp.getFromUid(); - rightUid = cpProp.getToUid(); - } - - obj.setLeftUid(leftUid); - - Users leftUser = userMap.get(leftUid); - if (null != leftUser){ - obj.setLeftErbanNo(leftUser.getErbanNo()); - obj.setLeftNick(leftUser.getNick()); - obj.setLeftAvatar(leftUser.getAvatar()); - } - - obj.setRightUid(rightUid); - - Users rightUser = userMap.get(rightUid); - if (null != rightUser){ - obj.setRightErbanNo(rightUser.getErbanNo()); - obj.setRightNick(rightUser.getNick()); - obj.setRightAvatar(rightUser.getAvatar()); - } - - map.put(cpUid, obj); - } - - return map; - } - - @Override - public CpRankObject getRankObjectByUid(String cpUid) { - if (StringUtils.isBlank(cpUid)){ - return null; - } - - List uidList = Arrays.stream(cpUid.split("_")) - .map(Long::parseLong) - .distinct().collect(Collectors.toList()); - - Map userMap = usersService.getUsersMapByUids(uidList); - - CpRankObject obj = new CpRankObject(); - obj.setType(CpRankObject.CpRankObjectType.CP_USER); - obj.setCpUid(cpUid); - - String[] uidArray = cpUid.split("_"); - Long leftUid = Long.parseLong(uidArray[0]); - obj.setLeftUid(leftUid); - - Users leftUser = userMap.get(leftUid); - if (null != leftUser){ - obj.setLeftErbanNo(leftUser.getErbanNo()); - obj.setLeftNick(leftUser.getNick()); - obj.setLeftAvatar(leftUser.getAvatar()); - } - - Long rightUid = Long.parseLong(uidArray[1]); - obj.setRightUid(rightUid); - - Users rightUser = userMap.get(rightUid); - if (null != rightUser){ - obj.setRightErbanNo(rightUser.getErbanNo()); - obj.setRightNick(rightUser.getNick()); - obj.setRightAvatar(rightUser.getAvatar()); - } - - return obj; - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualGiftRankService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualGiftRankService.java deleted file mode 100644 index 31cd58b19..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualGiftRankService.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.accompany.business.annual.service; - -import com.accompany.business.annual.constant.AnnualConstant; -import com.accompany.business.annual.constant.AnnualGiftRankTypeEnum; -import com.accompany.business.annual.dto.AnnualGiftRankActConfigDto; -import com.accompany.business.base.rankobj.UsersRankObjectProvider; -import com.accompany.business.base.service.BaseMultiRankActService; -import com.accompany.business.common.dto.MultiRankActConfigDto; -import com.accompany.business.common.dto.RankActConfigDto; -import com.accompany.business.common.vo.ActivityRankVo; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.service.SysConfService; -import com.alibaba.fastjson.JSON; -import lombok.extern.slf4j.Slf4j; -import org.redisson.api.RScoredSortedSet; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; - -import java.util.Date; - -@Service -@Slf4j -public class AnnualGiftRankService extends BaseMultiRankActService { - - @Autowired - private SysConfService sysConfService; - - private final String MODULE_NAME = "gift"; - - @Override - protected String getActName() { - return AnnualConstant.actName + "_" + MODULE_NAME; - } - - public ActivityRankVo getRank(Long uid, AnnualGiftRankTypeEnum type) { - return super.getRank(uid, type, 15); - } - - @Override - public void updateRank(Long uid, AnnualGiftRankTypeEnum rankType, MultiRankActConfigDto config, Integer giftId, Integer giftNum, Long totalGoldNum, Date sendGiftTime) { - RankActConfigDto rankConfigDto = config.getTypeConfigMap().get(rankType); - if (null == rankConfigDto){ - return; - } - - double score = rankConfigDto.getScore(uid, giftId, giftNum, totalGoldNum, sendGiftTime); - if (score <= 0d){ - return; - } - - String totalRankKey = getRankKey(rankType); - RScoredSortedSet totalRank = redissonClient.getScoredSortedSet(totalRankKey); - Double totalScore = totalRank.addScore(uid, score); - - logUpdateRank(uid, rankType, giftId, giftNum, totalGoldNum, score, totalScore); - } - - @Override - protected void logUpdateRank(Long uid, AnnualGiftRankTypeEnum rankType, Integer giftId, Integer giftNum, Long goldNum, Double score, Double totalScore) { - log.info("[2023年度盛典]-礼物榜 {} 送出了 {} {} 个， 价值 {}， 获得 {} 的 {} 分， 加分后总分 {}", - uid, giftId, giftNum, goldNum, rankType, score, totalScore); - } - - @Override - public MultiRankActConfigDto getRankActConfig() { - return getConfig(); - } - - public AnnualGiftRankActConfigDto getConfig(){ - String configStr = sysConfService.getSysConfValueById(AnnualConstant.SysConfId.GIFT_CONFIG); - if (!StringUtils.hasText(configStr)){ - throw new ServiceException(BusiStatus.ALREADY_NOTEXISTS_CONFIG); - } - return JSON.parseObject(configStr, AnnualGiftRankActConfigDto.class); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualPopularHourRankService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualPopularHourRankService.java deleted file mode 100644 index de4b4c4fd..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualPopularHourRankService.java +++ /dev/null @@ -1,223 +0,0 @@ -package com.accompany.business.annual.service; - -import com.accompany.business.annual.constant.AnnualConstant; -import com.accompany.business.annual.dto.AnnualPopularConfigDto; -import com.accompany.business.annual.vo.AnnualPopularHourRankVo; -import com.accompany.business.common.dto.RoundRankActConfigDto; -import com.accompany.business.common.vo.ActivityUserVo; -import com.accompany.business.common.vo.RewardVo; -import com.accompany.business.service.SendSysMsgService; -import com.accompany.business.service.room.UserInOutRoomRecordService; -import com.accompany.business.service.user.UsersService; -import com.accompany.business.util.RewardUtil; -import com.accompany.common.constant.AppEnum; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.model.Users; -import com.alibaba.fastjson.JSON; -import lombok.extern.slf4j.Slf4j; -import org.redisson.api.RMap; -import org.redisson.api.RScoredSortedSet; -import org.redisson.api.RedissonClient; -import org.redisson.client.protocol.ScoredEntry; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.time.LocalDateTime; -import java.time.LocalTime; -import java.util.*; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; - -@Service -@Slf4j -public class AnnualPopularHourRankService { - - @Autowired - private RedissonClient redissonClient; - @Autowired - private UsersService usersService; - @Autowired - private UserInOutRoomRecordService userInOutRoomRecordService; - @Autowired - private SendSysMsgService sendSysMsgService; - @Autowired - private RewardUtil rewardUtil; - - private String MODULE_NAME = "hour"; - - public AnnualPopularHourRankVo getRank(AnnualPopularConfigDto configDto, String actName) { - AnnualPopularHourRankVo rankVo = new AnnualPopularHourRankVo(); - - AnnualPopularConfigDto.HourRankConfig hourRankConfig = configDto.getHourRankConfig(); - LocalDateTime now = LocalDateTime.now(); - boolean hasHourRank = hourRankConfig.inActTimeRange(now); - LocalDateTime lastHour = now.minusHours(1L); - boolean hasLastHourRank = hourRankConfig.inActTimeRange(lastHour); - - LocalTime countDownTime = hasHourRank? now.toLocalTime(): hourRankConfig.getStartTime(); - int curHour = countDownTime.getHour(); - rankVo.setCurHour(curHour); - - if (hasHourRank){ - String hourStr = now.format(AnnualPopularConfigDto.HourRankConfig.HOUR_FORMATTER); - List rankItemVoList = getHourRankVo(actName, hourStr, hourRankConfig.getRankSize()); - rankVo.setRankList(rankItemVoList); - - - LocalTime hourEndTime = LocalTime.of(curHour+1, 0, 0); - LocalDateTime hourEndDateTime = LocalDateTime.of(now.toLocalDate(), hourEndTime); - rankVo.setCurHourEndTime(DateTimeUtil.converLocalDateTimeToDate(hourEndDateTime)); - } else { - rankVo.setRankList(Collections.emptyList()); - } - - if (hasLastHourRank){ - String hourStr = lastHour.format(AnnualPopularConfigDto.HourRankConfig.HOUR_FORMATTER); - List lastHourRankItemVoList = getHourRankVo(actName, hourStr, 1); - rankVo.setLastTopOne(CollectionUtils.lastElement(lastHourRankItemVoList)); - } - - return rankVo; - } - - private String getHourRankKey(String actName, String hourStr){ - return String.join("_", AppEnum.getCurApp().getValue(), actName, MODULE_NAME, hourStr); - } - - private List getHourRankVo(String actName, String hourStr, Integer size) { - String rankKey = getHourRankKey(actName, hourStr); - RScoredSortedSet hourRank = redissonClient.getScoredSortedSet(rankKey); - Collection> hourRankList = hourRank.entryRangeReversed(0, size-1); - if (CollectionUtils.isEmpty(hourRankList)){ - return Collections.emptyList(); - } - - Set uidSet = hourRankList.stream().map(ScoredEntry::getValue).collect(Collectors.toSet()); - Map userInRoomMap = userInOutRoomRecordService.getUserInRoomCurrent(uidSet); - Map assistantMap = getAssistantMapByUids(uidSet, rankKey); - - List uidList = hourRankList.stream().map(ScoredEntry::getValue).collect(Collectors.toList()); - uidList.addAll(assistantMap.values()); - - Map userMap = usersService.getUsersMapByUids(uidList); - - List voList = new ArrayList<>(); - - int ranking = 1; - for (ScoredEntry entry: hourRankList) { - Long uid = entry.getValue(); - Double score = entry.getScore(); - - AnnualPopularHourRankVo.RankItem itemVo = new AnnualPopularHourRankVo.RankItem(); - itemVo.setUid(uid); - itemVo.setRanking(ranking++); - itemVo.setScore(score.longValue()); - - Users u = userMap.get(uid); - if (null != u){ - itemVo.setErbanNo(u.getErbanNo()); - itemVo.setNick(u.getNick()); - itemVo.setAvatar(u.getAvatar()); - } - - Long curRoomUid = userInRoomMap.get(uid); - itemVo.setRoomUid(curRoomUid); - - Long assistantUid = assistantMap.get(uid); - if (null != actName){ - ActivityUserVo assistantVo = new ActivityUserVo(); - assistantVo.setUid(assistantUid); - - Users assistantU = userMap.get(assistantUid); - if (null != assistantU){ - assistantVo.setErbanNo(assistantU.getErbanNo()); - assistantVo.setNick(assistantU.getNick()); - assistantVo.setAvatar(assistantU.getAvatar()); - } - - itemVo.setAssistance(assistantVo); - } - - voList.add(itemVo); - } - - return voList; - } - - private Map getAssistantMapByUids(Set uidSet, String rankKey){ - String cacheKey = getAssistantMapKey(rankKey); - RMap assistantMap = redissonClient.getMap(cacheKey); - return assistantMap.getAll(uidSet); - } - - private String getAssistantMapKey(String rankKey) { - return String.join("_", rankKey, "assistant"); - } - - private String getAssistantSortKey(String rankKey, Long receiverUid) { - return String.join("_", rankKey, "assistant_rank", receiverUid.toString()); - } - - public Long lastHourTopOneUid(AnnualPopularConfigDto.HourRankConfig configDto, String actName, LocalDateTime now){ - LocalDateTime lastHour = now.minusHours(1L); - if (!configDto.inActTimeRange(lastHour)){ - return null; - } - - String hourStr = lastHour.format(AnnualPopularConfigDto.HourRankConfig.HOUR_FORMATTER); - String rankKey = String.join("_", AppEnum.getCurApp().getValue(), actName, MODULE_NAME, hourStr); - RScoredSortedSet hourRank = redissonClient.getScoredSortedSet(rankKey); - Collection> hourRankList = hourRank.entryRangeReversed(0, 0); - if (CollectionUtils.isEmpty(hourRankList)){ - return null; - } - - return hourRankList.stream().map(ScoredEntry::getValue).findFirst().orElse(null); - } - - public void notifyHourTopOne(AnnualPopularConfigDto.HourRankConfig configDto, String actName, LocalDateTime now) { - Long lastHourTopOneUid = lastHourTopOneUid(configDto, actName, now); - if (null == lastHourTopOneUid){ - return; - } - - RewardVo rewardVo = rewardUtil.sendRewardByType(lastHourTopOneUid, configDto.getReward(), "[2023年度盛典]-人气主播-小时榜top"); - sendSysMsgService.sendPersonTextMsg(lastHourTopOneUid, AnnualConstant.Tip.POPULAR_HOUR_TOP_ONE_TIP); - log.info("[2023年度盛典]-人气主播-小时榜top {} 获得奖励 {}", lastHourTopOneUid, JSON.toJSONString(rewardVo)); - } - - public void updateRank(String actName, Long senderUid, Long receiverUid, RoundRankActConfigDto config, - Double score, Date sendGiftTime) { - AnnualPopularConfigDto.HourRankConfig hourRankConfig = ((AnnualPopularConfigDto) config).getHourRankConfig(); - LocalDateTime now = DateTimeUtil.converDateToLocalDateTime(sendGiftTime); - if (!hourRankConfig.inActTimeRange(now)){ - return ; - } - - String hourStr = now.format(AnnualPopularConfigDto.HourRankConfig.HOUR_FORMATTER); - String hourRankKey = getHourRankKey(actName, hourStr); - RScoredSortedSet hourRank = redissonClient.getScoredSortedSet(hourRankKey); - - Double totalScore = hourRank.addScore(receiverUid, score); - log.info("[2023年度盛典]-人气主播-小时榜 {} 在 {} 增加 {} 分， 增加后总分 {}", - receiverUid, hourStr, score, totalScore); - - hourRank.expire(1, TimeUnit.DAYS); - - //更新助力 - String assistantRankKey = getAssistantSortKey(hourRankKey, receiverUid); - RScoredSortedSet assistantRank = redissonClient.getScoredSortedSet(assistantRankKey); - Integer ranking = assistantRank.addScoreAndGetRevRank(senderUid, score); - assistantRank.expire(1, TimeUnit.DAYS); - if (!AnnualConstant.BtnStatus.NONE.equals(ranking)){ - return; - } - - String assistantMapKey = getAssistantMapKey(hourRankKey); - RMap assistantMap = redissonClient.getMap(assistantMapKey); - assistantMap.fastPut(receiverUid, senderUid); - assistantMap.expire(1, TimeUnit.DAYS); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualPopularRankService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualPopularRankService.java deleted file mode 100644 index 3a4b8db76..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualPopularRankService.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.accompany.business.annual.service; - -import com.accompany.business.annual.constant.AnnualConstant; -import com.accompany.business.annual.dto.AnnualPopularConfigDto; -import com.accompany.business.annual.vo.AnnualPopularHourRankVo; -import com.accompany.business.annual.vo.AnnualPopularRankItemVo; -import com.accompany.business.base.rankobj.UsersRankObjectProvider; -import com.accompany.business.base.service.BaseRoundRankActService; -import com.accompany.business.common.constant.RankRoundEnum; -import com.accompany.business.common.dto.RoundRankActConfigDto; -import com.accompany.business.common.vo.ActivityRankItemVo; -import com.accompany.business.common.vo.ActivityUserVo; -import com.accompany.business.common.vo.RoundActivityRankVo; -import com.accompany.business.service.room.UserInOutRoomRecordService; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.service.SysConfService; -import com.alibaba.fastjson.JSON; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; -import org.springframework.util.StringUtils; - -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - -@Service -@Slf4j -public class AnnualPopularRankService extends BaseRoundRankActService { - - @Autowired - private SysConfService sysConfService; - @Autowired - private AnnualPopularHourRankService hourRankService; - @Autowired - private UserInOutRoomRecordService userInOutRoomRecordService; - - private String MODULE_NAME = "popular_rank"; - - @Override - public String getActName() { - return AnnualConstant.actName + "_" + MODULE_NAME; - } - - @Override - public RoundActivityRankVo getRank(Long uid, RankRoundEnum round) { - RoundActivityRankVo rankVo = super.getRank(uid, round); - if (CollectionUtils.isEmpty(rankVo.getRankList())){ - return rankVo; - } - - //包装进房状态 - Set uidSet = rankVo.getRankList().stream().map(ActivityUserVo::getUid).collect(Collectors.toSet()); - Map userInRoomMap = userInOutRoomRecordService.getUserInRoomCurrent(uidSet); - - List rankItemVos = rankVo.getRankList().stream().map(itemVo->{ - AnnualPopularRankItemVo i = new AnnualPopularRankItemVo(); - BeanUtils.copyProperties(itemVo, i); - Long curRoomUid = userInRoomMap.get(itemVo.getUid()); - i.setRoomUid(curRoomUid); - return i; - }).collect(Collectors.toList()); - rankVo.setRankList(rankItemVos); - - return rankVo; - } - - @Override - public double getScore(RoundRankActConfigDto config, Long uid, Integer giftId, Integer giftNum, Long totalGoldNum, Date sendGiftTime) { - double score = super.getScore(config, uid, giftId, giftNum, totalGoldNum, sendGiftTime); - - AnnualPopularConfigDto.HourRankConfig hourRankConfig = ((AnnualPopularConfigDto) config).getHourRankConfig(); - //上一个小时段的榜一 - LocalDateTime sendGiftDateTime = DateTimeUtil.converDateToLocalDateTime(sendGiftTime); - LocalDateTime lastHour = sendGiftDateTime.minusHours(1L); - if (hourRankConfig.inActTimeRange(lastHour) && lastHour.getMinute() < hourRankConfig.getRateMinute()){ - Long lastHourTopOneUid = hourRankService.lastHourTopOneUid(hourRankConfig, getActName(), sendGiftDateTime); - if (uid.equals(lastHourTopOneUid)){ - //加分 - return BigDecimal.valueOf(score).multiply(BigDecimal.valueOf(hourRankConfig.getScoreRate())).doubleValue(); - } - } - - return score; - } - - public AnnualPopularHourRankVo getHourRank() { - AnnualPopularConfigDto configDto = getConfig(); - return hourRankService.getRank(configDto, getActName()); - } - - public void notifyHourTopOne(LocalDateTime now) { - AnnualPopularConfigDto configDto = getConfig(); - hourRankService.notifyHourTopOne(configDto.getHourRankConfig(), getActName(), now); - } - - @Override - protected void afterUpdateRank(Long uid, RoundRankActConfigDto config, RankRoundEnum round, - Integer giftId, Integer giftNum, Long goldNum, - Double score, Double totalScore, Date sendGiftTime) { - log.info("[2023年度盛典]-人气主播 {} 在第 {} 轮 收到 {} {} 个，价值 {} 钻 {} 分， 增加后总分 {}", - uid, round, giftId, giftNum, goldNum, score, totalScore); - } - - @Override - public RoundRankActConfigDto getRankActConfig() { - return getConfig(); - } - - public AnnualPopularConfigDto getConfig(){ - String configStr = sysConfService.getSysConfValueById(AnnualConstant.SysConfId.POPULAR_CONFIG); - if (!StringUtils.hasText(configStr)){ - throw new ServiceException(BusiStatus.ALREADY_NOTEXISTS_CONFIG); - } - return JSON.parseObject(configStr, AnnualPopularConfigDto.class); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualRoomRankService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualRoomRankService.java deleted file mode 100644 index b6288f1e2..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualRoomRankService.java +++ /dev/null @@ -1,340 +0,0 @@ -package com.accompany.business.annual.service; - -import com.accompany.business.annual.constant.AnnualConstant; -import com.accompany.business.annual.dto.AnnualRoomConfigDto; -import com.accompany.business.annual.vo.AnnualRoomPkInfoVo; -import com.accompany.business.annual.vo.AnnualRoomRankVo; -import com.accompany.business.base.rankobj.RoomRankObjectProvider; -import com.accompany.business.base.service.BaseRoundRankActService; -import com.accompany.business.common.constant.RankRoundEnum; -import com.accompany.business.common.dto.ActCpProp; -import com.accompany.business.common.dto.RoundRankActConfigDto; -import com.accompany.business.common.vo.ActivityCpItemVo; -import com.accompany.business.common.vo.RewardVo; -import com.accompany.business.common.vo.RoundActivityRankVo; -import com.accompany.business.constant.CrossRoomRecordStatusEnum; -import com.accompany.business.dto.CrossRoomPkRankDataDto; -import com.accompany.business.event.CrossRoomPkEndMessageEvent; -import com.accompany.business.message.CrossRoomPkEndMessage; -import com.accompany.business.model.room.CrossRoomPkRecord; -import com.accompany.business.service.SendSysMsgService; -import com.accompany.business.service.room.CrossRoomPkRoundService; -import com.accompany.business.service.room.RoomService; -import com.accompany.business.service.user.UsersService; -import com.accompany.common.constant.AppEnum; -import com.accompany.common.constant.Constant; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.model.Room; -import com.accompany.core.model.Users; -import com.accompany.core.service.SysConfService; -import com.alibaba.fastjson.JSON; -import lombok.extern.slf4j.Slf4j; -import org.redisson.api.RMap; -import org.redisson.api.RScoredSortedSet; -import org.redisson.client.protocol.ScoredEntry; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; -import org.springframework.util.StringUtils; - -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.time.LocalTime; -import java.util.*; -import java.util.stream.Collectors; - -@Service -@Slf4j -public class AnnualRoomRankService extends BaseRoundRankActService implements InitializingBean, ApplicationListener { - - @Autowired - private SysConfService sysConfService; - @Autowired - private RoomService roomService; - @Autowired - private UsersService usersService; - @Autowired - private CrossRoomPkRoundService crossRoomPkRoundService; - @Autowired - private SendSysMsgService sendSysMsgService; - - private String MODULE_NAME = "room_rank"; - - private RMap roomChatLimitMap; - - private RMap> roomPkMap; - - @Override - public String getActName() { - return AnnualConstant.actName + "_" + MODULE_NAME; - } - - public AnnualRoomRankVo getRank(Long uid, RankRoundEnum round) { - RoundActivityRankVo rankVo = super.getRank(uid, round); - - AnnualRoomRankVo rankVoWrap = new AnnualRoomRankVo(); - BeanUtils.copyProperties(rankVo, rankVoWrap); - - boolean hasRoomPk = RankRoundEnum.FOURTH.equals(rankVo.getCurRound()) || RankRoundEnum.FIVE.equals(rankVo.getCurRound()); - rankVoWrap.setHasRoomPk(hasRoomPk); - return rankVoWrap; - } - - @Override - protected void afterUpdateRank(Long uid, RoundRankActConfigDto config, RankRoundEnum round, - Integer giftId, Integer giftNum, Long goldNum, - Double score, Double totalScore, Date sendGiftTime) { - log.info("[2023年度盛典]-名厅之战 {} 在第 {} 轮 收到 {} {} 个，价值 {} 钻 {} 分， 增加后总分 {}", - uid, round, giftId, giftNum, goldNum, score, totalScore); - } - - @Override - protected void initRank(RoundRankActConfigDto configDto, RankRoundEnum curRound) { - super.initRank(configDto, curRound); - - if (RankRoundEnum.FOURTH.equals(curRound) - || RankRoundEnum.FIVE.equals(curRound)){ - bookRoomPk(configDto, curRound); - } - } - - private void bookRoomPk(RoundRankActConfigDto configDto, RankRoundEnum curRound) { - RScoredSortedSet rank = getRankByRound(curRound); - - Collection> rankList = rank.entryRangeReversed(0, Integer.MAX_VALUE); - if (CollectionUtils.isEmpty(rankList)){ - log.error("[2023年度盛典]-名厅之战 初始化 {} 轮的房间pk异常，当前榜单无人上榜"); - return; - } - - int rankSize = rankList.size(); - if (rankSize % 2 != 0){ - log.error("[2023年度盛典]-名厅之战 初始化 {} 轮的房间pk异常，榜单长度为{}，不是2的倍数"); - return; - } - - List roomUidList = rankList.stream().map(ScoredEntry::getValue).collect(Collectors.toList()); - - bookRoomPk(configDto, curRound, roomUidList); - - } - - public void bookRoomPk(RankRoundEnum round, List roomUids) { - RoundRankActConfigDto configDto = getRankActConfig(); - bookRoomPk(configDto, round, roomUids); - } - - private void bookRoomPk(RoundRankActConfigDto configDto, RankRoundEnum curRound, List roomUidList){ - RoundRankActConfigDto.RoundRankConfig roundConfig = configDto.getRoundMap().get(curRound); - if (null == roundConfig){ - return; - } - - int rankSize = roomUidList.size(); - - List cpList = new ArrayList<>(); - - LocalDateTime startDateTime = LocalDateTime.of(roundConfig.getEndTime().toLocalDate(), LocalTime.of(21, 0, 0)); - Date startTime = DateTimeUtil.converLocalDateTimeToDate(startDateTime); - Integer durationMin = 60; - - for (int i = 0; i < rankSize; i=i+2) { - Long leftRoomUid = roomUidList.get(i); - Long rightRoomUid = roomUidList.get(i+1); - - Long pkRoundId = crossRoomPkRoundService.bookCrossRoomPk(leftRoomUid, rightRoomUid, null, startTime, durationMin, ""); - - log.info("[2023年度盛典]-名厅之战 初始化 {} 轮的房间pk， {} 与 {} 组成pk， pkId {}", curRound, leftRoomUid, rightRoomUid, pkRoundId); - - ActCpProp cpProp = new ActCpProp(); - cpProp.setCpUid(pkRoundId.toString()); - cpProp.setFromUid(leftRoomUid); - cpProp.setToUid(rightRoomUid); - cpList.add(cpProp); - } - - roomPkMap.fastPut(curRound, cpList); - } - - public AnnualRoomPkInfoVo getRoomPkInfo() { - LocalDateTime now = LocalDateTime.now(); - AnnualRoomConfigDto configDto = getConfig(); - if (!configDto.inActTimeRange(now)){ - throw new ServiceException(BusiStatus.NOT_IN_ACT_TIME_RANGE); - } - - RankRoundEnum curRound = configDto.getCurRound(now); - if (!RankRoundEnum.FOURTH.equals(curRound) && !RankRoundEnum.FIVE.equals(curRound)){ - throw new ServiceException(BusiStatus.NOT_IN_ACT_TIME_RANGE); - } - - List roomPkInfoList = roomPkMap.getOrDefault(curRound, Collections.emptyList()); - - List roomUidList = new ArrayList<>(); - for (ActCpProp cp: roomPkInfoList){ - roomUidList.add(cp.getFromUid()); - roomUidList.add(cp.getToUid()); - } - - Map userMap = usersService.getUsersMapByUids(roomUidList); - Map roomMap = roomService.getRoomMap(roomUidList); - - List roomPkInfoVoList = roomPkInfoList.stream().map(cp->{ - ActivityCpItemVo itemVo = new ActivityCpItemVo(); - itemVo.setCpUid(cp.getCpUid()); - - itemVo.setLeftUid(cp.getFromUid()); - - Users leftUser = userMap.get(cp.getFromUid()); - if (null != leftUser){ - itemVo.setLeftErbanNo(leftUser.getErbanNo()); - } - - Room leftRoom = roomMap.get(cp.getFromUid()); - if (null != leftRoom){ - itemVo.setLeftNick(leftRoom.getTitle()); - itemVo.setLeftAvatar(leftRoom.getAvatar()); - } - - itemVo.setRightUid(cp.getToUid()); - - Users rightUser = userMap.get(cp.getToUid()); - if (null != rightUser){ - itemVo.setRightErbanNo(rightUser.getErbanNo()); - } - - Room rightRoom = roomMap.get(cp.getToUid()); - if (null != rightRoom){ - itemVo.setRightNick(rightRoom.getTitle()); - itemVo.setRightAvatar(rightRoom.getAvatar()); - } - - return itemVo; - }).collect(Collectors.toList()); - - AnnualRoomPkInfoVo vo = new AnnualRoomPkInfoVo(); - vo.setCurRound(curRound); - vo.setRoomPkList(roomPkInfoVoList); - return vo; - } - - @Override - public RoundRankActConfigDto getRankActConfig() { - return getConfig(); - } - - public AnnualRoomConfigDto getConfig(){ - String configStr = sysConfService.getSysConfValueById(AnnualConstant.SysConfId.ROOM_CONFIG); - if (!StringUtils.hasText(configStr)){ - throw new ServiceException(BusiStatus.ALREADY_NOTEXISTS_CONFIG); - } - return JSON.parseObject(configStr, AnnualRoomConfigDto.class); - } - - public void updateRankByRoomChat(RoundRankActConfigDto config, Long uid, Date chatTime) { - String date = DateTimeUtil.convertDate(chatTime, DateTimeUtil.DEFAULT_DATE_PATTERN); - String limitKey = String.join("_", uid.toString(), date); - Integer count = roomChatLimitMap.getOrDefault(limitKey, 0); - if (count >= 1000){ - return; - } - count = roomChatLimitMap.addAndGet(limitKey, 1); - if (count > 1000){ - roomChatLimitMap.fastPut(limitKey, 1000); - } - - RankRoundEnum curRound = getCurVaildRound(uid, config, chatTime); - if (null == curRound){ - return; - } - - double score = 1d; - RScoredSortedSet rank = getRankByRound(curRound); - Double totalScore = rank.addScore(uid, score); - - log.info("[2023年度盛典]-名厅之战 在 {} 房间中发送公屏聊天加分后，总分 {}", uid, totalScore); - } - - - @Override - public void afterPropertiesSet() throws Exception { - String cacheKey = String.join("_", AppEnum.getCurApp().getValue(), getActName(), "room_chat_limit"); - roomChatLimitMap = redissonClient.getMap(cacheKey); - String roomPkCacheKey = String.join("_", AppEnum.getCurApp().getValue(), getActName(), "room_pk"); - roomPkMap = redissonClient.getMap(roomPkCacheKey); - } - - @Override - public void onApplicationEvent(CrossRoomPkEndMessageEvent event) { - CrossRoomPkEndMessage pkEndMessage = (CrossRoomPkEndMessage) event.getSource(); - Date endTime = pkEndMessage.getActualEndTime(); - - LocalDateTime endDateTime = DateTimeUtil.converDateToLocalDateTime(endTime); - AnnualRoomConfigDto configDto = getConfig(); - if (!configDto.inActTimeRange(endDateTime)){ - return; - } - - RankRoundEnum curRound = configDto.getCurRound(endDateTime); - if (!RankRoundEnum.FOURTH.equals(curRound) && !RankRoundEnum.FIVE.equals(curRound)){ - return; - } - - List cpPropList = roomPkMap.get(curRound); - if (CollectionUtils.isEmpty(cpPropList)){ - return; - } - - String roundId = pkEndMessage.getRoundId().toString(); - if (cpPropList.stream().map(ActCpProp::getCpUid).noneMatch(cpUid->cpUid.equals(roundId))){ - log.info("[2023年度盛典]-名厅之站 cpPropList {} 找不到 roundId {} ", JSON.toJSONString(cpPropList), roundId); - return; - } - - - CrossRoomPkRecord winRoom = null; - if (CrossRoomRecordStatusEnum.WIN.getValue() == pkEndMessage.getInviteRoom().getStatus()){ - winRoom = pkEndMessage.getInviteRoom(); - } else if (CrossRoomRecordStatusEnum.WIN.getValue() == pkEndMessage.getAcceptRoom().getStatus()){ - winRoom = pkEndMessage.getAcceptRoom(); - } - - if (null == winRoom){ - log.error("[2023年度盛典]-名厅之站 当前{}轮的房间pk {} 已结算，但无赢家",curRound, roundId); - return; - } - - Long winRoomUid = winRoom.getRoomUid(); - Double winScore = winRoom.getNormalGiftAmount().add(winRoom.getBagGiftAmount()) - .multiply(BigDecimal.valueOf(configDto.getRoomPkWinnerScorePercent())).doubleValue(); - RScoredSortedSet curRank = getRankByRound(curRound); - Double afterScore = curRank.addScore(winRoomUid, winScore); - - log.error("[2023年度盛典]-名厅之站 当前 {} 轮的房间pk {} 已结算，赢家 {}，增加 {} 分，后 {} 分", - curRound, roundId, winRoomUid, winScore, afterScore); - - List topList = crossRoomPkRoundService.listPkRank(winRoomUid, Long.parseLong(roundId), Constant.RoomPKTeamType.BULE_TEAM, 0L); - CrossRoomPkRankDataDto topOne = CollectionUtils.lastElement(topList); - if (null == topOne){ - log.error("[2023年度盛典]-名厅之站 当前{}轮的房间pk {} 已结算，赢家 {}，但无豪气榜榜一",curRound, roundId, winRoomUid); - return; - } - - Long topOneUid = topOne.getUid(); - List rewardVoList = configDto.getRoomPkTopOneRewardList() - .stream().parallel() - .map(dto->rewardUtil.sendRewardByType(topOneUid, dto, "[2023年度盛典]-名厅之站-跨房pk豪气榜榜一")) - .collect(Collectors.toList()); - log.info("[2023年度盛典]-名厅之站 当前 {} 轮的房间pk {} 已结算，赢家 {}，豪气榜榜一 {} 获得奖励 {}", - curRound, roundId, winRoomUid, topOneUid, JSON.toJSONString(rewardVoList)); - - Room room = roomService.getRoomByUid(winRoomUid); - String tip = String.format(AnnualConstant.Tip.ROOM_PK_TOP_ONE_TIP, room.getTitle()); - sendSysMsgService.sendPersonTextMsg(topOneUid, tip); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualTaskService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualTaskService.java deleted file mode 100644 index 6a738ce08..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualTaskService.java +++ /dev/null @@ -1,162 +0,0 @@ -package com.accompany.business.annual.service; - -import com.accompany.business.annual.AnnualTaskDao; -import com.accompany.business.annual.constant.AnnualConstant; -import com.accompany.business.annual.dto.AnnualTaskConfigDto; -import com.accompany.business.annual.vo.AnnualTaskVo; -import com.accompany.business.common.constant.RankTypeEnum; -import com.accompany.business.common.dto.RewardDto; -import com.accompany.business.common.vo.ActivityStageTaskItemVo; -import com.accompany.business.common.vo.RewardVo; -import com.accompany.business.service.user.UsersService; -import com.accompany.business.util.RewardUtil; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.model.Users; -import com.accompany.core.service.SysConfService; -import com.alibaba.fastjson.JSON; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; -import org.springframework.util.StringUtils; - -import java.time.LocalDateTime; -import java.util.*; -import java.util.stream.Collectors; - -@Service -@Slf4j -public class AnnualTaskService { - - @Autowired - private SysConfService sysConfService; - @Autowired - private UsersService usersService; - @Autowired - private AnnualTaskDao dao; - @Autowired - private RewardUtil rewardUtil; - - public AnnualTaskVo getTaskVo(Long uid, RankTypeEnum type) { - AnnualTaskConfigDto configDto = getConfig(); - - AnnualTaskVo vo = new AnnualTaskVo(); - vo.setStartTime(DateTimeUtil.converLocalDateTimeToDate(configDto.getStartTime())); - vo.setEndTime(DateTimeUtil.converLocalDateTimeToDate(configDto.getEndTime())); - - vo.setUid(uid); - Users users = usersService.getUsersByUid(uid); - if (null != users){ - vo.setErbanNo(users.getErbanNo()); - vo.setNick(users.getNick()); - vo.setAvatar(users.getAvatar()); - } - - vo.setType(type.getType()); - Integer score = dao.getScoreByUidAndType(uid, type); - vo.setScore(score); - - List taskList = configDto.getTasks().get(type); - if (CollectionUtils.isEmpty(taskList)){ - return vo; - } - - Map taskStatusMap = dao.getTaskStatus(uid); - - List taskItemVoList = new ArrayList<>(); - for (AnnualTaskConfigDto.Task task: taskList) { - ActivityStageTaskItemVo itemVo = new ActivityStageTaskItemVo(); - itemVo.setTaskId(task.getId()); - itemVo.setScore(task.getNeed().longValue()); - - String taskId = buildTaskId(type, task.getId()); - Integer status = taskStatusMap.getOrDefault(taskId, AnnualConstant.BtnStatus.NONE); - itemVo.setStatus(status); - - taskItemVoList.add(itemVo); - } - vo.setTaskList(taskItemVoList); - - Optional nextStage = taskItemVoList.stream() - .filter(v->score.compareTo(v.getScore().intValue()) < 0) - .min(Comparator.comparing(ActivityStageTaskItemVo::getScore)); - if (nextStage.isPresent()){ - Integer dist = nextStage.get().getScore().intValue() - score; - vo.setNextStageDist(dist); - } else { - vo.setNextStageDist(0); - } - - return vo; - } - - public List getTaskReward(Long uid, RankTypeEnum type, Integer taskId) { - LocalDateTime now = LocalDateTime.now(); - AnnualTaskConfigDto configDto = getConfig(); - if (!configDto.inActTimeRange(now)){ - throw new ServiceException(BusiStatus.NOT_IN_ACT_TIME_RANGE); - } - - List taskList = configDto.getTasks().get(type); - if (CollectionUtils.isEmpty(taskList)){ - throw new ServiceException(BusiStatus.PARAMETERILLEGAL); - } - - Optional taskOptional = taskList.stream().filter(t->t.getId().equals(taskId)).findAny(); - if (!taskOptional.isPresent()){ - throw new ServiceException(BusiStatus.PARAMETERILLEGAL); - } - - AnnualTaskConfigDto.Task task = taskOptional.get(); - - String taskIdKey = buildTaskId(type, task.getId()); - Map statusMap = dao.getTaskStatus(uid); - Integer status = statusMap.getOrDefault(taskIdKey, AnnualConstant.BtnStatus.NONE); - - if (AnnualConstant.BtnStatus.NONE.equals(status)){ - throw new ServiceException(BusiStatus.ACT_AWARD_NOT_ACCORD); - } else if (AnnualConstant.BtnStatus.HAD.equals(status)) { - throw new ServiceException(BusiStatus.ACT_AWARD_HAS_GET); - } - - if (!dao.saveStatus(uid, taskIdKey)){ - throw new ServiceException(BusiStatus.ACT_AWARD_HAS_GET); - } - - List rewardList = task.getReward(); - return rewardList.parallelStream() - .map(dto->rewardUtil.sendRewardByType(uid, dto, "[2023年度圣诞]-年度任务")) - .collect(Collectors.toList()); - } - - @Async - public void addScore(AnnualTaskConfigDto config, Long uid, RankTypeEnum typeEnum, Integer totalGoldNum) { - Integer afterScore = dao.addScore(uid, typeEnum, totalGoldNum); - List taskList = config.getTasks().get(typeEnum); - if (CollectionUtils.isEmpty(taskList)){ - return; - } - - log.info("[2023年度盛典]-年度任务 {} {} {} {}", uid, typeEnum, totalGoldNum, afterScore); - - Set taskIdSet = taskList.stream() - .filter(task -> afterScore >= task.getNeed()).map(task -> buildTaskId(typeEnum, task.getId())) - .collect(Collectors.toSet()); - dao.setStatus(uid, taskIdSet); - } - - public String buildTaskId(RankTypeEnum typeEnum, Integer taskId){ - return String.join("_", typeEnum.getType().toString(), taskId.toString()); - } - - public AnnualTaskConfigDto getConfig(){ - String configStr = sysConfService.getSysConfValueById(AnnualConstant.SysConfId.TASK_CONFIG); - if (!StringUtils.hasText(configStr)){ - throw new ServiceException(BusiStatus.ALREADY_NOTEXISTS_CONFIG); - } - return JSON.parseObject(configStr, AnnualTaskConfigDto.class); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualTyrantRankService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualTyrantRankService.java deleted file mode 100644 index 4662ef634..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualTyrantRankService.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.accompany.business.annual.service; - -import com.accompany.business.annual.constant.AnnualConstant; -import com.accompany.business.base.rankobj.UsersRankObjectProvider; -import com.accompany.business.base.service.BaseRankActService; -import com.accompany.business.common.constant.RankTypeEnum; -import com.accompany.business.common.dto.RankActConfigDto; -import com.accompany.business.common.vo.ActivityRankVo; -import com.accompany.business.model.Hall; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.service.SysConfService; -import com.alibaba.fastjson.JSON; -import lombok.extern.slf4j.Slf4j; -import org.redisson.api.RScoredSortedSet; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; - -@Service -@Slf4j -public class AnnualTyrantRankService extends BaseRankActService { - - @Autowired - private SysConfService sysConfService; - - private final String MODULE_NAME = "tyrant"; - - @Override - protected String getActName() { - return AnnualConstant.actName + "_" + MODULE_NAME; - } - - public ActivityRankVo getRank(Long uid) { - return super.getRank(uid, RankTypeEnum.SEND_TOTAL, null, 30); - } - - @Override - protected void logUpdateSendRank(Long uid, Integer giftId, Integer giftNum, Long goldNum, Double score) { - log.info("[2023年度盛典]-年度神豪 {} 送出 {} {} 个，价值 {}， 增加后总分 {}", uid, giftId, giftNum, goldNum, score); - } - - @Override - public RankActConfigDto getRankActConfig() { - return getConfig(); - } - - public RankActConfigDto getConfig(){ - String configStr = sysConfService.getSysConfValueById(AnnualConstant.SysConfId.TYRANT_CONFIG); - if (!StringUtils.hasText(configStr)){ - throw new ServiceException(BusiStatus.ALREADY_NOTEXISTS_CONFIG); - } - return JSON.parseObject(configStr, RankActConfigDto.class); - } - - public void addScoreByStayRoom(RankActConfigDto config, Long uid, Double score){ - Hall senderHall = hallService.getValidHallByUid(uid); - if (null != senderHall){ - return; - } - - String rankKey = getRankKey(RankTypeEnum.SEND_TOTAL, null, config); - RScoredSortedSet rank = redissonClient.getScoredSortedSet(rankKey); - Double totalScore = rank.addScore(uid, score); - - log.info("[2023年度盛典]-年度神豪 {} {} {}", uid, score, totalScore); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/children/handler/LimitGift61ForReceiveHandler.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/children/handler/LimitGift61ForReceiveHandler.java deleted file mode 100644 index 5f2da693a..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/children/handler/LimitGift61ForReceiveHandler.java +++ /dev/null @@ -1,155 +0,0 @@ -package com.accompany.business.children.handler; - -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.StrUtil; -import com.accompany.business.activity.dto.ActTaskContext; -import com.accompany.business.activity.enums.ActConditionKindEnum; -import com.accompany.business.activity.enums.ActTaskStatusEnum; -import com.accompany.business.activity.handle.IActTaskHandler; -import com.accompany.business.activity.model.ActTask; -import com.accompany.business.activity.model.ActTaskCondition; -import com.accompany.business.activity.model.ActUserTask; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.utils.DateTimeUtil; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -import java.util.Date; -import java.util.List; - -/** - * @author: liaozetao - * @date: 2024/5/22 14:04 - * @description: - */ -@Slf4j -@Component -public class LimitGift61ForReceiveHandler extends IActTaskHandler { - - @Override - protected boolean eq(ActTaskCondition actTaskCondition, ActTaskContext context) { - String activityCode = actTaskCondition.getActivityCode(); - String componentCode = actTaskCondition.getComponentCode(); - Long conditionValue = actTaskCondition.getConditionValue(); - Long receiveUid = context.getReceiveUid(); - Integer giftId = context.getGiftId(); - Long giftValue = context.getGiftValue(); - Date startTime = context.getTaskStartTime(); - Date endTime = context.getTaskEndTime(); - if (giftId == null) { - return false; - } - if (conditionValue == null || !conditionValue.equals(giftId.longValue())) { - return false; - } - String startTimeStr = DateTimeUtil.convertDate(startTime, DateTimeUtil.ACTIVITY_DATE_HOUR_PATTERN); - String endTimeStr = DateTimeUtil.convertDate(endTime, DateTimeUtil.ACTIVITY_DATE_HOUR_PATTERN); - String receiveKey = RedisKey.act_user_task_score_for_receive.getKey(activityCode, componentCode, startTimeStr, endTimeStr); - if (receiveUid != null) { - jedisService.hincrBy(receiveKey, receiveUid.toString(), giftValue); - jedisService.expire(receiveKey, HALF_MONTH); - } - return super.eq(actTaskCondition, context); - } - - @Override - public void doHandle(ActTaskContext context) { - ActTask actTask = context.getActTask(); - Long receiveUid = context.getReceiveUid(); - Date startTime = context.getTaskStartTime(); - Date endTime = context.getTaskEndTime(); - Integer giftId = context.getGiftId(); - String activityCode = actTask.getActivityCode(); - String componentCode = actTask.getComponentCode(); - String parentCode = actTask.getParentCode(); - List actTaskConditions = actTaskConditionService.list(Wrappers.lambdaQuery() - .eq(ActTaskCondition::getActivityCode, activityCode) - .eq(ActTaskCondition::getComponentCode, componentCode) - .eq(ActTaskCondition::getTaskCode, parentCode) - .eq(ActTaskCondition::getConditionKind, ActConditionKindEnum.GE.name())); - if (CollectionUtil.isEmpty(actTaskConditions)) { - return; - } - ActTaskCondition actTaskCondition = actTaskConditions.get(0); - String conditionCode = actTaskCondition.getConditionCode(); - Long conditionValue = actTaskCondition.getConditionValue(); - if (giftId == null) { - return; - } - List childrenConditions = actTaskConditionService.list(Wrappers.lambdaQuery() - .eq(ActTaskCondition::getActivityCode, activityCode) - .eq(ActTaskCondition::getComponentCode, componentCode) - .eq(ActTaskCondition::getTaskCode, actTask.getTaskCode()) - .eq(ActTaskCondition::getConditionKind, ActConditionKindEnum.EQ.name())); - if (CollectionUtil.isEmpty(childrenConditions)) { - return; - } - ActTaskCondition childrenCondition = childrenConditions.get(0); - if (childrenCondition.getConditionValue() == null || !childrenCondition.getConditionValue().equals(giftId.longValue())) { - return; - } - String startTimeStr = DateTimeUtil.convertDate(startTime, DateTimeUtil.ACTIVITY_DATE_HOUR_PATTERN); - String endTimeStr = DateTimeUtil.convertDate(endTime, DateTimeUtil.ACTIVITY_DATE_HOUR_PATTERN); - String receiveKey = RedisKey.act_user_task_score_for_receive.getKey(activityCode, componentCode, startTimeStr, endTimeStr); - String receiveScoreStr = jedisService.hget(receiveKey, String.valueOf(receiveUid)); - String sendKey = RedisKey.act_user_task_score_for_send.getKey(activityCode, componentCode, startTimeStr, endTimeStr); - String sendScoreStr = jedisService.hget(sendKey, String.valueOf(receiveUid)); - if (StrUtil.isEmpty(receiveScoreStr) && StrUtil.isEmpty(sendScoreStr)) { - return; - } - long receiveScore = 0; - if (StrUtil.isNotEmpty(receiveScoreStr)) { - receiveScore = Long.parseLong(receiveScoreStr); - } - long sendScore = 0; - if (StrUtil.isNotEmpty(sendScoreStr)) { - sendScore = Long.parseLong(sendScoreStr); - } - long activityValue = receiveScore + sendScore; - ActUserTask actUserTask = new ActUserTask(); - actUserTask.setUid(receiveUid); - actUserTask.setActivityCode(activityCode); - actUserTask.setComponentCode(componentCode); - actUserTask.setTaskCode(parentCode); - actUserTask.setConditionCode(conditionCode); - actUserTask.setActivityValue(activityValue); - actUserTask.setExchangeValue(0L); - actUserTask.setTaskStatus(ActTaskStatusEnum.PROCESS.ordinal()); - actUserTask.setStartTime(startTime); - actUserTask.setEndTime(endTime); - List actUserTasks = actUserTaskService.list(Wrappers.lambdaQuery() - .eq(ActUserTask::getActivityCode, activityCode) - .eq(ActUserTask::getComponentCode, componentCode) - .eq(ActUserTask::getTaskCode, parentCode) - .eq(ActUserTask::getConditionCode, conditionCode) - .eq(ActUserTask::getUid, receiveUid) - .eq(ActUserTask::getStartTime, startTime) - .eq(ActUserTask::getEndTime, endTime) - .between(ActUserTask::getCreateTime, startTime, endTime)); - if (CollectionUtil.isNotEmpty(actUserTasks)) { - ActUserTask task = actUserTasks.get(0); - Integer taskStatus = task.getTaskStatus(); - if (ActTaskStatusEnum.COMPLETE.ordinal() == taskStatus || ActTaskStatusEnum.GRANT.ordinal() == taskStatus) { - log.info("taskCode : {} is complete", parentCode); - return; - } - actUserTask.setId(task.getId()); - actUserTask.setExchangeValue(task.getExchangeValue()); - } - Long currExchangeValue = actUserTask.getExchangeValue(); - long exchangeValue = (activityValue / conditionValue) - currExchangeValue; - if (exchangeValue >= 1) { - jedisService.hincrBy(RedisKey.act_user_task_extra_data.getKey(), String.valueOf(receiveUid), exchangeValue); - jedisService.expire(RedisKey.act_user_task_extra_data.getKey(), HALF_MONTH); - Date now = new Date(); - Date beginTimeOfDay = DateTimeUtil.getBeginTimeOfDay(now); - Date endTimeOfDay = DateTimeUtil.getEndTimeOfDay(now); - jedisService.hincrBy(RedisKey.act_user_task_extra_data.getKey(parentCode, DateTimeUtil.convertDate(beginTimeOfDay, DateTimeUtil.DEFAULT_DATE_PATTERN), DateTimeUtil.convertDate(endTimeOfDay, DateTimeUtil.DEFAULT_DATE_PATTERN)), String.valueOf(receiveUid), exchangeValue); - jedisService.expire(RedisKey.act_user_task_extra_data.getKey(parentCode, DateTimeUtil.convertDate(beginTimeOfDay, DateTimeUtil.DEFAULT_DATE_PATTERN), DateTimeUtil.convertDate(endTimeOfDay, DateTimeUtil.DEFAULT_DATE_PATTERN)), HALF_MONTH); - currExchangeValue += exchangeValue; - } - actUserTask.setExchangeValue(currExchangeValue); - actUserTaskService.saveOrUpdate(actUserTask); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/children/handler/LimitGift61ForSendHandler.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/children/handler/LimitGift61ForSendHandler.java deleted file mode 100644 index f8976b4b2..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/children/handler/LimitGift61ForSendHandler.java +++ /dev/null @@ -1,155 +0,0 @@ -package com.accompany.business.children.handler; - -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.StrUtil; -import com.accompany.business.activity.dto.ActTaskContext; -import com.accompany.business.activity.enums.ActConditionKindEnum; -import com.accompany.business.activity.enums.ActTaskStatusEnum; -import com.accompany.business.activity.handle.IActTaskHandler; -import com.accompany.business.activity.model.ActTask; -import com.accompany.business.activity.model.ActTaskCondition; -import com.accompany.business.activity.model.ActUserTask; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.utils.DateTimeUtil; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -import java.util.Date; -import java.util.List; - -/** - * @author: liaozetao - * @date: 2024/5/22 14:04 - * @description: - */ -@Slf4j -@Component -public class LimitGift61ForSendHandler extends IActTaskHandler { - - @Override - protected boolean eq(ActTaskCondition actTaskCondition, ActTaskContext context) { - String activityCode = actTaskCondition.getActivityCode(); - String componentCode = actTaskCondition.getComponentCode(); - Long conditionValue = actTaskCondition.getConditionValue(); - Long sendUid = context.getSendUid(); - Integer giftId = context.getGiftId(); - Long giftValue = context.getGiftValue(); - Date startTime = context.getTaskStartTime(); - Date endTime = context.getTaskEndTime(); - if (giftId == null) { - return false; - } - if (conditionValue == null || !conditionValue.equals(giftId.longValue())) { - return false; - } - String startTimeStr = DateTimeUtil.convertDate(startTime, DateTimeUtil.ACTIVITY_DATE_HOUR_PATTERN); - String endTimeStr = DateTimeUtil.convertDate(endTime, DateTimeUtil.ACTIVITY_DATE_HOUR_PATTERN); - String sendKey = RedisKey.act_user_task_score_for_send.getKey(activityCode, componentCode, startTimeStr, endTimeStr); - if (sendUid != null) { - jedisService.hincrBy(sendKey, sendUid.toString(), giftValue); - jedisService.expire(sendKey, HALF_MONTH); - } - return super.eq(actTaskCondition, context); - } - - @Override - public void doHandle(ActTaskContext context) { - ActTask actTask = context.getActTask(); - Long sendUid = context.getSendUid(); - Date startTime = context.getTaskStartTime(); - Date endTime = context.getTaskEndTime(); - Integer giftId = context.getGiftId(); - String activityCode = actTask.getActivityCode(); - String componentCode = actTask.getComponentCode(); - String parentCode = actTask.getParentCode(); - List actTaskConditions = actTaskConditionService.list(Wrappers.lambdaQuery() - .eq(ActTaskCondition::getActivityCode, activityCode) - .eq(ActTaskCondition::getComponentCode, componentCode) - .eq(ActTaskCondition::getTaskCode, parentCode) - .eq(ActTaskCondition::getConditionKind, ActConditionKindEnum.GE.name())); - if (CollectionUtil.isEmpty(actTaskConditions)) { - return; - } - ActTaskCondition actTaskCondition = actTaskConditions.get(0); - String conditionCode = actTaskCondition.getConditionCode(); - Long conditionValue = actTaskCondition.getConditionValue(); - if (giftId == null) { - return; - } - List childrenConditions = actTaskConditionService.list(Wrappers.lambdaQuery() - .eq(ActTaskCondition::getActivityCode, activityCode) - .eq(ActTaskCondition::getComponentCode, componentCode) - .eq(ActTaskCondition::getTaskCode, actTask.getTaskCode()) - .eq(ActTaskCondition::getConditionKind, ActConditionKindEnum.EQ.name())); - if (CollectionUtil.isEmpty(childrenConditions)) { - return; - } - ActTaskCondition childrenCondition = childrenConditions.get(0); - if (childrenCondition.getConditionValue() == null || !childrenCondition.getConditionValue().equals(giftId.longValue())) { - return; - } - String startTimeStr = DateTimeUtil.convertDate(startTime, DateTimeUtil.ACTIVITY_DATE_HOUR_PATTERN); - String endTimeStr = DateTimeUtil.convertDate(endTime, DateTimeUtil.ACTIVITY_DATE_HOUR_PATTERN); - String receiveKey = RedisKey.act_user_task_score_for_receive.getKey(activityCode, componentCode, startTimeStr, endTimeStr); - String receiveScoreStr = jedisService.hget(receiveKey, String.valueOf(sendUid)); - String sendKey = RedisKey.act_user_task_score_for_send.getKey(activityCode, componentCode, startTimeStr, endTimeStr); - String sendScoreStr = jedisService.hget(sendKey, String.valueOf(sendUid)); - if (StrUtil.isEmpty(receiveScoreStr) && StrUtil.isEmpty(sendScoreStr)) { - return; - } - long receiveScore = 0; - if (StrUtil.isNotEmpty(receiveScoreStr)) { - receiveScore = Long.parseLong(receiveScoreStr); - } - long sendScore = 0; - if (StrUtil.isNotEmpty(sendScoreStr)) { - sendScore = Long.parseLong(sendScoreStr); - } - long activityValue = receiveScore + sendScore; - ActUserTask actUserTask = new ActUserTask(); - actUserTask.setUid(sendUid); - actUserTask.setActivityCode(activityCode); - actUserTask.setComponentCode(componentCode); - actUserTask.setTaskCode(parentCode); - actUserTask.setConditionCode(conditionCode); - actUserTask.setActivityValue(activityValue); - actUserTask.setExchangeValue(0L); - actUserTask.setTaskStatus(ActTaskStatusEnum.PROCESS.ordinal()); - actUserTask.setStartTime(startTime); - actUserTask.setEndTime(endTime); - List actUserTasks = actUserTaskService.list(Wrappers.lambdaQuery() - .eq(ActUserTask::getActivityCode, activityCode) - .eq(ActUserTask::getComponentCode, componentCode) - .eq(ActUserTask::getTaskCode, parentCode) - .eq(ActUserTask::getConditionCode, conditionCode) - .eq(ActUserTask::getUid, sendUid) - .eq(ActUserTask::getStartTime, startTime) - .eq(ActUserTask::getEndTime, endTime) - .between(ActUserTask::getCreateTime, startTime, endTime)); - if (CollectionUtil.isNotEmpty(actUserTasks)) { - ActUserTask task = actUserTasks.get(0); - Integer taskStatus = task.getTaskStatus(); - if (ActTaskStatusEnum.COMPLETE.ordinal() == taskStatus || ActTaskStatusEnum.GRANT.ordinal() == taskStatus) { - log.info("taskCode : {} is complete", parentCode); - return; - } - actUserTask.setId(task.getId()); - actUserTask.setExchangeValue(task.getExchangeValue()); - } - Long currExchangeValue = actUserTask.getExchangeValue(); - long exchangeValue = (activityValue / conditionValue) - currExchangeValue; - if (exchangeValue >= 1) { - jedisService.hincrBy(RedisKey.act_user_task_extra_data.getKey(), String.valueOf(sendUid), exchangeValue); - jedisService.expire(RedisKey.act_user_task_extra_data.getKey(), HALF_MONTH); - Date now = new Date(); - Date beginTimeOfDay = DateTimeUtil.getBeginTimeOfDay(now); - Date endTimeOfDay = DateTimeUtil.getEndTimeOfDay(now); - jedisService.hincrBy(RedisKey.act_user_task_extra_data.getKey(parentCode, DateTimeUtil.convertDate(beginTimeOfDay, DateTimeUtil.DEFAULT_DATE_PATTERN), DateTimeUtil.convertDate(endTimeOfDay, DateTimeUtil.DEFAULT_DATE_PATTERN)), String.valueOf(sendUid), exchangeValue); - jedisService.expire(RedisKey.act_user_task_extra_data.getKey(parentCode, DateTimeUtil.convertDate(beginTimeOfDay, DateTimeUtil.DEFAULT_DATE_PATTERN), DateTimeUtil.convertDate(endTimeOfDay, DateTimeUtil.DEFAULT_DATE_PATTERN)), HALF_MONTH); - currExchangeValue += exchangeValue; - } - actUserTask.setExchangeValue(currExchangeValue); - actUserTaskService.saveOrUpdate(actUserTask); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/children/listener/KeepTimeTaskListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/children/listener/KeepTimeTaskListener.java deleted file mode 100644 index 011b89032..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/children/listener/KeepTimeTaskListener.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.accompany.business.children.listener; - -import com.accompany.business.children.service.ChildrenDayTaskService; -import com.accompany.business.event.room.UserOutRoomEvent; -import com.accompany.business.message.room.UserOutRoomMessage; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.stereotype.Component; - -/** - * @author: liaozetao - * @date: 2024/5/21 18:41 - * @description: - */ -@Slf4j -//@Component -public class KeepTimeTaskListener implements ApplicationListener { - - - @Autowired - private ChildrenDayTaskService childrenDayTaskService; - - @Override - public void onApplicationEvent(UserOutRoomEvent event) { - Object source = event.getSource(); - if (source == null) { - return; - } - UserOutRoomMessage message = (UserOutRoomMessage) event.getSource(); - Long uid = message.getUid(); - int minute = (int) (message.getRemainMillisecond() / (1000 * 60)); - if (minute <= 0) { - return; - } - childrenDayTaskService.keepTimeTask(uid, minute); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/children/listener/LoginTaskListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/children/listener/LoginTaskListener.java deleted file mode 100644 index 36d1eafd2..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/children/listener/LoginTaskListener.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.accompany.business.children.listener; - -import com.accompany.business.activity.event.LoginActivityEvent; -import com.accompany.business.children.service.ChildrenDayTaskService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.stereotype.Component; - -/** - * @author: liaozetao - * @date: 2024/5/21 18:21 - * @description: - */ -@Slf4j -//@Component -public class LoginTaskListener implements ApplicationListener { - - @Autowired - private ChildrenDayTaskService childrenDayTaskService; - - @Override - public void onApplicationEvent(LoginActivityEvent event) { - Object source = event.getSource(); - if (source == null) { - return; - } - Long uid = (Long) source; - childrenDayTaskService.loginTask(uid); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/children/listener/MiniGameForBaiShunTaskListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/children/listener/MiniGameForBaiShunTaskListener.java deleted file mode 100644 index 38875b496..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/children/listener/MiniGameForBaiShunTaskListener.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.accompany.business.children.listener; - -import com.accompany.business.children.service.ChildrenDayTaskService; -import com.accompany.business.dto.miniGame.MiniGameForBaiShunDto; -import com.accompany.business.event.miniGame.MiniGameForBaiShunEvent; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; - -/** - * @author: liaozetao - * @date: 2024/5/22 17:32 - * @description: - */ -@Slf4j -//@Component -public class MiniGameForBaiShunTaskListener implements ApplicationListener { - - @Autowired - private ChildrenDayTaskService childrenDayTaskService; - - @Async - @Override - public void onApplicationEvent(MiniGameForBaiShunEvent event) { - Object source = event.getSource(); - if (source == null) { - return; - } - MiniGameForBaiShunDto dto = (MiniGameForBaiShunDto) source; - childrenDayTaskService.joinGreedyFor1000Task(dto.getUid(), dto.getDiamondNum()); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/children/listener/UserFollowTaskListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/children/listener/UserFollowTaskListener.java deleted file mode 100644 index 0c3a40669..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/children/listener/UserFollowTaskListener.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.accompany.business.children.listener; - -import com.accompany.business.children.service.ChildrenDayTaskService; -import com.accompany.business.dto.fans.UserFollowDto; -import com.accompany.business.event.fans.UserFollowEvent; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.stereotype.Component; - -/** - * @author: liaozetao - * @date: 2024/5/21 18:01 - * @description: - */ -@Slf4j -//@Component -public class UserFollowTaskListener implements ApplicationListener { - - @Autowired - private ChildrenDayTaskService childrenDayTaskService; - - @Override - public void onApplicationEvent(UserFollowEvent event) { - Object source = event.getSource(); - if (source == null) { - return; - } - UserFollowDto userFollowDto = (UserFollowDto) source; - Long uid = userFollowDto.getUid(); - Byte type = userFollowDto.getType(); - childrenDayTaskService.userFollowTask(uid, type); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/children/listener/UserPromiseStarTaskListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/children/listener/UserPromiseStarTaskListener.java deleted file mode 100644 index b4d32d853..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/children/listener/UserPromiseStarTaskListener.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.accompany.business.children.listener; - -import com.accompany.business.children.service.ChildrenDayTaskService; -import com.accompany.business.dto.promise.UserPromiseDto; -import com.accompany.business.event.promise.UserPromiseEvent; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; - - -public class UserPromiseStarTaskListener implements ApplicationListener { - - @Autowired - private ChildrenDayTaskService childrenDayTaskService; - - @Override - public void onApplicationEvent(UserPromiseEvent event) { - Object source = event.getSource(); - if (source == null) { - return; - } - UserPromiseDto dto = (UserPromiseDto) source; - childrenDayTaskService.joinPromiseStarFor10Task(dto.getUid()); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/children/service/ChildrenDayGardenService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/children/service/ChildrenDayGardenService.java deleted file mode 100644 index a7497b7e4..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/children/service/ChildrenDayGardenService.java +++ /dev/null @@ -1,354 +0,0 @@ -package com.accompany.business.children.service; - -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.StrUtil; -import com.accompany.business.activity.dto.ActRewardContext; -import com.accompany.business.activity.enums.ActStockTypeEnum; -import com.accompany.business.activity.model.ActTask; -import com.accompany.business.activity.model.ActTaskReward; -import com.accompany.business.activity.model.ActTaskRewardStock; -import com.accompany.business.activity.model.ActUserRecord; -import com.accompany.business.activity.service.*; -import com.accompany.business.activity.strategy.ActRewardFactory; -import com.accompany.business.activity.vo.ActivityReward; -import com.accompany.business.children.dto.ChildrenDayConfigDto; -import com.accompany.business.children.vo.ChildrenDrawRewardVo; -import com.accompany.business.model.HallMemberExample; -import com.accompany.business.mybatismapper.HallMemberMapper; -import com.accompany.business.service.rank.IRank; -import com.accompany.business.service.rank.RankServiceFactory; -import com.accompany.business.service.room.RoomService; -import com.accompany.business.vo.MicUserVo; -import com.accompany.business.vo.home.PlayRoomVo; -import com.accompany.common.constant.Constant; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.common.utils.GsonUtil; -import com.accompany.common.utils.StringUtils; -import com.accompany.core.base.UidContextHolder; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.model.Room; -import com.accompany.core.model.Users; -import com.accompany.core.mybatismapper.AccountLoginRecordMapperExpand; -import com.accompany.core.service.SysConfService; -import com.accompany.core.service.common.JedisService; -import com.accompany.core.service.user.UsersBaseService; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.*; -import java.util.stream.Collectors; - -/** - * @author: liaozetao - * @date: 2024/5/23 14:18 - * @description: - */ -@Slf4j -@Service -public class ChildrenDayGardenService { - - @Autowired - private AccountLoginRecordMapperExpand accountLoginRecordMapperExpand; - - @Autowired - private HallMemberMapper hallMemberMapper; - - @Autowired - private RoomService roomService; - - @Autowired - private UsersBaseService usersBaseService; - - @Autowired - private ActTaskService actTaskService; - - @Autowired - private ActTaskConditionService actTaskConditionService; - - @Autowired - private ActTaskRewardService actTaskRewardService; - - @Autowired - private ActTaskRewardStockService actTaskRewardStockService; - - @Autowired - private ActUserRecordService actUserRecordService; - - @Autowired - private JedisService jedisService; - - @Autowired - private SysConfService sysConfService; - - private static final int NORMAL_BIT = 0b11111111; - - private static final int HIGH_BIT = 0b1111111100000000; - - public void init() { - String ACTIVITY_CODE = "ACT_2024_CHILDREN_DAY"; - String COMPONENT_CODE = "TONG_QU_LE_YUAN"; - String TASK_CODE = "TONG_QU_LE_YUAN_FOR_DRAW"; - List actTasks = actTaskService.list(Wrappers.lambdaQuery() - .eq(ActTask::getActivityCode, ACTIVITY_CODE) - .eq(ActTask::getComponentCode, COMPONENT_CODE) - .eq(ActTask::getTaskCode, TASK_CODE)); - if (CollectionUtil.isEmpty(actTasks)) { - return; - } - ActTask actTask = actTasks.get(0); - Integer taskValue = actTask.getTaskValue(); - Date now = new Date(); - Date beginTimeOfDay = DateTimeUtil.getBeginTimeOfDay(now); - Date endTimeOfDay = DateTimeUtil.getEndTimeOfDay(now); - String startTime = DateTimeUtil.convertDate(beginTimeOfDay, DateTimeUtil.DEFAULT_DATE_PATTERN); - String endTime = DateTimeUtil.convertDate(endTimeOfDay, DateTimeUtil.DEFAULT_DATE_PATTERN); - Long size = jedisService.llen(RedisKey.act_task_reward_pool.getKey(startTime, endTime)); - if (size > 0) { - return; - } - if (jedisService.exits(RedisKey.act_task_reward_pool.getKey(startTime, endTime))) { - return; - } - String lockKey = RedisKey.act_task_reward_pool_lock.getKey(); - String lockVal = jedisService.lock(lockKey, 10 * 60); - if (StringUtils.isEmpty(lockVal)) { - log.info("活动奖池初始化..."); - return; - } - int normalValue = (taskValue & NORMAL_BIT); - int highValue = (taskValue & HIGH_BIT) >> 8; - List actTaskRewardStocks = actTaskRewardStockService.list(Wrappers.lambdaQuery() - .eq(ActTaskRewardStock::getActivityCode, ACTIVITY_CODE) - .eq(ActTaskRewardStock::getComponentCode, COMPONENT_CODE) - .eq(ActTaskRewardStock::getTaskCode, TASK_CODE)); - if (CollectionUtil.isEmpty(actTaskRewardStocks)) { - return; - } - List actTaskRewards = actTaskRewardService.list(Wrappers.lambdaQuery() - .eq(ActTaskReward::getActivityCode, ACTIVITY_CODE) - .eq(ActTaskReward::getComponentCode, COMPONENT_CODE) - .eq(ActTaskReward::getTaskCode, TASK_CODE)); - if (CollectionUtil.isEmpty(actTaskRewards)) { - return; - } - try { - Map> stockTypeMap = actTaskRewardStocks.stream().collect(Collectors.groupingBy(ActTaskRewardStock::getStockType)); - List normals = stockTypeMap.get(ActStockTypeEnum.NORMAL.ordinal()); - List highs = stockTypeMap.get(ActStockTypeEnum.HIGH.ordinal()); - List rewardIds = new ArrayList<>(); - for (ActTaskRewardStock stock : normals) { - String conditionCode = stock.getConditionCode(); - Integer stockValue = stock.getStockValue(); - Integer dayLimit = stock.getDayLimit(); - Optional any = actTaskRewards.stream().filter(v -> conditionCode.equals(v.getConditionCode())).findAny(); - if (any.isEmpty()) { - continue; - } - ActTaskReward actTaskReward = any.get(); - Long rewardId = actTaskReward.getRewardId(); - String rewardType = actTaskReward.getRewardType(); - long drawCount = actUserRecordService.count(Wrappers.lambdaQuery() - .eq(ActUserRecord::getActivityCode, ACTIVITY_CODE) - .eq(ActUserRecord::getComponentCode, COMPONENT_CODE) - .eq(ActUserRecord::getTaskCode, TASK_CODE) - .eq(ActUserRecord::getRewardId, rewardId) - .eq(ActUserRecord::getRewardType, rewardType) - .between(ActUserRecord::getCreateTime, beginTimeOfDay, endTimeOfDay)); - //达到日限跳过 - if (dayLimit != null && dayLimit != 0 && drawCount >= dayLimit) { - continue; - } - for (int i = 0; i < stockValue; i++) { - rewardIds.add(rewardId); - } - } - String normalCountStr = jedisService.hget(RedisKey.act_task_reward_line_count.getKey(startTime, endTime), String.valueOf(ActStockTypeEnum.NORMAL.ordinal())); - int normalCount = 0; - if (StrUtil.isNotEmpty(normalCountStr)) { - normalCount = Integer.parseInt(normalCountStr); - } - if (normalCount != 0 && (normalCount % normalValue) == 0) { - String highCountStr = jedisService.hget(RedisKey.act_task_reward_line_count.getKey(startTime, endTime), String.valueOf(ActStockTypeEnum.HIGH.ordinal())); - int highCount = 0; - if (StrUtil.isNotEmpty(highCountStr)) { - highCount = Integer.parseInt(highCountStr); - } - if (highCount % highValue == 0) { - for (ActTaskRewardStock stock : highs) { - String conditionCode = stock.getConditionCode(); - Integer stockValue = stock.getStockValue(); - Integer dayLimit = stock.getDayLimit(); - Optional any = actTaskRewards.stream().filter(v -> conditionCode.equals(v.getConditionCode())).findAny(); - if (any.isEmpty()) { - continue; - } - ActTaskReward actTaskReward = any.get(); - Long rewardId = actTaskReward.getRewardId(); - String rewardType = actTaskReward.getRewardType(); - long drawCount = actUserRecordService.count(Wrappers.lambdaQuery() - .eq(ActUserRecord::getActivityCode, ACTIVITY_CODE) - .eq(ActUserRecord::getComponentCode, COMPONENT_CODE) - .eq(ActUserRecord::getTaskCode, TASK_CODE) - .eq(ActUserRecord::getRewardId, rewardId) - .eq(ActUserRecord::getRewardType, rewardType) - .between(ActUserRecord::getCreateTime, beginTimeOfDay, endTimeOfDay)); - //达到日限跳过 - if (dayLimit != null && dayLimit != 0 && drawCount >= dayLimit) { - continue; - } - for (int i = 0; i < stockValue; i++) { - rewardIds.add(rewardId); - } - } - //高级组增加次数 - jedisService.hincrBy(RedisKey.act_task_reward_line_count.getKey(startTime, endTime), String.valueOf(ActStockTypeEnum.HIGH.ordinal()), 1L); - } - } - Collections.shuffle(rewardIds); - size = jedisService.llen(RedisKey.act_task_reward_pool.getKey(startTime, endTime)); - if (size > rewardIds.size()) { - return; - } - jedisService.rpushList(RedisKey.act_task_reward_pool.getKey(startTime, endTime), rewardIds); - jedisService.expire(RedisKey.act_task_reward_pool.getKey(startTime, endTime), 15 * 24 * 60 * 60); - //普通组增加次数 - jedisService.hincrBy(RedisKey.act_task_reward_line_count.getKey(startTime, endTime), String.valueOf(ActStockTypeEnum.NORMAL.ordinal()), 1L); - jedisService.expire(RedisKey.act_task_reward_line_count.getKey(startTime, endTime), 15 * 24 * 60 * 60); - } catch (Exception e) { - log.error(e.getMessage(), e); - } finally { - jedisService.unlock(lockKey, lockVal); - } - } - - @Transactional(rollbackFor = Exception.class) - public ChildrenDrawRewardVo draw() { - String ACTIVITY_CODE = "ACT_2024_CHILDREN_DAY"; - String COMPONENT_CODE = "TONG_QU_LE_YUAN"; - String TASK_CODE = "TONG_QU_LE_YUAN_FOR_DRAW"; - ChildrenDayConfigDto config = sysConfService.getJsonValueById(Constant.SysConfId.CHILDREN_DAY_CONFIG, ChildrenDayConfigDto.class); - if (config == null) { - return null; - } - Long uid = UidContextHolder.get(); - //当前用户 - Users currentUser = usersBaseService.getUsersByUid(uid); - if (currentUser == null) { - return null; - } - String scoreStr = jedisService.hget(RedisKey.act_user_task_extra_data.getKey(), String.valueOf(uid)); - if (StrUtil.isEmpty(scoreStr) || Long.parseLong(scoreStr) <= 0) { - throw new ServiceException("放大鏡數量不足～～～"); - } - init(); - Date now = new Date(); - Date beginTimeOfDay = DateTimeUtil.getBeginTimeOfDay(now); - Date endTimeOfDay = DateTimeUtil.getEndTimeOfDay(now); - String startTime = DateTimeUtil.convertDate(beginTimeOfDay, DateTimeUtil.DEFAULT_DATE_PATTERN); - String endTime = DateTimeUtil.convertDate(endTimeOfDay, DateTimeUtil.DEFAULT_DATE_PATTERN); - String rewardIdStr = jedisService.lpop(RedisKey.act_task_reward_pool.getKey(startTime, endTime)); - if (StrUtil.isEmpty(rewardIdStr)) { - return null; - } - Long rewardId = Long.valueOf(rewardIdStr); - //扣减 - jedisService.hincrBy(RedisKey.act_user_task_extra_data.getKey(), String.valueOf(uid), -1L); - ChildrenDrawRewardVo reward = new ChildrenDrawRewardVo(); - reward.setAvatar(currentUser.getAvatar()); - //发放 - List actTaskRewards = actTaskRewardService.list(Wrappers.lambdaQuery() - .eq(ActTaskReward::getActivityCode, ACTIVITY_CODE) - .eq(ActTaskReward::getComponentCode, COMPONENT_CODE) - .eq(ActTaskReward::getTaskCode, TASK_CODE) - .eq(ActTaskReward::getRewardId, rewardId)); - if (CollectionUtil.isNotEmpty(actTaskRewards)) { - ActTaskReward actTaskReward = actTaskRewards.get(0); - String rewardType = actTaskReward.getRewardType(); - ActRewardContext context = new ActRewardContext(); - context.setUid(uid); - context.setReward(actTaskReward); - ActRewardFactory.getReward(rewardType).grant(context); - ActivityReward activityReward = ActRewardFactory.getReward(rewardType).getReward(context); - if (activityReward != null) { - reward.setRewardIcon(activityReward.getRewardIcon()); - reward.setRewardName(activityReward.getRewardName()); - } - } - //判断是否中奖 - reward.setIsWin(config.getWinRewardIdList().contains(rewardId)); - Boolean isWin = reward.getIsWin(); - if (isWin) { - Long anchorUid = randomAnchorUid(); - if (anchorUid != null) { - Users anchorUser = usersBaseService.getUsersByUid(anchorUid); - if (anchorUser != null) { - reward.setAnchorRoomUid(anchorUid); - reward.setAnchorErBanNo(anchorUser.getErbanNo()); - reward.setAnchorNick(anchorUser.getNick()); - reward.setAnchorAvatar(anchorUser.getAvatar()); - String playRoomStr = jedisService.hget(RedisKey.room_mic_up.getKey(), String.valueOf(anchorUid)); - if (StrUtil.isNotEmpty(playRoomStr)) { - PlayRoomVo playRoomVo = GsonUtil.getDefGson().fromJson(playRoomStr, PlayRoomVo.class); - List micUsers = playRoomVo.getMicUsers(); - reward.setIsOnline(CollectionUtil.isNotEmpty(micUsers) && micUsers.stream().anyMatch(v -> v.getUid().equals(anchorUid))); - } - } - } - Map rankMap = RankServiceFactory.getServiceByType(RedisKey.act_activity_rank.name()); - if (CollectionUtil.isNotEmpty(rankMap)) { - for (IRank iRank : rankMap.values()) { - iRank.updateRank(uid, 1D, new Date(), currentUser.getPartitionId()); - } - } - } - return reward; - } - - public Long randomAnchorUid() { - String cacheKey = RedisKey.act_activity_cache.getKey("ACT_2024_CHILDREN_DAY", "random_anchor_uid"); - String uidStr = jedisService.get(cacheKey); - if (StrUtil.isNotEmpty(uidStr)) { - return Long.valueOf(uidStr); - } - - Long uid = UidContextHolder.get(); - //直播中的主播 - Map onlineUserMap = jedisService.hgetAll(RedisKey.user_online_status.getKey()); - Optional onlineUidOptional = onlineUserMap.keySet().stream().filter(v -> { - if (Long.valueOf(v).equals(uid)) { - return false; - } - Room room = roomService.getRoomByUid(Long.valueOf(v)); - if (room == null) { - return false; - } - if (Objects.equals(room.getIsPermitRoom(), Constant.PermitType.PERMIT_ROOM)) { - return false; - } - HallMemberExample example = new HallMemberExample(); - example.createCriteria().andStatusEqualTo(Constant.StatusV2.valid).andUidEqualTo(Long.valueOf(v)); - return hallMemberMapper.countByExample(example) > 0; - }).map(Long::valueOf).findAny(); - if (onlineUidOptional.isPresent()){ - Long anchorUid = onlineUidOptional.get(); - jedisService.set(cacheKey, anchorUid.toString(), 5); - return anchorUid; - } - List recent3DayUidList = accountLoginRecordMapperExpand.getAnchorUidByRecent3Day(); - if (CollectionUtil.isNotEmpty(recent3DayUidList)) { - Collections.shuffle(recent3DayUidList.stream().filter(v -> v.equals(uid)).collect(Collectors.toList())); - Long anchorUid = recent3DayUidList.get(0); - jedisService.set(cacheKey, anchorUid.toString(), 5); - return anchorUid; - } - - Long anchorUid = 0L; - jedisService.set(cacheKey, anchorUid.toString(), 5); - return anchorUid; - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/children/service/ChildrenDayTaskService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/children/service/ChildrenDayTaskService.java deleted file mode 100644 index c99114370..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/children/service/ChildrenDayTaskService.java +++ /dev/null @@ -1,279 +0,0 @@ -package com.accompany.business.children.service; - -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.StrUtil; -import com.accompany.business.activity.enums.ActTaskStatusEnum; -import com.accompany.business.activity.enums.ActTimeTypeEnum; -import com.accompany.business.activity.model.ActActivity; -import com.accompany.business.activity.model.ActTask; -import com.accompany.business.activity.model.ActTaskCondition; -import com.accompany.business.activity.model.ActUserTask; -import com.accompany.business.activity.service.ActActivityService; -import com.accompany.business.activity.service.ActTaskConditionService; -import com.accompany.business.activity.service.ActTaskService; -import com.accompany.business.activity.service.ActUserTaskService; -import com.accompany.business.children.vo.ChildrenDayTaskVo; -import com.accompany.business.service.follow.FansService; -import com.accompany.common.constant.Constant; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.base.UidContextHolder; -import com.accompany.core.service.common.JedisService; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.Date; -import java.util.List; -import java.util.Optional; -import java.util.stream.Collectors; - -/** - * @author: liaozetao - * @date: 2024/5/21 16:04 - * @description: - */ -@Slf4j -@Service -public class ChildrenDayTaskService { - - public static final String ACTIVITY_CODE = "ACT_2024_CHILDREN_DAY"; - - @Autowired - private ActActivityService actActivityService; - - @Autowired - private ActTaskService actTaskService; - - @Autowired - private ActTaskConditionService actTaskConditionService; - - @Autowired - private ActUserTaskService actUserTaskService; - - @Autowired - private JedisService jedisService; - - public void loginTask(Long uid) { - String ACTIVITY_CODE = "ACT_2024_CHILDREN_DAY"; - String COMPONENT_CODE = "MEI_RI_REN_WU"; - String TASK_CODE = "LOGIN_ACTIVITY"; - Date now = new Date(); - List actActivities = actActivityService.list(Wrappers.lambdaQuery() - .eq(ActActivity::getActivityCode, ACTIVITY_CODE) - .eq(ActActivity::getActivityStatus, Constant.Yes1No0.YES) - .le(ActActivity::getStartTime, now) - .ge(ActActivity::getEndTime, now)); - if (CollectionUtil.isEmpty(actActivities)) { - return; - } - actUserTaskService.increment(ACTIVITY_CODE, COMPONENT_CODE, TASK_CODE, uid); - } - - public void userFollowTask(Long uid, Byte type) { - String ACTIVITY_CODE = "ACT_2024_CHILDREN_DAY"; - String COMPONENT_CODE = "MEI_RI_REN_WU"; - String TASK_CODE = "FOLLOW_NEW_FRIEND"; - Date now = new Date(); - long count = actActivityService.count(Wrappers.lambdaQuery() - .eq(ActActivity::getActivityStatus, Constant.Yes1No0.YES) - .le(ActActivity::getStartTime, now) - .ge(ActActivity::getEndTime, now)); - if (count <= 0L) { - return; - } - if (FansService.LIKE.equals(type)) { - actUserTaskService.increment(ACTIVITY_CODE, COMPONENT_CODE, TASK_CODE, uid, 1, true); - } - } - - public void keepTimeTask(Long uid, Integer minute) { - String COMPONENT_CODE = "MEI_RI_REN_WU"; - String TASK_CODE = "ROOM_PAUSE_10_MINUTES"; - Date now = new Date(); - List actActivities = actActivityService.list(Wrappers.lambdaQuery() - .eq(ActActivity::getActivityStatus, Constant.Yes1No0.YES) - .le(ActActivity::getStartTime, now) - .ge(ActActivity::getEndTime, now)); - if (CollectionUtil.isEmpty(actActivities)) { - return; - } - String redisKey = RedisKey.act_user_task_keep_time.getKey(DateTimeUtil.convertDate(now, DateTimeUtil.DEFAULT_DATE_PATTERN)); - jedisService.hincrBy(redisKey, String.valueOf(uid), (long) minute); - //保留半个月 - int HALF_MONTH = 15 * 24 * 60 * 60; - jedisService.expire(redisKey, HALF_MONTH); - String minuteStr = jedisService.hget(redisKey, String.valueOf(uid)); - if (StrUtil.isEmpty(minuteStr)) { - return; - } - ActActivity actActivity = actActivities.get(0); - List actTasks = actTaskService.list(Wrappers.lambdaQuery() - .eq(ActTask::getActivityCode, ACTIVITY_CODE) - .eq(ActTask::getComponentCode, COMPONENT_CODE) - .eq(ActTask::getTaskCode, TASK_CODE)); - if (CollectionUtil.isEmpty(actTasks)) { - return; - } - ActTask actTask = actTasks.get(0); - Integer timeType = actTask.getTimeType(); - Date startTime = actActivity.getStartTime(); - Date endTime = actActivity.getEndTime(); - if (ActTimeTypeEnum.LOOP.ordinal() == timeType) { - String startTimeFormat = actTask.getStartTimeFormat(); - Integer timeDuration = actTask.getTimeDuration(); - startTime = DateTimeUtil.convertStrToDate(DateTimeUtil.convertDate(now, startTimeFormat)); - if (startTime != null && startTime.after(now)) { - startTime = DateTimeUtil.convertStrToDate(LocalDateTime.now().minusDays(1).format(DateTimeFormatter.ofPattern(startTimeFormat)), DateTimeUtil.DEFAULT_DATETIME_PATTERN); - } - if (startTime != null) { - endTime = new Date(startTime.getTime() + timeDuration * 1000); - } - } - List actTaskConditions = actTaskConditionService.list(Wrappers.lambdaQuery() - .eq(ActTaskCondition::getActivityCode, ACTIVITY_CODE) - .eq(ActTaskCondition::getComponentCode, COMPONENT_CODE) - .eq(ActTaskCondition::getTaskCode, TASK_CODE)); - if (CollectionUtil.isEmpty(actTaskConditions)) { - return; - } - ActTaskCondition actTaskCondition = actTaskConditions.get(0); - Long conditionValue = actTaskCondition.getConditionValue(); - long prevMinutes = 0; - List actUserTasks = actUserTaskService.list(Wrappers.lambdaQuery() - .eq(ActUserTask::getActivityCode, ACTIVITY_CODE) - .eq(ActUserTask::getConditionCode, COMPONENT_CODE) - .eq(ActUserTask::getTaskCode, TASK_CODE) - .eq(ActUserTask::getUid, uid) - .eq(ActUserTask::getTaskStatus, ActTaskStatusEnum.PROCESS.ordinal()) - .between(ActUserTask::getCreateTime, startTime, endTime) - .orderByAsc(ActUserTask::getCreateTime)); - if (CollectionUtil.isNotEmpty(actUserTasks)) { - ActUserTask actUserTask = actUserTasks.get(0); - Long activityValue = actUserTask.getActivityValue(); - prevMinutes = activityValue * conditionValue; - } - long currMinutes = (Long.parseLong(minuteStr) % conditionValue) * conditionValue; - if (currMinutes > prevMinutes) { - long num = currMinutes / conditionValue; - for (int i = 0; i < num; i++) { - actUserTaskService.increment(ACTIVITY_CODE, COMPONENT_CODE, TASK_CODE, uid, 1, true); - } - } - } - - public void joinPromiseStarFor10Task(Long uid) { - String COMPONENT_CODE = "XUN_HUAN_REN_WU"; - String TASK_CODE = "JOIN_PROMISE_STAR_FOR_10"; - Date now = new Date(); - long count = actActivityService.count(Wrappers.lambdaQuery() - .eq(ActActivity::getActivityStatus, Constant.Yes1No0.YES) - .le(ActActivity::getStartTime, now) - .ge(ActActivity::getEndTime, now)); - if (count >= 0L) { - return; - } - actUserTaskService.increment(ACTIVITY_CODE, COMPONENT_CODE, TASK_CODE, uid); - } - - public void joinGreedyFor1000Task(Long uid, Double diamondNum) { - String ACTIVITY_CODE = "ACT_2024_CHILDREN_DAY"; - String COMPONENT_CODE = "XUN_HUAN_REN_WU"; - String TASK_CODE = "JOIN_GREEDY_FOR_1000"; - Date now = new Date(); - long count = actActivityService.count(Wrappers.lambdaQuery() - .eq(ActActivity::getActivityStatus, Constant.Yes1No0.YES) - .le(ActActivity::getStartTime, now) - .ge(ActActivity::getEndTime, now)); - if (count >= 0L) { - return; - } - actUserTaskService.increment(ACTIVITY_CODE, COMPONENT_CODE, TASK_CODE, uid, diamondNum.intValue(), true, true); - } - - public ChildrenDayTaskVo task() { - Long uid = UidContextHolder.get(); - List actTasks = actTaskService.list(Wrappers.lambdaQuery() - .eq(ActTask::getActivityCode, ACTIVITY_CODE) - .isNull(ActTask::getParentCode)); - ChildrenDayTaskVo dayTask = new ChildrenDayTaskVo(); - if (CollectionUtil.isEmpty(actTasks)) { - return dayTask; - } - List taskCodes = actTasks.stream().map(ActTask::getTaskCode).collect(Collectors.toList()); - Date now = new Date(); - Date beginTimeOfDay = DateTimeUtil.getBeginTimeOfDay(now); - Date endTimeOfDay = DateTimeUtil.getEndTimeOfDay(now); - List actUserTasks = actUserTaskService.list(Wrappers.lambdaQuery() - .eq(ActUserTask::getActivityCode, ACTIVITY_CODE) - .eq(ActUserTask::getUid, uid) - .in(ActUserTask::getTaskCode, taskCodes) - .between(ActUserTask::getCreateTime, beginTimeOfDay, endTimeOfDay)); - //登录活动页 - Optional loginTaskAny = actUserTasks.stream().filter(v -> "LOGIN_ACTIVITY".equals(v.getTaskCode())).findAny(); - if (loginTaskAny.isPresent()) { - ActUserTask actUserTask = loginTaskAny.get(); - dayTask.setIsLoginTask(actUserTask.getTaskStatus() == ActTaskStatusEnum.COMPLETE.ordinal()); - } - //关注一位新的好友 - Optional userFollowTaskAny = actUserTasks.stream().filter(v -> "FOLLOW_NEW_FRIEND".equals(v.getTaskCode())).findAny(); - if (userFollowTaskAny.isPresent()) { - ActUserTask actUserTask = userFollowTaskAny.get(); - dayTask.setUserFollowCount(actUserTask.getActivityValue()); - dayTask.setIsUserFollowTask(actUserTask.getTaskStatus() == ActTaskStatusEnum.COMPLETE.ordinal()); - } - //房间停留10min - Optional keepTimeTaskAny = actUserTasks.stream().filter(v -> "ROOM_PAUSE_10_MINUTES".equals(v.getTaskCode())).findAny(); - if (keepTimeTaskAny.isPresent()) { - ActUserTask actUserTask = keepTimeTaskAny.get(); - dayTask.setKeepTimeCount(actUserTask.getActivityValue()); - dayTask.setIsKeepTimeTask(actUserTask.getTaskStatus() == ActTaskStatusEnum.COMPLETE.ordinal()); - } - //送出or收到1000金幣的61限定禮物 - Optional limitGift61TaskAny = actUserTasks.stream().filter(v -> "LIMIT_GIFT_61".equals(v.getTaskCode())).findAny(); - if (limitGift61TaskAny.isPresent()) { - Optional any = actTasks.stream().filter(v -> "LIMIT_GIFT_61".equals(v.getTaskCode())).findAny(); - if (any.isPresent()) { - ActTask actTask = any.get(); - String taskCode = actTask.getTaskCode(); - ActUserTask actUserTask = limitGift61TaskAny.get(); - String scoreStr = jedisService.hget(RedisKey.act_user_task_extra_data.getKey(taskCode, DateTimeUtil.convertDate(beginTimeOfDay, DateTimeUtil.DEFAULT_DATE_PATTERN), DateTimeUtil.convertDate(endTimeOfDay, DateTimeUtil.DEFAULT_DATE_PATTERN)), String.valueOf(uid)); - long score = 0; - if (StrUtil.isNotEmpty(scoreStr)) { - score = Long.parseLong(scoreStr); - } - dayTask.setLimitGiftCount(score); - dayTask.setIsLimitGiftFor61Task(actUserTask.getTaskStatus() == ActTaskStatusEnum.COMPLETE.ordinal()); - } - } - //參與許願之星每參與10次 - Optional joinPromiseStarFor10Any = actUserTasks.stream().filter(v -> "JOIN_PROMISE_STAR_FOR_10".equals(v.getTaskCode())).findAny(); - if (joinPromiseStarFor10Any.isPresent()) { - ActUserTask actUserTask = joinPromiseStarFor10Any.get(); - dayTask.setJoinPromiseStarCount(actUserTask.getActivityValue()); - dayTask.setIsJoinPromiseStarFor10Task(actUserTask.getTaskStatus() == ActTaskStatusEnum.COMPLETE.ordinal()); - } - //參與Greedy累計獲得1000金幣 - Optional joinGreedyFor1000Any = actUserTasks.stream().filter(v -> "JOIN_GREEDY_FOR_1000".equals(v.getTaskCode())).findAny(); - if (joinGreedyFor1000Any.isPresent()) { - Optional any = actTasks.stream().filter(v -> "JOIN_GREEDY_FOR_1000".equals(v.getTaskCode())).findAny(); - if (any.isPresent()) { - ActTask actTask = any.get(); - String taskCode = actTask.getTaskCode(); - ActUserTask actUserTask = joinGreedyFor1000Any.get(); - String scoreStr = jedisService.hget(RedisKey.act_user_task_extra_data.getKey(taskCode, DateTimeUtil.convertDate(beginTimeOfDay, DateTimeUtil.DEFAULT_DATE_PATTERN), DateTimeUtil.convertDate(endTimeOfDay, DateTimeUtil.DEFAULT_DATE_PATTERN)), String.valueOf(uid)); - long score = 0; - if (StrUtil.isNotEmpty(scoreStr)) { - score = Long.parseLong(scoreStr); - } - dayTask.setJoinGreedyFor1000Count(score); - dayTask.setIsJoinGreedyFor1000Task(actUserTask.getTaskStatus() == ActTaskStatusEnum.COMPLETE.ordinal()); - } - - } - return dayTask; - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/listener/ChristmasCpRankGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/listener/ChristmasCpRankGiftListener.java deleted file mode 100644 index 2c30554bb..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/listener/ChristmasCpRankGiftListener.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.accompany.business.christmas.listener; - -import com.accompany.business.base.listener.CpRankGiftListener; -import com.accompany.business.christmas.service.ChristmasCpRankService; -import com.accompany.business.event.GiftMessageEvent; -import lombok.extern.slf4j.Slf4j; -import org.springframework.context.ApplicationListener; -import org.springframework.scheduling.annotation.Async; - -@Slf4j -//@Component -public class ChristmasCpRankGiftListener extends CpRankGiftListener implements ApplicationListener{ - - @Async - @Override - public void onApplicationEvent(GiftMessageEvent giftMessageEvent) { - handleEvent(giftMessageEvent); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/listener/ChristmasCpRewardGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/listener/ChristmasCpRewardGiftListener.java deleted file mode 100644 index 1a620dd4d..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/listener/ChristmasCpRewardGiftListener.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.accompany.business.christmas.listener; - -import com.accompany.business.christmas.ChristmasCpDao; -import com.accompany.business.christmas.dto.ChristmasCpRankActConfigDto; -import com.accompany.business.christmas.service.ChristmasCpRankService; -import com.accompany.business.event.GiftMessageEvent; -import com.accompany.business.message.GiftMessage; -import com.accompany.common.utils.DateTimeUtil; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.scheduling.annotation.Async; -import org.springframework.util.CollectionUtils; - -import java.time.LocalDateTime; -import java.util.Date; - -@Slf4j -//@Component -public class ChristmasCpRewardGiftListener implements ApplicationListener{ - - @Autowired - private ChristmasCpRankService service; - @Autowired - private ChristmasCpDao cpDao; - - @Async - @Override - public void onApplicationEvent(GiftMessageEvent giftMessageEvent) { - GiftMessage giftMessage = (GiftMessage) giftMessageEvent.getSource(); - - Date sendGiftTime = DateTimeUtil.convertMsToDate(giftMessage.getMessTime()); - LocalDateTime sendGiftLocalDateTime = DateTimeUtil.converDateToLocalDateTime(sendGiftTime); - - ChristmasCpRankActConfigDto config = service.getConfig(); - if (!config.inActTimeRange(sendGiftLocalDateTime)){ - return; - } - - Long senderUid = giftMessage.getSendUid(); - Long receiverUid = giftMessage.getRecvUid(); - Integer giftId = giftMessage.getGiftId(); - - if (CollectionUtils.isEmpty(config.getCpRewardGiftIds()) - || !config.getCpRewardGiftIds().contains(giftId)){ - return; - } - - cpDao.saveCpRewardStatus(senderUid, receiverUid); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/listener/ChristmasLetterTaskGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/listener/ChristmasLetterTaskGiftListener.java deleted file mode 100644 index b82ab7280..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/listener/ChristmasLetterTaskGiftListener.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.accompany.business.christmas.listener; - -import com.accompany.business.christmas.dto.ChristmasLetterActConfigDto; -import com.accompany.business.christmas.service.ChristmasLetterService; -import com.accompany.business.common.dto.TaskActConfigDto; -import com.accompany.business.doubleeleven.dto.DoubleElevenTaskConfigDto; -import com.accompany.business.event.GiftMessageEvent; -import com.accompany.business.message.GiftMessage; -import com.accompany.common.utils.DateTimeUtil; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.scheduling.annotation.Async; -import org.springframework.util.CollectionUtils; - -import java.time.LocalDateTime; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -@Slf4j -//@Component -public class ChristmasLetterTaskGiftListener implements ApplicationListener { - - @Autowired - private ChristmasLetterService service; - - @Override - @Async - public void onApplicationEvent(GiftMessageEvent giftMessageEvent) { - GiftMessage giftMessage = (GiftMessage) giftMessageEvent.getSource(); - Date sendGiftTime = DateTimeUtil.convertMsToDate(giftMessage.getMessTime()); - LocalDateTime sendGiftLocalDateTime = DateTimeUtil.converDateToLocalDateTime(sendGiftTime); - - ChristmasLetterActConfigDto config = service.getConfig(); - if (!config.inActTimeRange(sendGiftLocalDateTime)){ - return; - } - - Integer giftId = giftMessage.getGiftId(); - List giftTaskList = config.getLoopTask().values().stream() - .filter(task->task.getGiftIds().contains(giftId)) - .collect(Collectors.toList()); - if (CollectionUtils.isEmpty(giftTaskList)){ - return; - } - - // 送礼人Uid - Long sendUid = giftMessage.getSendUid(); - String date = sendGiftLocalDateTime.format(DoubleElevenTaskConfigDto.DATE_FORMATTER); - Integer giftNum = giftMessage.getGiftNum(); - - for (TaskActConfigDto.LoopTask task: giftTaskList) { - service.processLoopTask(task, sendUid, date, giftNum); - } - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/listener/ChristmasRankGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/listener/ChristmasRankGiftListener.java deleted file mode 100644 index 6042255a1..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/listener/ChristmasRankGiftListener.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.accompany.business.christmas.listener; - -import com.accompany.business.base.listener.RankGiftListener; -import com.accompany.business.christmas.service.ChristmasRankService; -import com.accompany.business.event.GiftMessageEvent; -import lombok.extern.slf4j.Slf4j; -import org.springframework.context.ApplicationListener; -import org.springframework.scheduling.annotation.Async; - -@Slf4j -//@Component -public class ChristmasRankGiftListener extends RankGiftListener implements ApplicationListener{ - - @Async - @Override - public void onApplicationEvent(GiftMessageEvent giftMessageEvent) { - handleEvent(giftMessageEvent); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/service/ChristmasCpRankService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/service/ChristmasCpRankService.java deleted file mode 100644 index 62a3a617c..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/service/ChristmasCpRankService.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.accompany.business.christmas.service; - -import com.accompany.business.base.service.BaseCpRankActService; -import com.accompany.business.christmas.ChristmasCpDao; -import com.accompany.business.christmas.constant.ChristmasConstant; -import com.accompany.business.christmas.dto.ChristmasCpRankActConfigDto; -import com.accompany.business.christmas.dto.ChristmasCpUserProp; -import com.accompany.business.common.constant.CpRankTypeEnum; -import com.accompany.business.common.dto.CpRankActConfigDto; -import com.accompany.business.common.dto.CpRankActCpProp; -import com.accompany.business.common.vo.ActivityCpRankVo; -import com.accompany.business.common.vo.RewardVo; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.service.SysConfService; -import com.alibaba.fastjson.JSON; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; -import org.springframework.util.StringUtils; - -import java.util.Collections; -import java.util.Comparator; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -@Service -@Slf4j -public class ChristmasCpRankService extends BaseCpRankActService { - - @Autowired - private SysConfService sysConfService; - @Autowired - private ChristmasCpDao cpDao; - - @Override - protected String getActName() { - return ChristmasConstant.actName; - } - - @Override - public String addAndGetCpUid(CpRankActConfigDto config, Long fromUid, Long toUid, Integer giftId, Integer giftNum, Long totalGoldNum, Date sendGiftTime) { - if (null == fromUid || null == toUid || fromUid.equals(toUid)){ - throw new ServiceException(BusiStatus.PARAMERROR); - } - String cpUid = cpDao.buildCpUid(fromUid, toUid); - CpRankActCpProp cpProp = cpDao.getCpPropByCpUid(cpUid); - if (null != cpProp){ - return cpUid; - } - if (CollectionUtils.isEmpty(config.getCpGiftIds()) - || !config.getCpGiftIds().contains(giftId)) { - return null; - } - - cpProp = new CpRankActCpProp(); - cpProp.setCpUid(cpUid); - cpProp.setFromUid(fromUid); - cpProp.setToUid(toUid); - cpProp.setScore(0L); - cpProp.setCreateTime(sendGiftTime); - cpDao.saveCpProp(cpProp); - - log.info("[2023圣诞节活动]-cp榜 fromUid {} toUid {} 组成cp {}", fromUid, toUid, cpUid); - - return cpUid; - } - - @Override - public List takeApartCpUid(String cpUid) { - return cpDao.takeApartCpUid(cpUid); - } - - @Override - protected void afterUpdateTotalRank(String cpUid, Double totalScore, CpRankActConfigDto config) { - cpDao.updateCpScore(cpUid, totalScore, config); - } - - public ActivityCpRankVo getRank(Long uid, CpRankTypeEnum rankType, String date) { - List cpUserPropList = cpDao.listCpByUid(uid, 10L); - List cpUidList = !CollectionUtils.isEmpty(cpUserPropList)? - cpUserPropList.stream() - .sorted(Comparator.comparing(ChristmasCpUserProp::getScore).reversed()) - .map(CpRankActCpProp::getCpUid) - .collect(Collectors.toList()): - Collections.emptyList(); - return super.getRank(cpUidList, rankType, date, 30); - } - - @Override - protected void logUpdateRank(String cpUid, Integer giftId, Integer giftNum, Long totalGoldNum, Double score) { - log.info("[2023圣诞节活动]-cp榜 {} 收礼 {} {} 个总价值 {} 钻石，增加值 {}", cpUid, giftId, giftNum, totalGoldNum, score); - } - - @Override - protected void logRankReward(CpRankTypeEnum rankType, String date, String rankKey, Integer rankIndex, Long uid, RewardVo reward) { - log.info("[2023圣诞节活动]-cp榜 {} 发奖励， 第 {} 名 {} 奖励 {}", rankKey, rankIndex, uid, JSON.toJSONString(reward)); - } - - @Override - public CpRankActConfigDto getRankActConfig() { - return getConfig(); - } - - public ChristmasCpRankActConfigDto getConfig(){ - String configStr = sysConfService.getSysConfValueById(ChristmasConstant.SysConfId.ACT_CP_RANK_CONFIG); - if (!StringUtils.hasText(configStr)){ - throw new ServiceException(BusiStatus.ALREADY_NOTEXISTS_CONFIG); - } - return JSON.parseObject(configStr, ChristmasCpRankActConfigDto.class); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/service/ChristmasCpService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/service/ChristmasCpService.java deleted file mode 100644 index a8fa7ea06..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/service/ChristmasCpService.java +++ /dev/null @@ -1,148 +0,0 @@ -package com.accompany.business.christmas.service; - -import com.accompany.business.christmas.ChristmasCpDao; -import com.accompany.business.christmas.constant.ChristmasConstant; -import com.accompany.business.christmas.dto.ChristmasCpRankActConfigDto; -import com.accompany.business.christmas.dto.ChristmasCpUserProp; -import com.accompany.business.christmas.vo.ChristmasCpUserPropVo; -import com.accompany.business.christmas.vo.ChristmasCpVo; -import com.accompany.business.common.dto.CpRankActConfigDto; -import com.accompany.business.common.dto.RewardDto; -import com.accompany.business.common.vo.ActivityStageTaskItemVo; -import com.accompany.business.common.vo.RewardVo; -import com.accompany.business.service.user.UsersService; -import com.accompany.business.util.RewardUtil; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.model.Users; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.time.LocalDateTime; -import java.util.*; -import java.util.stream.Collectors; - -@Service -@Slf4j -public class ChristmasCpService { - - @Autowired - private ChristmasCpRankService cpRankService; - @Autowired - private ChristmasCpDao cpDao; - @Autowired - private RewardUtil rewardUtil; - @Autowired - private UsersService usersService; - - - public ChristmasCpVo getCpVo(Long uid) { - CpRankActConfigDto configDto = cpRankService.getConfig(); - - ChristmasCpVo cpVo = new ChristmasCpVo(); - cpVo.setUid(uid); - - Integer status = cpDao.getCpRewardStatus(uid); - cpVo.setBoxStatus(status); - - List cpList = cpDao.listCpByUid(uid, 10L); - if (CollectionUtils.isEmpty(cpList)){ - cpVo.setCpList(Collections.emptyList()); - return cpVo; - } - - List uidList = new ArrayList<>(); - uidList.add(uid); - - for (ChristmasCpUserProp prop: cpList) { - uidList.add(prop.getFromUid()); - uidList.add(prop.getToUid()); - } - - Map usersMap = usersService.getUsersMapByUids(uidList.stream().distinct().collect(Collectors.toList())); - - List cpVoList = cpList.stream().map(prop->{ - ChristmasCpUserPropVo vo = new ChristmasCpUserPropVo(); - vo.setCpUid(prop.getCpUid()); - vo.setFromUid(uid); - - Users fromU = usersMap.get(vo.getFromUid()); - if (null != fromU){ - vo.setFromErbanNo(fromU.getErbanNo()); - vo.setFromNick(fromU.getNick()); - vo.setFromAvatar(fromU.getAvatar()); - } - - vo.setToUid(uid.equals(prop.getToUid())? prop.getFromUid(): prop.getToUid()); - - Users toU = usersMap.get(vo.getToUid()); - if (null != toU){ - vo.setToErbanNo(toU.getErbanNo()); - vo.setToNick(toU.getNick()); - vo.setToAvatar(toU.getAvatar()); - } - - vo.setScore(prop.getScore()); - - List taskVoList = configDto.cpScoreTasks.stream().map(task->{ - ActivityStageTaskItemVo taskVo = new ActivityStageTaskItemVo(); - taskVo.setTaskId(task.getId()); - taskVo.setScore(task.getScore()); - taskVo.setStatus(prop.getCpTaskStatus().getOrDefault(task.getId(), ChristmasConstant.BtnStatus.NONE)); - return taskVo; - }).sorted(Comparator.comparing(ActivityStageTaskItemVo::getScore)) - .collect(Collectors.toList()); - vo.setCpTaskList(taskVoList); - - return vo; - }).sorted(Comparator.comparing(ChristmasCpUserPropVo::getScore).reversed()).collect(Collectors.toList()); - cpVo.setCpList(cpVoList); - - return cpVo; - } - - public List getCpReward(Long uid) { - LocalDateTime now = LocalDateTime.now(); - ChristmasCpRankActConfigDto configDto = cpRankService.getConfig(); - if (!configDto.inActTimeRange(now)){ - throw new ServiceException(BusiStatus.NOT_IN_ACT_TIME_RANGE); - } - - Integer status = cpDao.getCpRewardStatus(uid); - if (ChristmasConstant.BtnStatus.NONE.equals(status)){ - throw new ServiceException(BusiStatus.ACT_AWARD_NOT_ACCORD); - } else if (ChristmasConstant.BtnStatus.HAD.equals(status)) { - throw new ServiceException(BusiStatus.ACT_AWARD_HAS_GET); - } - - if (!cpDao.saveCpRewardStatus(uid)){ - throw new ServiceException(BusiStatus.ACT_AWARD_HAS_GET); - } - - List rewardList = configDto.getCpRewardList(); - return rewardList.parallelStream() - .map(dto->rewardUtil.sendRewardByType(uid, dto, "[2023圣诞节活动]-圣诞礼盒")) - .collect(Collectors.toList()); - } - - public List getCpTaskReward(Long uid, Long toUid, Integer taskId) { - CpRankActConfigDto configDto = cpRankService.getConfig(); - - Optional taskOptional = configDto.getCpScoreTasks().stream().filter(t->taskId.equals(t.getId())).findAny(); - if (!taskOptional.isPresent()){ - throw new ServiceException(BusiStatus.PARAMETERILLEGAL); - } - - if (!cpDao.saveUserCpPropTaskStatus(uid, toUid, taskId, ChristmasConstant.BtnStatus.HAD)){ - throw new ServiceException(BusiStatus.ACT_AWARD_HAS_GET); - } - - CpRankActConfigDto.CpScoreTask task = taskOptional.get(); - List rewardList = task.getRewardList(); - return rewardList.parallelStream() - .map(dto->rewardUtil.sendRewardByType(uid, dto, "[2023圣诞节活动]-cp任务")) - .collect(Collectors.toList()); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/service/ChristmasCpUsersRankObjectProvider.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/service/ChristmasCpUsersRankObjectProvider.java deleted file mode 100644 index 488c0f793..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/service/ChristmasCpUsersRankObjectProvider.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.accompany.business.christmas.service; - -import com.accompany.business.base.rankobj.CpRankObject; -import com.accompany.business.base.rankobj.CpRankObjectProvider; -import com.accompany.business.christmas.ChristmasCpDao; -import com.accompany.business.common.dto.CpRankActCpProp; -import com.accompany.business.service.user.UsersService; -import com.accompany.core.model.Users; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.*; -import java.util.stream.Collectors; - -@Service -public class ChristmasCpUsersRankObjectProvider implements CpRankObjectProvider { - - @Autowired - private ChristmasCpDao cpDao; - @Autowired - private UsersService usersService; - - @Override - public Map mapRankObjectByUids(List cpUidList) { - Map map = new HashMap<>(); - - Map cpPropMap = cpDao.mapCpPropByCpUidSet(new HashSet<>(cpUidList)); - - List uidList = cpUidList.stream() - .map(cpUid->cpUid.split("_")) - .flatMap(Arrays::stream) - .map(Long::parseLong) - .distinct().collect(Collectors.toList()); - - Map userMap = usersService.getUsersMapByUids(uidList); - - for (String cpUid: cpUidList) { - CpRankObject obj = new CpRankObject(); - obj.setType(CpRankObject.CpRankObjectType.CP_USER); - obj.setCpUid(cpUid); - - String[] uidArray = cpUid.split("_"); - Long leftUid = Long.parseLong(uidArray[0]); - Long rightUid = Long.parseLong(uidArray[1]); - - CpRankActCpProp cpProp = cpPropMap.get(cpUid); - if (null != cpProp){ - leftUid = cpProp.getFromUid(); - rightUid = cpProp.getToUid(); - } - - obj.setLeftUid(leftUid); - - Users leftUser = userMap.get(leftUid); - if (null != leftUser){ - obj.setLeftErbanNo(leftUser.getErbanNo()); - obj.setLeftNick(leftUser.getNick()); - obj.setLeftAvatar(leftUser.getAvatar()); - } - - obj.setRightUid(rightUid); - - Users rightUser = userMap.get(rightUid); - if (null != rightUser){ - obj.setRightErbanNo(rightUser.getErbanNo()); - obj.setRightNick(rightUser.getNick()); - obj.setRightAvatar(rightUser.getAvatar()); - } - - map.put(cpUid, obj); - } - - return map; - } - - @Override - public CpRankObject getRankObjectByUid(String cpUid) { - if (StringUtils.isBlank(cpUid)){ - return null; - } - - List uidList = Arrays.stream(cpUid.split("_")) - .map(Long::parseLong) - .distinct().collect(Collectors.toList()); - - Map userMap = usersService.getUsersMapByUids(uidList); - - CpRankObject obj = new CpRankObject(); - obj.setType(CpRankObject.CpRankObjectType.CP_USER); - obj.setCpUid(cpUid); - - String[] uidArray = cpUid.split("_"); - Long leftUid = Long.parseLong(uidArray[0]); - obj.setLeftUid(leftUid); - - Users leftUser = userMap.get(leftUid); - if (null != leftUser){ - obj.setLeftErbanNo(leftUser.getErbanNo()); - obj.setLeftNick(leftUser.getNick()); - obj.setLeftAvatar(leftUser.getAvatar()); - } - - Long rightUid = Long.parseLong(uidArray[1]); - obj.setRightUid(rightUid); - - Users rightUser = userMap.get(rightUid); - if (null != rightUser){ - obj.setRightErbanNo(rightUser.getErbanNo()); - obj.setRightNick(rightUser.getNick()); - obj.setRightAvatar(rightUser.getAvatar()); - } - - return obj; - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/service/ChristmasLetterService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/service/ChristmasLetterService.java deleted file mode 100644 index 7a5801db4..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/service/ChristmasLetterService.java +++ /dev/null @@ -1,205 +0,0 @@ -package com.accompany.business.christmas.service; - -import com.accompany.business.base.BaseTicketActDao; -import com.accompany.business.base.service.BaseMulitTicketTaskActService; -import com.accompany.business.christmas.ChristmasCpDao; -import com.accompany.business.christmas.ChristmasLetterDao; -import com.accompany.business.christmas.ChristmasLetterNumDao; -import com.accompany.business.christmas.ChristmasTicketTaskDao; -import com.accompany.business.christmas.constant.ChristmasConstant; -import com.accompany.business.christmas.dto.ChristmasCpUserProp; -import com.accompany.business.christmas.dto.ChristmasLetterActConfigDto; -import com.accompany.business.christmas.dto.ChristmasLetterDto; -import com.accompany.business.christmas.vo.ChristmasLetterConfigVo; -import com.accompany.business.christmas.vo.ChristmasLetterVo; -import com.accompany.business.common.vo.ActivityRankItemVo; -import com.accompany.business.service.SendSysMsgService; -import com.accompany.business.service.netease.YidunCheckUtil; -import com.accompany.business.service.user.UsersService; -import com.accompany.common.config.SystemConfig; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.base.SpringContextHolder; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.model.Users; -import com.accompany.core.service.SysConfService; -import com.alibaba.fastjson.JSON; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; -import org.springframework.util.StringUtils; - -import java.time.LocalDateTime; -import java.util.*; -import java.util.stream.Collectors; - -@Service -@Slf4j -public class ChristmasLetterService extends BaseMulitTicketTaskActService { - - @Autowired - private ChristmasCpDao cpDao; - @Autowired - private ChristmasLetterDao letterDao; - @Autowired - private ChristmasLetterNumDao letterNumDao; - @Autowired - private SysConfService sysConfService; - @Autowired - private UsersService usersService; - @Autowired - private SendSysMsgService sendSysMsgService; - - public List listLetterVo(Long uid, Byte type) { - List dtoList = - null == uid? - letterDao.listUserSquare(): - letterDao.listUserLetter(uid, type); - if (CollectionUtils.isEmpty(dtoList)){ - return Collections.emptyList(); - } - - List voList = new ArrayList<>(); - - Set uidSet = new HashSet<>(); - for (ChristmasLetterDto dto: dtoList) { - uidSet.add(dto.getFromUid()); - uidSet.add(dto.getToUid()); - } - - List uidList = new ArrayList<>(uidSet); - Map usersMap = usersService.getUsersMapByUids(uidList); - - for (ChristmasLetterDto dto: dtoList) { - ChristmasLetterVo vo = new ChristmasLetterVo(); - BeanUtils.copyProperties(dto, vo); - - Users fromUser = usersMap.get(dto.getFromUid()); - if (null != fromUser){ - vo.setFromErbanNo(fromUser.getErbanNo()); - vo.setFromNick(fromUser.getNick()); - vo.setFromAvatar(fromUser.getAvatar()); - } - - Users toUser = usersMap.get(dto.getToUid()); - if (null != toUser){ - vo.setToErbanNo(toUser.getErbanNo()); - vo.setToNick(toUser.getNick()); - vo.setToAvatar(toUser.getAvatar()); - } - - voList.add(vo); - } - return voList; - } - - public ChristmasLetterConfigVo getConfigVo(Long uid){ - ChristmasLetterActConfigDto dto = getConfig(); - - ChristmasLetterConfigVo vo = new ChristmasLetterConfigVo(); - vo.setUid(uid); - vo.setStartTime(DateTimeUtil.localDateTime2Date(dto.getStartTime())); - vo.setEndTime(DateTimeUtil.localDateTime2Date(dto.getEndTime())); - vo.setLetterNumMap(letterNumDao.getUserCurLetterNumMap(uid)); - - Users me = usersService.getUsersByUid(uid); - if (null != me){ - vo.setErbanNo(me.getErbanNo()); - vo.setNick(me.getNick()); - vo.setAvatar(me.getAvatar()); - } - - List cpList = cpDao.listCpByUid(uid, null); - if (CollectionUtils.isEmpty(cpList)){ - vo.setCpList(Collections.emptyList()); - return vo; - } - - List cpVoList = cpList.stream().map(cp->{ - ActivityRankItemVo itemVo = new ActivityRankItemVo(); - itemVo.setUid(uid.equals(cp.getFromUid())?cp.getToUid():cp.getFromUid()); - itemVo.setScore(cp.getScore()); - return itemVo; - }).sorted(Comparator.comparing(ActivityRankItemVo::getScore).reversed()) - .collect(Collectors.toList()); - vo.setCpList(cpVoList); - - List uidList = cpVoList.stream().map(ActivityRankItemVo::getUid).distinct().collect(Collectors.toList()); - Map userMap = usersService.getUsersMapByUids(uidList); - for (ActivityRankItemVo itemVo: cpVoList) { - Users u = userMap.get(itemVo.getUid()); - if (null == u){ - continue; - } - - itemVo.setErbanNo(u.getErbanNo()); - itemVo.setNick(u.getNick()); - itemVo.setAvatar(u.getAvatar()); - } - - return vo; - } - - public void publishLetter(Long uid, Long toUid, Integer letterType, String text) { - LocalDateTime now = LocalDateTime.now(); - ChristmasLetterActConfigDto configDto = getConfig(); - if (!configDto.inActTimeRange(now)){ - throw new ServiceException(BusiStatus.NOT_IN_ACT_TIME_RANGE); - } - - Users toUser = usersService.getUsersByUid(toUid); - if (null == toUser){ - throw new ServiceException(BusiStatus.USERNOTEXISTS); - } - ChristmasCpUserProp cpUserProp = cpDao.getCpByUid(uid, toUid); - if (null == cpUserProp){ - throw new ServiceException(BusiStatus.PARAMETERILLEGAL); - } - Integer num = letterNumDao.getUserCurLetterNum(uid, letterType); - if (num <= 0){ - throw new ServiceException(BusiStatus.PARAMERROR, ChristmasConstant.BusiStatus.LETTER_NUM_UN_ENOUGH); - } - if (YidunCheckUtil.checkHasSensitiveWord(text)){ - throw new ServiceException(BusiStatus.PARAMERROR, ChristmasConstant.BusiStatus.CONTEXT_SENSITIVE); - } - letterDao.saveLetter(uid, toUid, letterType, text); - SpringContextHolder.getBean(ChristmasLetterService.class).sendSecretMsg(uid, toUid, configDto.getSkipUrl()); - } - - @Async - public void sendSecretMsg(Long uid, Long toUid, String skipUrl) { - Users user = usersService.getUsersByUid(uid); - if (null == user){ - return; - } - String tip = String.format(ChristmasConstant.LETTER_TIP, user.getNick()); - sendSysMsgService.sendPersonTextMsgWithSkipUrl(SystemConfig.secretaryUid, toUid, tip, skipUrl); - } - - @Override - protected BaseTicketActDao getTicketActDao(Integer type) { - return letterNumDao.getTicketActDao(type); - } - - @Override - protected void logAfterFinishDailyTask(Long uid, String date, Integer taskId, Integer reward, Integer curTicket) { - - } - - @Override - protected void logAfterFinishLoopTask(Long uid, String date, Integer taskId, Integer reward, Integer curTicket) { - log.info("[2023圣诞节]-任务 {} 在 {} 完成 {} 循环任务，获得 {} 情书， 当前拥有 {} 情书", uid, date, taskId, reward, curTicket); - } - - public ChristmasLetterActConfigDto getConfig(){ - String configStr = sysConfService.getSysConfValueById(ChristmasConstant.SysConfId.ACT_LETTER_CONFIG); - if (!StringUtils.hasText(configStr)){ - throw new ServiceException(BusiStatus.ALREADY_NOTEXISTS_CONFIG); - } - return JSON.parseObject(configStr, ChristmasLetterActConfigDto.class); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/service/ChristmasRankService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/service/ChristmasRankService.java deleted file mode 100644 index a3a189034..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/service/ChristmasRankService.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.accompany.business.christmas.service; - -import com.accompany.business.base.rankobj.UsersRankObjectProvider; -import com.accompany.business.base.service.BaseRankActService; -import com.accompany.business.christmas.constant.ChristmasConstant; -import com.accompany.business.common.constant.RankTypeEnum; -import com.accompany.business.common.dto.RankActConfigDto; -import com.accompany.business.common.vo.ActivityRankVo; -import com.accompany.business.common.vo.RewardVo; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.service.SysConfService; -import com.alibaba.fastjson.JSON; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; - -@Service -@Slf4j -public class ChristmasRankService extends BaseRankActService { - - @Autowired - private SysConfService sysConfService; - - @Override - protected String getActName() { - return ChristmasConstant.actName; - } - - public ActivityRankVo getRank(Long uid, RankTypeEnum rankType, String date) { - return super.getRank(uid, rankType, date, 30); - } - - @Override - protected void logUpdateSendRank(Long uid, Integer giftId, Integer giftNum, Long totalGoldNum, Double score) { - log.info("[2023圣诞节活动]- 送礼榜 {} 收礼 {} {} 个 总价值 {} 钻石，增加值 {}", uid, giftId, giftNum, totalGoldNum, score); - } - - @Override - protected void logUpdateReceiveRank(Long uid, Integer giftId, Integer giftNum, Long totalGoldNum, Double score) { - log.info("[2023圣诞节活动]- 收礼榜 {} 收礼 {} {} 个总价值 {} 钻石，增加值 {}", uid, giftId, giftNum, totalGoldNum, score); - } - - @Override - protected void logRankReward(RankTypeEnum rankType, String date, String rankKey, Integer rankIndex, Long uid, RewardVo reward) { - log.info("[2023圣诞节活动]-收送礼榜 {} 发奖励， 第 {} 名 {} 奖励 {}", rankKey, rankIndex, uid, JSON.toJSONString(reward)); - } - - @Override - public RankActConfigDto getRankActConfig() { - return getConfig(); - } - - public RankActConfigDto getConfig(){ - String configStr = sysConfService.getSysConfValueById(ChristmasConstant.SysConfId.ACT_RANK_CONFIG); - if (!StringUtils.hasText(configStr)){ - throw new ServiceException(BusiStatus.ALREADY_NOTEXISTS_CONFIG); - } - return JSON.parseObject(configStr, RankActConfigDto.class); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/crossroompk/listener/SingleCrossRoomPkActListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/crossroompk/listener/SingleCrossRoomPkActListener.java deleted file mode 100644 index 21b05599c..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/crossroompk/listener/SingleCrossRoomPkActListener.java +++ /dev/null @@ -1,154 +0,0 @@ -package com.accompany.business.crossroompk.listener; - -import cn.hutool.core.util.StrUtil; -import com.accompany.business.constant.CrossRoomRecordStatusEnum; -import com.accompany.business.constant.RoomTypeEnum; -import com.accompany.business.crossroompk.constant.CrossRoomPkConstant; -import com.accompany.business.crossroompk.dto.CrossRoomPkActConfigDto; -import com.accompany.business.crossroompk.service.SingleCrossRoomPkTaskService; -import com.accompany.business.event.CrossRoomPkEndMessageEvent; -import com.accompany.business.message.CrossRoomPkEndMessage; -import com.accompany.business.model.room.CrossRoomPkRecord; -import com.accompany.business.service.room.RoomService; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.model.Room; -import com.accompany.core.service.SysConfService; -import com.accompany.core.service.common.JedisService; -import com.accompany.core.service.task.TaskManageService; -import com.google.common.collect.ImmutableMap; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.stereotype.Component; - -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.Date; - -/** - * @author: liaozetao - * @date: 2024/6/11 14:31 - * @description: - */ -@Slf4j -@Component -public class SingleCrossRoomPkActListener implements ApplicationListener { - - @Autowired - private SingleCrossRoomPkTaskService singleCrossRoomPkTaskService; - - @Autowired - private RoomService roomService; - - @Autowired - private SysConfService sysConfService; - - @Autowired - private JedisService jedisService; - - @Autowired - private TaskManageService taskManageService; - - @Override - public void onApplicationEvent(CrossRoomPkEndMessageEvent event) { - try { - Object source = event.getSource(); - if (source == null) { - return; - } - CrossRoomPkActConfigDto config = sysConfService.getJsonValueById(CrossRoomPkConstant.SINGLE_CROSS_ROOM_PK_CONFIG, CrossRoomPkActConfigDto.class); - if (config == null) { - return; - } - if (!config.getOpen()) { - return; - } - LocalDateTime now = LocalDateTime.now(); - Integer startDayOfWeek = config.getStartDayOfWeek(); - Integer endDayOfWeek = config.getEndDayOfWeek(); - Integer dayOfWeek = now.getDayOfWeek().getValue(); - Integer startHour = config.getStartHour(); - Integer endHour = config.getEndHour(); - int hour = now.getHour(); - log.info("SingleCrossRoomPkActListener dayOfWeek : {}, startDayOfWeek : {}, endDayOfWeek : {}, hour : {}, startHour : {}, endHour : {}", dayOfWeek, startDayOfWeek, endDayOfWeek, hour, startHour, endHour); - //开始时间 - LocalDateTime startNextTime = DateTimeUtil.converDateToLocalDateTime(DateTimeUtil.getCurrentMonday(startHour, 0, 0)); - while (startNextTime.getDayOfWeek().getValue() != startDayOfWeek) { - startNextTime = startNextTime.plusDays(1); - } - startNextTime = startNextTime.withHour(startHour).withMinute(0).withSecond(0).withNano(0); - //结束时间 - LocalDateTime endNextTime = startNextTime; - while (endNextTime.getDayOfWeek().getValue() != endDayOfWeek) { - endNextTime = endNextTime.plusDays(1); - } - endNextTime = endNextTime.withHour(endHour).withMinute(0).withSecond(0).withNano(0); - log.info("SingleCrossRoomPkActListener now : {}, startNextTime : {}, endNextTime : {}", now, startNextTime, endNextTime); - if (!(startNextTime.isBefore(now) && now.isBefore(endNextTime))) { - return; - } - if (startDayOfWeek.equals(dayOfWeek)) { - if (!(startHour <= hour)) { - return; - } - } - if (endDayOfWeek.equals(dayOfWeek)) { - if (!(hour < endHour)) { - return; - } - } - CrossRoomPkEndMessage message = (CrossRoomPkEndMessage) source; - CrossRoomPkRecord acceptPkRoom = message.getAcceptRoom(); - CrossRoomPkRecord invitePkRoom = message.getInviteRoom(); - BigDecimal acceptNormalGiftAmount = acceptPkRoom.getNormalGiftAmount(); - BigDecimal acceptBagGiftAmount = acceptPkRoom.getBagGiftAmount(); - BigDecimal inviteNormalGiftAmount = invitePkRoom.getNormalGiftAmount(); - BigDecimal inviteBagGiftAmount = invitePkRoom.getBagGiftAmount(); - Integer condition = config.getCondition(); - double total = (acceptNormalGiftAmount.add(acceptBagGiftAmount).add(inviteNormalGiftAmount).add(inviteBagGiftAmount)).doubleValue(); - log.info("SingleCrossRoomPkActListener total : {}, condition : {}", total, condition); - if (total < condition) { - return; - } - Long acceptUid = acceptPkRoom.getRoomUid(); - Long inviteUid = invitePkRoom.getRoomUid(); - Room inviteRoom = roomService.getRoomByUid(inviteUid); - if (inviteRoom == null || !RoomTypeEnum.SINGLE_BROADCAST.getCode().equals(inviteRoom.getType())) { - return; - } - Room acceptRoom = roomService.getRoomByUid(acceptUid); - if (acceptRoom == null || !RoomTypeEnum.SINGLE_BROADCAST.getCode().equals(acceptRoom.getType())) { - return; - } - LocalDateTime nextTime = now; - while (nextTime.getDayOfWeek().getValue() != endDayOfWeek) { - nextTime = nextTime.plusDays(1); - } - nextTime = nextTime.withHour(endHour).withMinute(0).withSecond(0).withNano(0); - Date planTime = DateTimeUtil.converLocalDateTimeToDate(nextTime); - String endTime = DateTimeUtil.convertDate(planTime, DateTimeUtil.DEFAULT_DATE_PATTERN); - log.info("SingleCrossRoomPkActListener acceptUid : {}, inviteUid : {}, planTime : {}, endTime : {}", acceptUid, inviteUid, planTime, endTime); - Integer partitionId = inviteRoom.getPartitionId(); - Byte acceptStatus = acceptPkRoom.getStatus(); - Byte inviteStatus = invitePkRoom.getStatus(); - if (acceptStatus == CrossRoomRecordStatusEnum.WIN.getValue()) { - Long roomUid = acceptPkRoom.getRoomUid(); - jedisService.zincrby(RedisKey.single_cross_room_pk_rank.getKey(endTime, String.valueOf(partitionId)), 1.0, String.valueOf(roomUid)); - } - if (inviteStatus == CrossRoomRecordStatusEnum.WIN.getValue()) { - Long roomUid = invitePkRoom.getRoomUid(); - jedisService.zincrby(RedisKey.single_cross_room_pk_rank.getKey(endTime, String.valueOf(partitionId)), 1.0, String.valueOf(roomUid)); - } - int TWO_WEEK = 14 * 24 * 60 * 60; - jedisService.expire(RedisKey.single_cross_room_pk_rank.getKey(endTime, String.valueOf(partitionId)), TWO_WEEK); - jedisService.zincrby(RedisKey.single_cross_room_pk_round_rank.getKey(endTime, String.valueOf(partitionId)), 1.0, String.valueOf(inviteUid)); - jedisService.zincrby(RedisKey.single_cross_room_pk_round_rank.getKey(endTime, String.valueOf(partitionId)), 1.0, String.valueOf(acceptUid)); - jedisService.expire(RedisKey.single_cross_room_pk_round_rank.getKey(endTime, String.valueOf(partitionId)), TWO_WEEK); - assert endTime != null; - singleCrossRoomPkTaskService.addTask(SingleCrossRoomPkTaskService.TASK_KEY + StrUtil.UNDERLINE + partitionId, planTime, ImmutableMap.of(SingleCrossRoomPkTaskService.END_TIME, endTime, SingleCrossRoomPkTaskService.PARTITION_ID, partitionId)); - } catch (Exception e) { - log.error(e.getMessage(), e); - } - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/crossroompk/service/SingleCrossRoomPkRankService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/crossroompk/service/SingleCrossRoomPkRankService.java deleted file mode 100644 index fb0137b63..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/crossroompk/service/SingleCrossRoomPkRankService.java +++ /dev/null @@ -1,275 +0,0 @@ -package com.accompany.business.crossroompk.service; - -import cn.hutool.core.collection.CollectionUtil; -import com.accompany.business.constant.CrossRoomRecordStatusEnum; -import com.accompany.business.constant.CrossRoomRoundStatusEnum; -import com.accompany.business.crossroompk.constant.CrossRoomPkConstant; -import com.accompany.business.crossroompk.dto.CrossRoomPkActConfigDto; -import com.accompany.business.crossroompk.vo.CrossRoomPkRankVo; -import com.accompany.business.crossroompk.vo.CrossRoomPkRecordVo; -import com.accompany.business.model.room.CrossRoomPkRecord; -import com.accompany.business.model.room.CrossRoomPkRound; -import com.accompany.business.mybatismapper.room.CrossRoomPkRecordMapper; -import com.accompany.business.mybatismapper.room.CrossRoomPkRoundMapper; -import com.accompany.business.mybatismapper.room.RoomPkMapper; -import com.accompany.business.service.room.RoomPKService; -import com.accompany.common.constant.Constant; -import com.accompany.common.enums.RedisZSetEnum; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.base.UidContextHolder; -import com.accompany.core.model.Users; -import com.accompany.core.service.SysConfService; -import com.accompany.core.service.common.JedisService; -import com.accompany.core.service.user.UsersBaseService; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.*; -import java.util.stream.Collectors; - -/** - * @author: liaozetao - * @date: 2024/6/12 09:51 - * @description: - */ -@Slf4j -@Service -public class SingleCrossRoomPkRankService { - - @Autowired - private RoomPkMapper roomPkMapper; - - @Autowired - private CrossRoomPkRecordMapper crossRoomPkRecordMapper; - - @Autowired - private CrossRoomPkRoundMapper crossRoomPkRoundMapper; - - @Autowired - private UsersBaseService usersBaseService; - - @Autowired - private RoomPKService roomPKService; - - @Autowired - private JedisService jedisService; - - @Autowired - private SysConfService sysConfService; - - public List getRank(Integer pageNum, Integer pageSize) { - List ranks = new ArrayList<>(); - CrossRoomPkActConfigDto config = sysConfService.getJsonValueById(CrossRoomPkConstant.SINGLE_CROSS_ROOM_PK_CONFIG, CrossRoomPkActConfigDto.class); - if (config == null) { - return Collections.emptyList(); - } - if (!config.getOpen()) { - return Collections.emptyList(); - } - Long uid = UidContextHolder.get(); - Users users = usersBaseService.getUsersByUid(uid); - if (users == null) { - return Collections.emptyList(); - } - long startIndex = (long) (pageNum - 1) * pageSize; - long endIndex = (long) pageNum * pageSize - 1; - Integer partitionId = users.getPartitionId(); - Integer startDayOfWeek = config.getStartDayOfWeek(); - Integer endDayOfWeek = config.getEndDayOfWeek(); - Integer startHour = config.getStartHour(); - Integer endHour = config.getEndHour(); - LocalDateTime now = LocalDateTime.now(); - //开始时间 - LocalDateTime startNextTime = DateTimeUtil.converDateToLocalDateTime(DateTimeUtil.getCurrentMonday(startHour, 0, 0)); - while (startNextTime.getDayOfWeek().getValue() != startDayOfWeek) { - startNextTime = startNextTime.plusDays(1); - } - startNextTime = startNextTime.withHour(startHour).withMinute(0).withSecond(0).withNano(0); - //处理时间周期结束 - if (startNextTime.isAfter(now)) { - startNextTime = now.minusWeeks(1); - while (startNextTime.getDayOfWeek().getValue() != startDayOfWeek) { - startNextTime = startNextTime.plusDays(1); - } - startNextTime = startNextTime.withHour(startHour).withMinute(0).withSecond(0).withNano(0); - } - //结束时间 - LocalDateTime endNextTime = startNextTime; - while (endNextTime.getDayOfWeek().getValue() != endDayOfWeek) { - endNextTime = endNextTime.plusDays(1); - } - endNextTime = endNextTime.withHour(endHour).withMinute(0).withSecond(0).withNano(0); - Date endTime = DateTimeUtil.converLocalDateTimeToDate(endNextTime); - String endTimeStr = DateTimeUtil.convertDate(endTime, DateTimeUtil.DEFAULT_DATE_PATTERN); - log.info("getRank endTimeStr : {}", endTimeStr); - Set> rankSet = jedisService.zrevrange(RedisKey.single_cross_room_pk_round_rank.getKey(endTimeStr, String.valueOf(partitionId)), startIndex, endIndex); - for (Map map : rankSet) { - Long memberUid = Long.valueOf(map.get(RedisZSetEnum.member.name()).toString()); - Double memberScore = Double.valueOf(map.get(RedisZSetEnum.score.name()).toString()); - Users memberUser = usersBaseService.getUsersByUid(memberUid); - if (memberUser == null) { - continue; - } - Double winScore = jedisService.zscore(RedisKey.single_cross_room_pk_rank.getKey(endTimeStr, String.valueOf(partitionId)), String.valueOf(memberUid)); - if (winScore == null) { - winScore = 0.0; - } - CrossRoomPkRankVo rank = new CrossRoomPkRankVo(); - rank.setUid(memberUid); - rank.setErBanNo(memberUser.getErbanNo()); - rank.setNick(memberUser.getNick()); - rank.setAvatar(memberUser.getAvatar()); - rank.setTotalNum(memberScore); - rank.setWinNum(winScore); - if (memberScore > 0) { - rank.setWinRate(winScore / memberScore); - } - ranks.add(rank); - } - ranks = ranks.stream().sorted((v1, v2) -> { - Long roomUid1 = v1.getUid(); - Long roomUid2 = v2.getUid(); - Double winNum1 = v1.getWinNum(); - Double winNum2 = v2.getWinNum(); - Double winRate1 = v1.getWinRate(); - Double winRate2 = v2.getWinRate(); - if (winNum1.equals(winNum2)) { - if (winRate1.equals(winRate2)) { - CrossRoomPkRecord lastRecord1 = crossRoomPkRecordMapper.getLastRecord(roomUid1); - CrossRoomPkRecord lastRecord2 = crossRoomPkRecordMapper.getLastRecord(roomUid2); - if (lastRecord1 != null && lastRecord2 != null) { - Date createTime1 = lastRecord1.getCreateTime(); - Date createTime2 = lastRecord2.getCreateTime(); - return createTime2.compareTo(createTime1); - } - } else { - return winRate2.compareTo(winRate1); - } - } - return winNum2.compareTo(winNum1); - }).collect(Collectors.toList()); - return ranks; - } - - public List getRecord(Integer pageNum, Integer pageSize) { - List records = new ArrayList<>(); - CrossRoomPkActConfigDto config = sysConfService.getJsonValueById(CrossRoomPkConstant.SINGLE_CROSS_ROOM_PK_CONFIG, CrossRoomPkActConfigDto.class); - if (config == null) { - return Collections.emptyList(); - } - if (!config.getOpen()) { - return Collections.emptyList(); - } - Integer startDayOfWeek = config.getStartDayOfWeek(); - Integer endDayOfWeek = config.getEndDayOfWeek(); - Integer startHour = config.getStartHour(); - Integer endHour = config.getEndHour(); - Integer condition = config.getCondition(); - LocalDateTime now = LocalDateTime.now(); - //开始时间 - LocalDateTime startNextTime = DateTimeUtil.converDateToLocalDateTime(DateTimeUtil.getCurrentMonday(startHour, 0, 0)); - while (startNextTime.getDayOfWeek().getValue() != startDayOfWeek) { - startNextTime = startNextTime.plusDays(1); - } - startNextTime = startNextTime.withHour(startHour).withMinute(0).withSecond(0).withNano(0); - //处理时间周期结束 - if (startNextTime.isAfter(now)) { - //上一周 - startNextTime = now.minusWeeks(1); - while (startNextTime.getDayOfWeek().getValue() != startDayOfWeek) { - startNextTime = startNextTime.plusDays(1); - } - startNextTime = startNextTime.withHour(startHour).withMinute(0).withSecond(0).withNano(0); - } - Date startTime = DateTimeUtil.converLocalDateTimeToDate(startNextTime); - //结束时间 - LocalDateTime endNextTime = startNextTime; - while (endNextTime.getDayOfWeek().getValue() != endDayOfWeek) { - endNextTime = endNextTime.plusDays(1); - } - endNextTime = endNextTime.withHour(endHour).withMinute(0).withSecond(0).withNano(0); - Date endTime = DateTimeUtil.converLocalDateTimeToDate(endNextTime); - log.info("getRecord startTime : {}, endTime : {}", startTime, endTime); - Long uid = UidContextHolder.get(); - Users users = usersBaseService.getUsersByUid(uid); - if (users == null) { - return Collections.emptyList(); - } - Integer partitionId = users.getPartitionId(); - List crossRoomPkRecords = crossRoomPkRecordMapper.selectList(Wrappers.lambdaQuery() - .in(CrossRoomPkRecord::getStatus, CrossRoomRecordStatusEnum.WIN.getValue(), CrossRoomRecordStatusEnum.FAIL.getValue(), CrossRoomRecordStatusEnum.DRAW.getValue()) - .between(CrossRoomPkRecord::getCreateTime, startTime, endTime)); - Map> roundMap = crossRoomPkRecords.stream().collect(Collectors.groupingBy(CrossRoomPkRecord::getRoundId)); - List crossRoomPkRounds = crossRoomPkRoundMapper.selectList(Wrappers.lambdaQuery() - .eq(CrossRoomPkRound::getPartitionId, partitionId) - .eq(CrossRoomPkRound::getStatus, CrossRoomRoundStatusEnum.FINISHED.getValue()) - .between(CrossRoomPkRound::getCreateTime, startTime, endTime) - .orderByDesc(CrossRoomPkRound::getCreateTime)); - if (CollectionUtil.isNotEmpty(crossRoomPkRounds)) { - for (CrossRoomPkRound crossRoomPkRound : crossRoomPkRounds) { - CrossRoomPkRecordVo record = new CrossRoomPkRecordVo(); - Long roundId = crossRoomPkRound.getId(); - if (CollectionUtil.isEmpty(roundMap) || !roundMap.containsKey(roundId)) { - continue; - } - List pkRecords = roundMap.get(roundId); - CrossRoomPkRecord inviteRecord = null; - Optional inviteAny = pkRecords.stream().filter(v -> Constant.CrossRoomPKType.invite.equals(v.getType())).findAny(); - if (inviteAny.isPresent()) { - inviteRecord = inviteAny.get(); - } - CrossRoomPkRecord acceptRecord = null; - Optional acceptAny = pkRecords.stream().filter(v -> Constant.CrossRoomPKType.accept.equals(v.getType())).findAny(); - if (acceptAny.isPresent()) { - acceptRecord = acceptAny.get(); - } - if (inviteRecord == null || acceptRecord == null) { - continue; - } - BigDecimal inviteNormalGiftAmount = inviteRecord.getNormalGiftAmount(); - BigDecimal inviteBagGiftAmount = inviteRecord.getBagGiftAmount(); - BigDecimal inviteExtraAmount = inviteRecord.getExtraAmount(); - BigDecimal acceptNormalGiftAmount = acceptRecord.getNormalGiftAmount(); - BigDecimal acceptBagGiftAmount = acceptRecord.getBagGiftAmount(); - BigDecimal acceptExtraAmount = acceptRecord.getExtraAmount(); - double total = inviteNormalGiftAmount.add(inviteBagGiftAmount).add(inviteExtraAmount).add(acceptNormalGiftAmount).add(acceptBagGiftAmount).add(acceptExtraAmount).doubleValue(); - if (total < condition) { - continue; - } - Long inviteUid = inviteRecord.getRoomUid(); - Long acceptUid = acceptRecord.getRoomUid(); - Users inviteUser = usersBaseService.getUsersByUid(inviteUid); - Users acceptUser = usersBaseService.getUsersByUid(acceptUid); - if (inviteUser == null || acceptUser == null) { - continue; - } - record.setLeftUid(inviteUser.getUid()); - record.setLeftErBanNo(inviteUser.getErbanNo()); - record.setLeftNick(inviteUser.getNick()); - record.setLeftPkStatus(inviteRecord.getStatus()); - record.setLeftAvatar(inviteUser.getAvatar()); - record.setRightUid(acceptUser.getUid()); - record.setRightErBanNo(acceptUser.getErbanNo()); - record.setRightNick(acceptUser.getNick()); - record.setRightPkStatus(acceptRecord.getStatus()); - record.setRightAvatar(acceptUser.getAvatar()); - records.add(record); - } - } - int startIndex = (pageNum - 1) * pageSize; - int endIndex = pageNum * pageSize - 1; - int size = records.size(); - if (size < endIndex) { - endIndex = records.size(); - } - if (size < startIndex) { - return Collections.emptyList(); - } - return records.subList(startIndex, endIndex); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/crossroompk/service/SingleCrossRoomPkTaskService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/crossroompk/service/SingleCrossRoomPkTaskService.java deleted file mode 100644 index 506e42033..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/crossroompk/service/SingleCrossRoomPkTaskService.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.accompany.business.crossroompk.service; - -import com.accompany.business.common.dto.RewardDto; -import com.accompany.business.crossroompk.constant.CrossRoomPkConstant; -import com.accompany.business.crossroompk.dto.CrossRoomPkActConfigDto; -import com.accompany.business.util.RewardUtil; -import com.accompany.common.enums.RedisZSetEnum; -import com.accompany.common.redis.RedisKey; -import com.accompany.core.service.SysConfService; -import com.accompany.core.service.common.JedisService; -import com.accompany.core.service.task.AbstractTaskService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; - -/** - * @author: liaozetao - * @date: 2024/6/11 18:08 - * @description: - */ -@Slf4j -@Service -public class SingleCrossRoomPkTaskService extends AbstractTaskService { - - public static final String TASK_KEY = "SINGLE_CROSS_ROOM_PK_TASK"; - - public static final String END_TIME = "endTime"; - - public static final String PARTITION_ID = "partitionId"; - - @Autowired - private JedisService jedisService; - - @Autowired - private SysConfService sysConfService; - - @Autowired - private RewardUtil rewardUtil; - - @Override - protected void execute(String taskKey, Map params) { - log.info("==== SingleCrossRoomPkTaskService execute start ===="); - try { - String endTime = params.get(END_TIME).toString(); - String partitionId = params.get(PARTITION_ID).toString(); - CrossRoomPkActConfigDto config = sysConfService.getJsonValueById(CrossRoomPkConstant.SINGLE_CROSS_ROOM_PK_CONFIG, CrossRoomPkActConfigDto.class); - if (config == null) { - return; - } - if (!config.getOpen()) { - return; - } - Integer limit = config.getLimit(); - Integer partitionFlag = config.getPartitionFlag(); - if ((partitionFlag & Integer.parseInt(partitionId)) == 0) { - return; - } - List> rewards = config.getRankRewards(); - int size = rewards.size(); - Set> rankSet = jedisService.zrevrange(RedisKey.single_cross_room_pk_rank.getKey(endTime, partitionId), 0L, (long) (size - 1)); - String[] uidArray = rankSet.stream().map(v -> v.get(RedisZSetEnum.member.name()).toString()).toArray(String[]::new); - for (int i = 0, len = uidArray.length; i < len; i++) { - String uidStr = uidArray[i]; - //场次校验 - Optional any = rankSet.stream().filter(v -> v.get(RedisZSetEnum.member.name()).toString().equals(uidStr)).map(v -> Double.valueOf(v.get(RedisZSetEnum.score.name()).toString())).findAny(); - if (any.isEmpty()) { - continue; - } else { - Double score = any.get(); - if (score < limit) { - continue; - } - } - if (i < rewards.size()) { - List rewardDtos = rewards.get(i); - for (RewardDto rewardDto : rewardDtos) { - rewardUtil.sendRewardByType(Long.valueOf(uidStr), rewardDto, TASK_KEY); - } - } - } - } catch (Exception e) { - log.error(e.getMessage(), e); - } - log.info("==== SingleCrossRoomPkTaskService execute end ===="); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/doubleeleven/listener/DoubleElevenRankGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/doubleeleven/listener/DoubleElevenRankGiftListener.java deleted file mode 100644 index ec5380c2c..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/doubleeleven/listener/DoubleElevenRankGiftListener.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.accompany.business.doubleeleven.listener; - -import com.accompany.business.base.listener.RankGiftListener; -import com.accompany.business.doubleeleven.service.DoubleElevenRankService; -import com.accompany.business.event.GiftMessageEvent; -import lombok.extern.slf4j.Slf4j; -import org.springframework.context.ApplicationListener; -import org.springframework.scheduling.annotation.Async; - -@Slf4j -//@Component -public class DoubleElevenRankGiftListener extends RankGiftListener implements ApplicationListener{ - - @Async - @Override - public void onApplicationEvent(GiftMessageEvent giftMessageEvent) { - handleEvent(giftMessageEvent); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/doubleeleven/listener/DoubleElevenTaskGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/doubleeleven/listener/DoubleElevenTaskGiftListener.java deleted file mode 100644 index 1116b8cb0..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/doubleeleven/listener/DoubleElevenTaskGiftListener.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.accompany.business.doubleeleven.listener; - -import com.accompany.business.common.dto.RewardTaskActConfigDto; -import com.accompany.business.doubleeleven.constant.DoubleElevenConstant; -import com.accompany.business.doubleeleven.dto.DoubleElevenTaskConfigDto; -import com.accompany.business.doubleeleven.service.DoubleElevenTaskService; -import com.accompany.business.event.GiftMessageEvent; -import com.accompany.business.message.GiftMessage; -import com.accompany.common.utils.DateTimeUtil; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.scheduling.annotation.Async; -import org.springframework.util.CollectionUtils; - -import java.time.LocalDateTime; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -@Slf4j -//@Component -public class DoubleElevenTaskGiftListener implements ApplicationListener { - - @Autowired - private DoubleElevenTaskService service; - - @Override - @Async - public void onApplicationEvent(GiftMessageEvent giftMessageEvent) { - GiftMessage giftMessage = (GiftMessage) giftMessageEvent.getSource(); - Date sendGiftTime = DateTimeUtil.convertMsToDate(giftMessage.getMessTime()); - LocalDateTime sendGiftLocalDateTime = DateTimeUtil.converDateToLocalDateTime(sendGiftTime); - - DoubleElevenTaskConfigDto config = service.getConfig(); - if (!config.inActTimeRange(sendGiftLocalDateTime)){ - return; - } - - Integer giftId = giftMessage.getGiftId(); - List giftTaskList = config.getDailyTask().values().stream() - .filter(task->task.getGiftIds().contains(giftId)) - .collect(Collectors.toList()); - if (CollectionUtils.isEmpty(giftTaskList)){ - return; - } - - // 送礼人Uid - Long sendUid = giftMessage.getSendUid(); - Long receiveUid = giftMessage.getRecvUid(); - String date = sendGiftLocalDateTime.format(DoubleElevenTaskConfigDto.DATE_FORMATTER); - Integer giftNum = giftMessage.getGiftNum(); - - for (RewardTaskActConfigDto.DailyTask task: giftTaskList) { - Integer condition = config.getDailyTaskCondition().get(task.getId()); - Long uid = DoubleElevenConstant.TaskCondition.SEND.equals(condition)? sendUid: receiveUid; - service.processDailyTask(task, uid, date, giftNum); - } - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/doubleeleven/service/DoubleElevenRankService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/doubleeleven/service/DoubleElevenRankService.java deleted file mode 100644 index c387c7b7e..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/doubleeleven/service/DoubleElevenRankService.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.accompany.business.doubleeleven.service; - -import com.accompany.business.base.rankobj.UsersRankObjectProvider; -import com.accompany.business.base.service.BaseRankActService; -import com.accompany.business.common.constant.RankTypeEnum; -import com.accompany.business.common.dto.RankActConfigDto; -import com.accompany.business.common.vo.ActivityRankVo; -import com.accompany.business.common.vo.RewardVo; -import com.accompany.business.doubleeleven.constant.DoubleElevenConstant; -import com.accompany.business.doubleeleven.dto.DoubleElevenRankConfigDto; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.service.SysConfService; -import com.alibaba.fastjson.JSON; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; - -@Service -@Slf4j -public class DoubleElevenRankService extends BaseRankActService { - - @Autowired - private SysConfService sysConfService; - - @Override - protected String getActName() { - return DoubleElevenConstant.actName; - } - - public ActivityRankVo getRank(Long uid, RankTypeEnum rankType, String date) { - return super.getRank(uid, rankType, date, 15); - } - - @Override - protected void logUpdateSendRank(Long uid, Integer giftId, Integer giftNum, Long totalGoldNum, Double score) { - log.info("[2023双11活动]- 送礼榜 {} 收礼 {} {} 个 总价值 {} 钻石，增加值 {}", uid, giftId, giftNum, totalGoldNum, score); - } - - @Override - protected void logUpdateReceiveRank(Long uid, Integer giftId, Integer giftNum, Long totalGoldNum, Double score) { - log.info("[2023双11活动]- 收礼榜 {} 收礼 {} {} 个总价值 {} 钻石，增加值 {}", uid, giftId, giftNum, totalGoldNum, score); - } - - @Override - protected void logRankReward(RankTypeEnum rankType, String date, String rankKey, Integer rankIndex, Long uid, RewardVo reward) { - log.info("[2023双11活动]-收送礼榜 {} 发奖励， 第 {} 名 {} 奖励 {}", rankKey, rankIndex, uid, JSON.toJSONString(reward)); - } - - @Override - public RankActConfigDto getRankActConfig() { - return getConfig(); - } - - public DoubleElevenRankConfigDto getConfig(){ - String configStr = sysConfService.getSysConfValueById(DoubleElevenConstant.SysConfId.ACT_RANK_CONFIG); - if (!StringUtils.hasText(configStr)){ - throw new ServiceException(BusiStatus.ALREADY_NOTEXISTS_CONFIG); - } - return JSON.parseObject(configStr, DoubleElevenRankConfigDto.class); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/doubleeleven/service/DoubleElevenTaskRecordService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/doubleeleven/service/DoubleElevenTaskRecordService.java deleted file mode 100644 index d3c55b708..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/doubleeleven/service/DoubleElevenTaskRecordService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.accompany.business.doubleeleven.service; - -import com.accompany.business.doubleeleven.DoubleElevenTaskDao; -import com.accompany.business.doubleeleven.model.DoubleElevenTaskRecord; -import com.accompany.business.mapper.DoubleElevenTaskRecordDao; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -@Service -@Slf4j -public class DoubleElevenTaskRecordService extends ServiceImpl { - - @Autowired - private DoubleElevenTaskDao dao; - - public void writeDb() { - List dailyTaskRecord = new ArrayList<>(); - Map dailyTaskMap = dao.getAllUserDailyTaskProgress(); - for (String key: dailyTaskMap.keySet()) { - String[] keys = key.split("_"); - Long uid = Long.parseLong(keys[0]); - String date = keys[1]; - Integer taskId = Integer.parseInt(keys[2]); - Integer proc = dailyTaskMap.get(key); - - DoubleElevenTaskRecord record = new DoubleElevenTaskRecord(); - record.setDate(date); - record.setUid(uid); - record.setTaskId(taskId); - record.setType((byte) 1); - record.setProc(proc); - dailyTaskRecord.add(record); - } - saveBatch(dailyTaskRecord); - - List loopTaskRecord = new ArrayList<>(); - Map loopTaskMap = dao.getAllUserLoopTaskProgress(); - for (String key: loopTaskMap.keySet()) { - String[] keys = key.split("_"); - Long uid = Long.parseLong(keys[0]); - String date = keys[1]; - Integer taskId = Integer.parseInt(keys[2]); - Integer proc = loopTaskMap.get(key); - - DoubleElevenTaskRecord record = new DoubleElevenTaskRecord(); - record.setDate(date); - record.setUid(uid); - record.setTaskId(taskId); - record.setType((byte) 2); - record.setProc(proc); - loopTaskRecord.add(record); - } - saveBatch(loopTaskRecord); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/doubleeleven/service/DoubleElevenTaskService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/doubleeleven/service/DoubleElevenTaskService.java deleted file mode 100644 index 10ad07902..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/doubleeleven/service/DoubleElevenTaskService.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.accompany.business.doubleeleven.service; - -import com.accompany.business.base.service.BaseRewardTaskActService; -import com.accompany.business.common.dto.RewardTaskActConfigDto; -import com.accompany.business.common.vo.RewardVo; -import com.accompany.business.doubleeleven.DoubleElevenTaskDao; -import com.accompany.business.doubleeleven.constant.DoubleElevenConstant; -import com.accompany.business.doubleeleven.dto.DoubleElevenTaskConfigDto; -import com.accompany.business.doubleeleven.vo.DoubleElevenTaskConfigVo; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.service.SysConfService; -import com.alibaba.fastjson.JSON; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; - -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.List; - -@Service -@Slf4j -public class DoubleElevenTaskService extends BaseRewardTaskActService { - - @Autowired - private SysConfService sysConfService; - private final DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern(DateTimeUtil.DEFAULT_DATE_PATTERN); - - - public DoubleElevenTaskConfigVo getConfigVo(Long uid){ - DoubleElevenTaskConfigDto dto = getConfig(); - - LocalDateTime now = LocalDateTime.now(); - String date = now.format(dateFormatter); - - DoubleElevenTaskConfigVo vo = new DoubleElevenTaskConfigVo(); - vo.setUid(uid); - vo.setStartTime(DateTimeUtil.localDateTime2Date(dto.getStartTime())); - vo.setEndTime(DateTimeUtil.localDateTime2Date(dto.getEndTime())); - - vo.setDailyTaskList(listUserDailyTaskVo(uid, date, dto.getDailyTask())); - - return vo; - } - - @Override - protected void logAfterFinishDailyTask(Long uid, String date, Integer taskId, List rewardVoList) { - log.info("[2023双11活动]-任务 {} 在 {} 完成 {} 每日任务，获得 {}", uid, date, taskId, JSON.toJSONString(rewardVoList)); - } - - @Override - protected void logAfterFinishLoopTask(Long uid, String date, Integer taskId, List rewardVoList) { - log.info("[2023双11活动]-任务 {} 在 {} 完成 {} 循环任务，获得 {}", uid, date, taskId, JSON.toJSONString(rewardVoList)); - } - - public DoubleElevenTaskConfigDto getConfig(){ - String configStr = sysConfService.getSysConfValueById(DoubleElevenConstant.SysConfId.ACT_TASK_CONFIG); - if (!StringUtils.hasText(configStr)){ - throw new ServiceException(BusiStatus.ALREADY_NOTEXISTS_CONFIG); - } - return JSON.parseObject(configStr, DoubleElevenTaskConfigDto.class); - } - - @Override - protected String getActName() { - return DoubleElevenConstant.actName; - } - - @Override - public RewardTaskActConfigDto getTaskActConfig() { - return getConfig(); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/exp/listener/ExpBattleRankGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/exp/listener/ExpBattleRankGiftListener.java deleted file mode 100644 index f78c8981f..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/exp/listener/ExpBattleRankGiftListener.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.accompany.business.exp.listener; - -import com.accompany.business.event.GiftMessageEvent; -import com.accompany.business.exp.dto.ExpBattleActConfigDto; -import com.accompany.business.exp.service.ExpBattleActService; -import com.accompany.business.exp.service.ExpBattleRankService; -import com.accompany.business.message.GiftMessage; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.model.Users; -import com.accompany.core.service.user.UsersBaseService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.scheduling.annotation.Async; - -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.util.Date; -@Slf4j -//@Component -public class ExpBattleRankGiftListener implements ApplicationListener{ - - @Autowired - private ExpBattleActService service; - - @Autowired - private UsersBaseService usersBaseService; - - public void handleEvent(GiftMessageEvent giftMessageEvent) { - GiftMessage giftMessage = (GiftMessage) giftMessageEvent.getSource(); - Date sendGiftTime = DateTimeUtil.convertMsToDate(giftMessage.getMessTime()); - LocalDateTime sendGiftLocalDateTime = DateTimeUtil.converDateToLocalDateTime(sendGiftTime); - Long senderUid = giftMessage.getSendUid(); - Users sender = usersBaseService.getUsersByUid(senderUid); - if (null == sender){ - throw new ServiceException(BusiStatus.USERNOTEXISTS); - } - - ExpBattleRankService rankService = service.getRankService(sender.getPartitionId()); - ExpBattleActConfigDto config = rankService.getConfig(); - ZoneId zoneId = ZoneId.of(config.getZoneId()); - LocalDateTime zoneDateTime = sendGiftLocalDateTime.atZone(ZoneId.systemDefault()).withZoneSameInstant(zoneId).toLocalDateTime(); - if (!config.inActTimeRange(zoneDateTime)) { - return; - } - - Integer giftId = giftMessage.getGiftId(); - Integer giftNum = giftMessage.getGiftNum(); - Long totalGoldNum = giftMessage.getGoldNum(); - rankService.updateSendRank(senderUid, config, giftId, giftNum, totalGoldNum, sendGiftTime); - } - - @Async - @Override - public void onApplicationEvent(GiftMessageEvent event) { - handleEvent(event); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/exp/service/ArabExpBattleRankService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/exp/service/ArabExpBattleRankService.java deleted file mode 100644 index 551d1091d..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/exp/service/ArabExpBattleRankService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.accompany.business.exp.service; - -import com.accompany.core.enumeration.PartitionEnum; -import org.springframework.stereotype.Service; - -@Service -public class ArabExpBattleRankService extends ExpBattleRankService { - - @Override - protected Integer getPartitionId(){ - return PartitionEnum.ARAB.getId(); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/exp/service/ChineseExpBattleRankService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/exp/service/ChineseExpBattleRankService.java deleted file mode 100644 index 55a499abe..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/exp/service/ChineseExpBattleRankService.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.accompany.business.exp.service; - -import com.accompany.business.common.dto.RankActConfigDto; -import com.accompany.business.model.Hall; -import com.accompany.business.service.hall.HallService; -import com.accompany.core.enumeration.PartitionEnum; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Date; - -@Service -@Slf4j -public class ChineseExpBattleRankService extends ExpBattleRankService{ - - @Autowired - private HallService hallService; - - @Override - protected Integer getPartitionId() { - return PartitionEnum.CHINESE.getId(); - } - - @Override - public void updateSendRank(Long uid, RankActConfigDto config, Integer giftId, Integer giftNum, Long totalGoldNum, Date sendGiftTime) { - Hall hall = hallService.getHallByUid(uid); - if (null != hall){ - log.error("[ExpBattle活动] {} 大头不参与活动", uid); - return; - } - super.updateSendRank(uid, config, giftId, giftNum, totalGoldNum, sendGiftTime); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/exp/service/EnglishExpBattleRankService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/exp/service/EnglishExpBattleRankService.java deleted file mode 100644 index cd4015c83..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/exp/service/EnglishExpBattleRankService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.accompany.business.exp.service; - -import com.accompany.core.enumeration.PartitionEnum; -import org.springframework.stereotype.Service; - -@Service -public class EnglishExpBattleRankService extends ExpBattleRankService { - - @Override - protected Integer getPartitionId(){ - return PartitionEnum.ENGLISH.getId(); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/exp/service/ExpBattleActService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/exp/service/ExpBattleActService.java deleted file mode 100644 index be5f0b95e..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/exp/service/ExpBattleActService.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.accompany.business.exp.service; - -import com.accompany.business.common.constant.RankTypeEnum; -import com.accompany.business.common.vo.ActivityRankVo; -import com.accompany.business.common.vo.RewardVo; -import com.accompany.business.exp.dto.ExpBattleActConfigDto; -import com.accompany.business.exp.vo.ExpBattleActUserVo; -import com.accompany.business.exp.vo.ExpBattleActVo; -import com.accompany.business.service.SendSysMsgService; -import com.accompany.business.service.user.UsersService; -import com.accompany.business.util.RewardUtil; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.base.SpringContextHolder; -import com.accompany.core.enumeration.I18nAlertEnum; -import com.accompany.core.enumeration.PartitionEnum; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.model.Users; -import com.accompany.core.util.I18NMessageSourceUtil; -import com.alibaba.fastjson.JSON; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.time.ZoneId; -import java.time.ZonedDateTime; -import java.util.Collection; -import java.util.List; -import java.util.stream.Collectors; - -@Slf4j -@Service -public class ExpBattleActService { - - @Autowired - private UsersService usersService; - @Autowired - private EnglishExpBattleRankService englishExpBattleRankService; - @Autowired - private ArabExpBattleRankService arabExpBattleRankService; - @Autowired - private ChineseExpBattleRankService chineseExpBattleRankService; - @Autowired - private RewardUtil rewardUtil; - @Autowired - private SendSysMsgService sendSysMsgService; - - public ExpBattleRankService getRankService(Integer partitionId) { - if (PartitionEnum.ENGLISH.getId() == partitionId){ - return englishExpBattleRankService; - } else if (PartitionEnum.ARAB.getId() == partitionId) { - return arabExpBattleRankService; - } else if (PartitionEnum.CHINESE.getId() == partitionId){ - return chineseExpBattleRankService; - } - throw new ServiceException(BusiStatus.SERVERERROR); - } - - public ExpBattleActVo getConfig(Long uid) { - Users u = usersService.getNotNullUsersByUid(uid); - ExpBattleRankService rankService = getRankService(u.getPartitionId()); - ExpBattleActConfigDto config = rankService.getConfig(); - ZoneId zoneId = ZoneId.of(config.getZoneId()); - - ExpBattleActVo actVo = new ExpBattleActVo(); - actVo.setStartTime(config.getStartTime().atZone(zoneId).toInstant().toEpochMilli()); - actVo.setEndTime(config.getEndTime().atZone(zoneId).toInstant().toEpochMilli()); - actVo.setExpLevelMap(config.getExpLevelMap()); - - ExpBattleActUserVo meVo = rankService.getRankItemVo(u, config); - actVo.setMe(meVo); - - actVo.setLevelTaskStatusMap(rankService.getStatusMap(uid, meVo.getLevel(), config)); - return actVo; - } - - public ActivityRankVo getRank(Long uid) { - Users u = usersService.getNotNullUsersByUid(uid); - return getRankService(u.getPartitionId()).getRank(u, RankTypeEnum.SEND_TOTAL,null); - } - - public void settlement(ZonedDateTime zonedDateTime, Boolean needFlag) { - Collection serviceList = SpringContextHolder.getApplicationContext().getBeansOfType(ExpBattleRankService.class).values(); - serviceList.parallelStream().forEach(service->{ - service.settlement(zonedDateTime, needFlag); - }); - } - - public void getReward(Long uid, Integer level) { - Users u = usersService.getNotNullUsersByUid(uid); - ExpBattleRankService rankService = getRankService(u.getPartitionId()); - ExpBattleActConfigDto config = rankService.getConfig(); - - ExpBattleActUserVo meVo = rankService.getRankItemVo(u, config); - if (!config.getLevelRewardMap().containsKey(level) || meVo.getLevel() < level){ - throw new ServiceException(BusiStatus.EXP_BATTLE_ACT_CAN_NOT_GET_REWARD); - } - - if (!rankService.updateStatusMap(uid, level)){ - throw new ServiceException(BusiStatus.EXP_BATTLE_ACT_HAD_GOT_REWARD); - } - - List rewardVoList = config.getLevelRewardMap().get(level).parallelStream() - .map(rewardDto -> rewardUtil.sendRewardByType(uid, rewardDto, "[ExpBattle活动]-任务奖励")) - .collect(Collectors.toList()); - log.info("[ExpBattle活动] {} 完成 {} 任务，获得奖励 {}", uid, level, JSON.toJSONString(rewardVoList)); - - String content = I18NMessageSourceUtil.getMessage(I18nAlertEnum.EXP_BATTLE_ACT_REWARD_HAD_SEND, uid); - sendSysMsgService.sendPersonTextMsg(uid, content); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/exp/service/ExpBattleRankService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/exp/service/ExpBattleRankService.java deleted file mode 100644 index 95ffd5213..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/exp/service/ExpBattleRankService.java +++ /dev/null @@ -1,223 +0,0 @@ -package com.accompany.business.exp.service; - -import com.accompany.business.base.rankobj.UsersRankObjectProvider; -import com.accompany.business.base.service.BaseRankActService; -import com.accompany.business.common.constant.RankTypeEnum; -import com.accompany.business.common.dto.RankActConfigDto; -import com.accompany.business.common.vo.ActivityRankItemVo; -import com.accompany.business.common.vo.ActivityRankVo; -import com.accompany.business.common.vo.RewardVo; -import com.accompany.business.exp.constant.ExpBattleActConstant; -import com.accompany.business.exp.dto.ExpBattleActConfigDto; -import com.accompany.business.exp.vo.ExpBattleActUserVo; -import com.accompany.business.service.SendSysMsgService; -import com.accompany.business.service.user.UsersService; -import com.accompany.business.util.VipUtil; -import com.accompany.business.vo.message.MessageTemplate; -import com.accompany.common.config.SystemConfig; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.enumeration.I18nAlertEnum; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.model.Users; -import com.accompany.core.service.SysConfService; -import com.accompany.core.util.DoubleUtil; -import com.accompany.core.util.I18NMessageSourceUtil; -import com.accompany.core.vo.vip.VipBaseInfoVO; -import com.alibaba.fastjson.JSON; -import lombok.extern.slf4j.Slf4j; -import org.redisson.api.RMap; -import org.redisson.api.RScoredSortedSet; -import org.redisson.api.RedissonClient; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.StringUtils; - -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.time.ZonedDateTime; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - -@Slf4j -public abstract class ExpBattleRankService extends BaseRankActService implements InitializingBean { - - @Autowired - private RedissonClient redissonClient; - @Autowired - private SysConfService sysConfService; - @Autowired - private SendSysMsgService sendSysMsgService; - @Autowired - private UsersService usersService; - - private RMap statusMap; - - @Override - protected String getActName() { - return ExpBattleActConstant.ACT_NAME; - } - - protected boolean updateStatusMap(Long uid, Integer level){ - String levelKey = String.join("_", uid.toString(), level.toString()); - return null == statusMap.putIfAbsent(levelKey, Boolean.TRUE); - } - - protected Map getStatusMap(Long uid, Integer curLevel, ExpBattleActConfigDto config){ - Set keyList = config.getLevelRewardMap().keySet().stream().map(level->String.join("_", uid.toString(), level.toString())).collect(Collectors.toSet()); - Map statusCacheMap = statusMap.getAll(keyList); - return config.getLevelRewardMap().keySet().stream() - .collect(Collectors.toMap(level->level, level->{ - String levelKey = String.join("_", uid.toString(), level.toString()); - if (statusCacheMap.getOrDefault(levelKey, Boolean.FALSE)){ - return ExpBattleActConstant.Status.HAD; - } - return curLevel >= level? ExpBattleActConstant.Status.CAN: ExpBattleActConstant.Status.NONE; - })); - } - - public ActivityRankVo getRank(Users u, RankTypeEnum rankType, String date) { - ExpBattleActConfigDto config = getConfig(); - ActivityRankVo rankVo = super.getRank(u.getUid(), rankType, date, 50); - - List rankList = rankVo.getRankList().stream().map(itemVo->getRankItemVo(itemVo, config)).collect(Collectors.toList()); - rankVo.setRankList(rankList); - - ExpBattleActUserVo me = getRankItemVo(rankVo.getMeRank(), config); - rankVo.setMeRank(me); - - return rankVo; - } - - @Override - protected String getRankKey(RankTypeEnum rankType, String date, RankActConfigDto config) { - return String.join("_", super.getRankKey(rankType, date, config), getPartitionId().toString()); - } - - public ExpBattleActUserVo getRankItemVo(ActivityRankItemVo item, ExpBattleActConfigDto config) { - ExpBattleActUserVo userVo = new ExpBattleActUserVo(); - BeanUtils.copyProperties(item, userVo); - userVo.setLevel(getLevelByScore(item.getScore(), config)); - return userVo; - } - - public ExpBattleActUserVo getRankItemVo(Users u, ExpBattleActConfigDto config) { - String rankKey = getRankKey(RankTypeEnum.SEND_TOTAL, null, config); - RScoredSortedSet rank = redissonClient.getScoredSortedSet(rankKey); - Double scoreD = rank.getScore(u.getUid()); - if (null == scoreD){ - scoreD = 0D; - } - - ExpBattleActUserVo userVo = new ExpBattleActUserVo(); - BeanUtils.copyProperties(u, userVo); - userVo.setScore(scoreD.longValue()); - userVo.setLevel(getLevelByScore(scoreD.longValue(), config)); - return userVo; - } - - protected Integer getLevelByScore(long score, ExpBattleActConfigDto config) { - if (0L == score || config.getExpLevelMap().firstKey() > score){ - return 0; - } - Long levelScore = config.getExpLevelMap().headMap(score, true).lastKey(); - return config.getExpLevelMap().get(levelScore); - } - - @Override - protected double getScore(Long uid, RankActConfigDto config, Integer giftId, Integer giftNum, Long totalGoldNum, Date sendGiftTime) { - double score = super.getScore(uid, config, giftId, giftNum, totalGoldNum, sendGiftTime); - if (score <= 0d){ - return score; - } - - VipBaseInfoVO vipBaseInfoVO = VipUtil.getUserBaseVipInfo(uid); - if (null == vipBaseInfoVO){ - return score; - } - - ExpBattleActConfigDto configDto = (ExpBattleActConfigDto) config; - Double vipExpRate = configDto.getVipExpRateMap().get(vipBaseInfoVO.getVipLevel()); - if (null == vipExpRate){ - return score; - } - - score = DoubleUtil.mul(score, vipExpRate); - - log.info("[ExpBattle活动]- 送礼榜 {} 送礼 {} {} 个 总价值 {} 钻石，vip等级 {}， 加成 {} 最终得分 {}", - uid, giftId, giftNum, totalGoldNum, vipBaseInfoVO.getVipLevel(), vipExpRate, score); - - return score; - } - - @Override - protected void logUpdateSendRank(Long uid, Integer giftId, Integer giftNum, Long totalGoldNum, Double score) { - log.info("[ExpBattle活动]- 送礼榜 {} 送礼 {} {} 个 总价值 {} 钻石，增加值 {}", uid, giftId, giftNum, totalGoldNum, score); - - ExpBattleActConfigDto config = getConfig(); - Users u = usersService.getNotNullUsersByUid(uid); - ExpBattleActUserVo rankItemVo = getRankItemVo(u, config); - Integer curLevel = rankItemVo.getLevel(); - long agoScore = DoubleUtil.sub(rankItemVo.getScore().doubleValue(), score).longValue(); - Integer agoLevel = getLevelByScore(agoScore, config); - if (agoLevel.equals(curLevel)){ - return; - } - - //小秘书 - boolean reachRewardLevel = config.getLevelRewardMap().containsKey(curLevel); - I18nAlertEnum alertEnum = reachRewardLevel? I18nAlertEnum.EXP_BATTLE_ACT_REACH_LEVEL: I18nAlertEnum.EXP_BATTLE_ACT_UP_LEVEL; - String content = I18NMessageSourceUtil.getMessage(alertEnum, new Object[]{curLevel}, getPartitionId()); - sendSysMsgService.sendPersonTextMsgWithSkipUrl(SystemConfig.secretaryUid, uid, content, config.getSkipUrl()); - - if (!reachRewardLevel || curLevel < config.getRoomScreenLevel()){ - return; - } - - //公屏 - MessageTemplate messageTemplate = new MessageTemplate(); - Map messageMap = I18NMessageSourceUtil.getMessageMap(I18nAlertEnum.EXP_BATTLE_ACT_REACH_LEVEL_ROOM_SCREEN, new Object[]{u.getNick(), curLevel}); - messageTemplate.setTemplate(messageMap); - messageTemplate.setPartitionId(getPartitionId()); - sendSysMsgService.sendTemplateMessage(messageTemplate); - } - - @Override - protected void logRankReward(RankTypeEnum rankType, String date, String rankKey, Integer rankIndex, Long uid, RewardVo reward) { - log.info("[ExpBattle活动]-收送礼榜 {} 发奖励， 第 {} 名 {} 奖励 {}", rankKey, rankIndex, uid, JSON.toJSONString(reward)); - - ExpBattleActConfigDto config = getConfig(); - String content = I18NMessageSourceUtil.getMessage(I18nAlertEnum.EXP_BATTLE_ACT_RANK_SETTLEMENT, new Object[]{rankIndex + 1}, getPartitionId()); - sendSysMsgService.sendPersonTextMsgWithSkipUrl(SystemConfig.secretaryUid, uid, content, config.getSkipUrl()); - } - - @Override - public RankActConfigDto getRankActConfig() { - return getConfig(); - } - - public ExpBattleActConfigDto getConfig(){ - String configStr = sysConfService.getSysConfValueById(ExpBattleActConstant.SYS_CONF_ID + "_" + getPartitionId()); - if (!StringUtils.hasText(configStr)){ - throw new ServiceException(BusiStatus.ALREADY_NOTEXISTS_CONFIG); - } - return JSON.parseObject(configStr, ExpBattleActConfigDto.class); - } - - protected abstract Integer getPartitionId(); - - @Override - public void afterPropertiesSet() throws Exception { - String statusCacheKey = String.join("_", ExpBattleActConstant.ACT_NAME, "status", getPartitionId().toString()); - statusMap = redissonClient.getMap(statusCacheKey); - } - - public void settlement(ZonedDateTime zonedDateTime, Boolean needFlag) { - RankActConfigDto config = getConfig(); - LocalDateTime localDateTime = zonedDateTime.withZoneSameInstant(ZoneId.of(config.getZoneId())).toLocalDateTime(); - settlement(localDateTime, needFlag); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/handler/AprilFoolsDayBoxHandler.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/handler/AprilFoolsDayBoxHandler.java deleted file mode 100644 index af90f335a..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/handler/AprilFoolsDayBoxHandler.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.accompany.business.fools.handler; - -import cn.hutool.core.util.StrUtil; -import com.accompany.business.activity.dto.ActTaskContext; -import com.accompany.business.activity.handle.IGiftBoxTaskHandler; -import com.accompany.business.activity.model.ActTask; -import com.accompany.business.activity.model.ActTaskCondition; -import com.accompany.business.activity.model.ActUserTask; -import com.accompany.business.fools.task.AprilFoolsDayBoxTaskService; -import com.accompany.business.service.SendSysMsgService; -import com.accompany.business.service.room.RoomService; -import com.accompany.business.vo.message.MessageTemplate; -import com.accompany.common.redis.RedisKey; -import com.accompany.core.model.Room; -import com.accompany.core.model.Users; -import com.accompany.core.service.user.UsersBaseService; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.google.common.collect.ImmutableMap; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import java.util.Collections; -import java.util.Date; - -/** - * @author: liaozetao - * @date: 2024/3/19 15:39 - * @description: - */ -@Slf4j -@Component -public class AprilFoolsDayBoxHandler extends IGiftBoxTaskHandler { - - @Autowired - private RoomService roomService; - - @Autowired - private UsersBaseService usersBaseService; - - @Autowired - private SendSysMsgService sendSysMsgService; - - @Autowired - private AprilFoolsDayBoxTaskService aprilFoolsDayBoxTaskService; - - @Override - protected boolean eq(ActTaskCondition actTaskCondition, ActTaskContext context) { - if (jedisService.exits(RedisKey.act_user_complete_task_status.getKey(context.getGiftSendUuid()))) { - return false; - } - boolean isComplete = super.eq(actTaskCondition, context); - if (isComplete) { - Long roomUid = context.getRoomUid(); - Long uid = context.getSendUid(); - Date startTime = context.getTaskStartTime(); - Date endTime = context.getTaskEndTime(); - ActTask actTask = context.getActTask(); - String activityCode = actTask.getActivityCode(); - String componentCode = actTask.getComponentCode(); - long taskCount = actUserTaskService.count(Wrappers.lambdaQuery() - .eq(ActUserTask::getActivityCode, activityCode) - .eq(ActUserTask::getComponentCode, componentCode) - .eq(ActUserTask::getUid, uid) - .eq(ActUserTask::getStartTime, startTime) - .eq(ActUserTask::getEndTime, endTime) - .between(ActUserTask::getCreateTime, startTime, endTime)); - if (taskCount == 1L) { - if (roomUid != null) { - Room room = roomService.getRoomByUid(roomUid); - Users users = usersBaseService.getUsersByUid(uid); - if (room != null && users != null) { - MessageTemplate messageTemplate = new MessageTemplate(); - messageTemplate.setZh("恭喜[" + users.getNick() + "]成功點亮第一個禮物，再點亮4個禮物就可以觸發幸運之神獲得禮物【愚人慶典】"); - messageTemplate.setContents(Collections.emptyList()); - sendSysMsgService.sendTemplateMessage(room.getRoomId(), roomUid, messageTemplate); - //倒计时一分三十秒还未点亮所有礼物，发送小秘书消息 - Integer timeDuration = actTask.getTimeDuration(); - if (timeDuration != null) { - Date plainTime = new Date(new Date().getTime() + (timeDuration - 90) * 1000L); - aprilFoolsDayBoxTaskService.addTask(activityCode + StrUtil.UNDERLINE + plainTime.getTime(), plainTime, ImmutableMap.of("uid", uid, "activityCode", activityCode)); - } - } - } - } - } - return isComplete; - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/handler/AprilFoolsDayRoomHandler.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/handler/AprilFoolsDayRoomHandler.java deleted file mode 100644 index 115680946..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/handler/AprilFoolsDayRoomHandler.java +++ /dev/null @@ -1,322 +0,0 @@ -package com.accompany.business.fools.handler; - -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.StrUtil; -import com.accompany.business.activity.dto.ActTaskContext; -import com.accompany.business.activity.enums.ActConditionKindEnum; -import com.accompany.business.activity.enums.ActTaskStatusEnum; -import com.accompany.business.activity.handle.IActTaskHandler; -import com.accompany.business.activity.model.ActTask; -import com.accompany.business.activity.model.ActTaskCondition; -import com.accompany.business.activity.model.ActUserTask; -import com.accompany.business.constant.redenvelope.OuterRedEnvelopeTypeEnum; -import com.accompany.business.dto.redenvelope.RedEnvelopeConfig; -import com.accompany.business.enums.message.ContentTypeEnum; -import com.accompany.business.enums.message.ResourceTypeEnum; -import com.accompany.business.enums.redenvelope.RedEnvelopeBizTypeEnum; -import com.accompany.business.model.redenvelope.RedEnvelopeRain; -import com.accompany.business.service.SendSysMsgService; -import com.accompany.business.service.redenvelope.RedEnvelopeRainService; -import com.accompany.business.service.redenvelope.RedEnvelopeService; -import com.accompany.business.service.room.RoomService; -import com.accompany.business.vo.message.FloatingMessageTemplate; -import com.accompany.business.vo.message.MessageTemplate; -import com.accompany.business.vo.message.TextSpan; -import com.accompany.common.config.SystemConfig; -import com.accompany.common.constant.Constant; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.model.Room; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import java.util.Date; -import java.util.List; - -/** - * @author: liaozetao - * @date: 2024/3/20 15:27 - * @description: - */ -@Slf4j -@Component -public class AprilFoolsDayRoomHandler extends IActTaskHandler { - - //0% - private static final int MESSAGE_STATUS_FOR_0 = 0; - - //50% - private static final int MESSAGE_STATUS_FOR_50 = 1; - - //70% - private static final int MESSAGE_STATUS_FOR_70 = 2; - - //100% - private static final int MESSAGE_STATUS_FOR_100 = 3; - - @Autowired - private RoomService roomService; - - @Autowired - private SendSysMsgService sendSysMsgService; - - @Autowired - private RedEnvelopeRainService redEnvelopeRainService; - - @Autowired - private RedEnvelopeService redEnvelopeService; - - @Override - public boolean ge(ActTaskCondition actTaskCondition, ActTaskContext context) { - Long giftValue = context.getGiftValue(); - ActTask actTask = context.getActTask(); - Long roomUid = context.getRoomUid(); - Date startTime = context.getActivityStartTime(); - Date endTime = context.getActivityEndTime(); - Room room = roomService.getRoomByUid(roomUid); - if (room == null) { - return false; - } - Byte isPermitRoom = room.getIsPermitRoom(); - Integer taskValue = actTask.getTaskValue(); - if (taskValue != null && !isPermitRoom.equals(taskValue.byteValue())) { - return false; - } - String activityCode = actTask.getActivityCode(); - String componentCode = actTask.getComponentCode(); - String taskCode = actTask.getTaskCode(); - String conditionCode = actTaskCondition.getConditionCode(); - Long conditionValue = actTaskCondition.getConditionValue(); - if (conditionValue == null) { - return false; - } - ActUserTask actUserTask = new ActUserTask(); - actUserTask.setUid(roomUid); - actUserTask.setActivityCode(activityCode); - actUserTask.setComponentCode(componentCode); - actUserTask.setTaskCode(taskCode); - actUserTask.setConditionCode(conditionCode); - actUserTask.setActivityValue(0L); - actUserTask.setStartTime(startTime); - actUserTask.setEndTime(endTime); - actUserTask.setTaskStatus(ActTaskStatusEnum.PROCESS.ordinal()); - List actUserTasks = actUserTaskService.list(Wrappers.lambdaQuery() - .eq(ActUserTask::getActivityCode, activityCode) - .eq(ActUserTask::getComponentCode, componentCode) - .eq(ActUserTask::getTaskCode, taskCode) - .eq(ActUserTask::getConditionCode, conditionCode) - .eq(ActUserTask::getUid, roomUid) - .eq(ActUserTask::getTaskStatus, ActTaskStatusEnum.PROCESS.ordinal()) - .between(ActUserTask::getCreateTime, startTime, endTime) - .orderByAsc(ActUserTask::getCreateTime)); - if (CollectionUtil.isNotEmpty(actUserTasks)) { - ActUserTask task = actUserTasks.get(0); - actUserTask.setId(task.getId()); - actUserTask.setActivityValue(task.getActivityValue()); - } - Long activityValue = actUserTask.getActivityValue(); - if (giftValue > conditionValue) { - long length = giftValue / conditionValue; - for (int i = 0; i < length; i++) { - ActUserTask diffTask = new ActUserTask(); - diffTask.setUid(roomUid); - diffTask.setActivityCode(activityCode); - diffTask.setComponentCode(componentCode); - diffTask.setTaskCode(taskCode); - diffTask.setConditionCode(conditionCode); - diffTask.setActivityValue(conditionValue); - diffTask.setStartTime(startTime); - diffTask.setEndTime(endTime); - diffTask.setTaskStatus(ActTaskStatusEnum.COMPLETE.ordinal()); - actUserTaskService.save(diffTask); - //发送消息 - sendMessage(activityCode, startTime, endTime, actUserTask.getId(), conditionValue, conditionValue, room); - } - giftValue -= (length * conditionValue); - } - long currentValue = (activityValue + giftValue); - if (currentValue >= conditionValue) { - actUserTask.setActivityValue(conditionValue); - actUserTask.setTaskStatus(ActTaskStatusEnum.COMPLETE.ordinal()); - } else { - actUserTask.setActivityValue(currentValue); - } - actUserTaskService.saveOrUpdate(actUserTask); - //发送消息 - sendMessage(activityCode, startTime, endTime, actUserTask.getId(), currentValue, conditionValue, room); - //差值新增 - if (currentValue >= conditionValue) { - long diffValue = currentValue - conditionValue; - ActUserTask diffTask = new ActUserTask(); - diffTask.setUid(roomUid); - diffTask.setActivityCode(activityCode); - diffTask.setComponentCode(componentCode); - diffTask.setTaskCode(taskCode); - diffTask.setConditionCode(conditionCode); - diffTask.setActivityValue(diffValue); - diffTask.setStartTime(startTime); - diffTask.setEndTime(endTime); - diffTask.setTaskStatus(ActTaskStatusEnum.PROCESS.ordinal()); - actUserTaskService.save(diffTask); - } - return true; - } - - @Override - public void doHandle(ActTaskContext context) { - ActTask actTask = context.getActTask(); - Long roomUid = context.getRoomUid(); - Date startTime = context.getActivityStartTime(); - Date endTime = context.getActivityEndTime(); - Room room = roomService.getRoomByUid(roomUid); - if (room == null) { - return; - } - String activityCode = actTask.getActivityCode(); - String componentCode = actTask.getComponentCode(); - String taskCode = actTask.getTaskCode(); - Integer taskValue = actTask.getTaskValue(); - List actTaskConditions = actTaskConditionService.list(Wrappers.lambdaQuery() - .eq(ActTaskCondition::getActivityCode, activityCode) - .eq(ActTaskCondition::getComponentCode, componentCode) - .eq(ActTaskCondition::getTaskCode, taskCode) - .eq(ActTaskCondition::getConditionKind, ActConditionKindEnum.GE.name())); - if (CollectionUtil.isEmpty(actTaskConditions)) { - return; - } - String redisKey = RedisKey.act_user_task_lock.getKey(activityCode, taskCode, roomUid.toString()); - //若锁超时，直接执行 - String lockVal = jedisService.lock(redisKey, 2 * 60 * 1000); - try { - ActTaskCondition actTaskCondition = actTaskConditions.get(0); - String conditionCode = actTaskCondition.getConditionCode(); - List actUserTasks = actUserTaskService.list(Wrappers.lambdaQuery().eq(ActUserTask::getActivityCode, activityCode).eq(ActUserTask::getComponentCode, componentCode) - .eq(ActUserTask::getTaskCode, taskCode) - .eq(ActUserTask::getConditionCode, conditionCode) - .eq(ActUserTask::getUid, roomUid) - .eq(ActUserTask::getTaskStatus, ActTaskStatusEnum.COMPLETE.ordinal()) - .between(ActUserTask::getCreateTime, startTime, endTime) - .orderByAsc(ActUserTask::getCreateTime)); - if (CollectionUtil.isEmpty(actUserTasks)) { - return; - } - //红包雨 - List redEnvelopeRains = redEnvelopeRainService.getRedEnvelopeRainByPermitType(taskValue); - if (CollectionUtil.isEmpty(redEnvelopeRains)) { - return; - } - Long pushUserId = null; - RedEnvelopeConfig redEnvelopeConfig = redEnvelopeService.redEnvelopeConfig(); - if (redEnvelopeConfig != null) { - pushUserId = redEnvelopeConfig.getPushUserId(); - } - if (pushUserId == null) { - pushUserId = Long.valueOf(SystemConfig.systemMessageUid); - } - for (ActUserTask actUserTask : actUserTasks) { - for (RedEnvelopeRain redEnvelopeRain : redEnvelopeRains) { - redEnvelopeRainService.addRedEnvelope(redEnvelopeRainService.buildRedEnvelope(actUserTask.getId(), RedEnvelopeBizTypeEnum.ACTIVITY.ordinal(), pushUserId, actUserTask.getUid(), OuterRedEnvelopeTypeEnum.DIAMOND_IN_ROOM, redEnvelopeRain)); - } - actUserTask.setTaskStatus(ActTaskStatusEnum.GRANT.ordinal()); - actUserTaskService.updateById(actUserTask); - } - //发红包 - if (!redEnvelopeRainService.isUnderway(roomUid)) { - redEnvelopeRainService.sendRedEnvelope(roomUid); - jedisService.set(RedisKey.act_user_complete_task_status.getKey(context.getRoomUid().toString()), context.getGiftSendUuid(), 5 * 60); - } - } catch (Exception e) { - log.error(e.getMessage(), e); - } finally { - if (StrUtil.isNotEmpty(lockVal)) { - jedisService.unlock(redisKey, lockVal); - } - } - } - - private void sendMessage(String activityCode, Date startTime, Date endTime, Long actUserTaskId, Long activityValue, Long conditionValue, Room room) { - //log.info("activityCode : {}, startTime : {}, endTime : {}", activityCode, startTime, endTime); - //发送消息 - String startTimeStr = DateTimeUtil.convertDate(startTime, DateTimeUtil.ACTIVITY_DATE_HOUR_PATTERN); - String endTimeStr = DateTimeUtil.convertDate(endTime, DateTimeUtil.ACTIVITY_DATE_HOUR_PATTERN); - double percentage = (((double) activityValue / conditionValue) * 100); - int expireTime = (int) ((endTime.getTime() - startTime.getTime()) * 1000); - //若为负数，保留一周 - if (expireTime <= 0) { - expireTime = 7 * 24 * 60 * 60; - } - log.info("sendMessage percentage : {}, expireTime : {}", percentage, expireTime); - if (percentage >= 100) { - String messageKey = RedisKey.act_user_task_message_status.getKey(activityCode, startTimeStr, endTimeStr, String.valueOf(actUserTaskId), String.valueOf(MESSAGE_STATUS_FOR_100)); - if (!jedisService.exits(messageKey)) { - { - //公屏 - MessageTemplate messageTemplate = new MessageTemplate(); - messageTemplate.setZh("恭喜[{roomTitle}]紅包雨將在30秒後開啟，一起來搶禮吧！"); - TextSpan textSpan = new TextSpan(); - textSpan.setZh(room.getTitle()); - textSpan.setKey("roomTitle"); - textSpan.setType(ContentTypeEnum.TEXT.name()); - textSpan.setSkipType(Constant.PayloadSkiptype.room); - textSpan.setSkipContent(String.valueOf(room.getUid())); - messageTemplate.addSpan(textSpan); - sendSysMsgService.sendTemplateMessage(messageTemplate); - } - { - //飘屏 - FloatingMessageTemplate messageTemplate = new FloatingMessageTemplate(); - messageTemplate.setZh("#" + room.getTitle() + "#成功觸發紅包雨快去搶禮吧"); - messageTemplate.setFontSize(12); - messageTemplate.setSkipType(Constant.PayloadSkiptype.room); - messageTemplate.setSkipContent(String.valueOf(room.getUid())); - messageTemplate.setResourceType(ResourceTypeEnum.IMAGE.name()); - messageTemplate.setResourceContent("https://image.hiyoo.fun/bg_1.png"); - messageTemplate.setResourceTop(50); - messageTemplate.setResourceWidth(375); - messageTemplate.setResourceHeight(110); - sendSysMsgService.sendFloatingMessageForBroadcast(messageTemplate); - } - jedisService.setex(messageKey, expireTime, String.valueOf(MESSAGE_STATUS_FOR_100)); - } - } else if (percentage > 70) { - String messageKey = RedisKey.act_user_task_message_status.getKey(activityCode, startTimeStr, endTimeStr, String.valueOf(actUserTaskId), String.valueOf(MESSAGE_STATUS_FOR_70)); - if (!jedisService.exits(messageKey)) { - { - //公屏 - MessageTemplate messageTemplate = new MessageTemplate(); - messageTemplate.setZh("恭喜[{roomTitle}]距離開啟紅包雨已經達到70%啦，還差一點就可以開啟紅包雨啦～"); - TextSpan textSpan = new TextSpan(); - textSpan.setZh(room.getTitle()); - textSpan.setKey("roomTitle"); - textSpan.setType(ContentTypeEnum.TEXT.name()); - textSpan.setSkipType(Constant.PayloadSkiptype.room); - textSpan.setSkipContent(String.valueOf(room.getUid())); - messageTemplate.addSpan(textSpan); - sendSysMsgService.sendTemplateMessage(room.getRoomId(), room.getUid(), messageTemplate); - } - jedisService.setex(messageKey, expireTime, String.valueOf(MESSAGE_STATUS_FOR_70)); - } - } else if (percentage > 50) { - String messageKey = RedisKey.act_user_task_message_status.getKey(activityCode, startTimeStr, endTimeStr, String.valueOf(actUserTaskId), String.valueOf(MESSAGE_STATUS_FOR_50)); - if (!jedisService.exits(messageKey)) { - { - //公屏 - MessageTemplate messageTemplate = new MessageTemplate(); - messageTemplate.setZh("恭喜[{roomTitle}]距離開啟紅包雨已經達到50%啦，加油加油～"); - TextSpan textSpan = new TextSpan(); - textSpan.setZh(room.getTitle()); - textSpan.setKey("roomTitle"); - textSpan.setType(ContentTypeEnum.TEXT.name()); - textSpan.setSkipType(Constant.PayloadSkiptype.room); - textSpan.setSkipContent(String.valueOf(room.getUid())); - messageTemplate.addSpan(textSpan); - sendSysMsgService.sendTemplateMessage(room.getRoomId(), room.getUid(), messageTemplate); - } - jedisService.setex(messageKey, expireTime, String.valueOf(MESSAGE_STATUS_FOR_50)); - } - } - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/listener/AprilFoolsDayRoomRemainZeroListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/listener/AprilFoolsDayRoomRemainZeroListener.java deleted file mode 100644 index 2f5c47a72..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/listener/AprilFoolsDayRoomRemainZeroListener.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.accompany.business.fools.listener; - -import cn.hutool.core.collection.CollectionUtil; -import com.accompany.business.activity.model.ActUserTask; -import com.accompany.business.activity.service.ActUserTaskService; -import com.accompany.business.constant.redenvelope.RedEnvelopStateEnum; -import com.accompany.business.event.redenvelope.RedEnvelopeRemainZeroEvent; -import com.accompany.business.model.redenvelope.RedEnvelopeRainRecord; -import com.accompany.business.service.redenvelope.RedEnvelopeRainRecordService; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import groovy.util.logging.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.stereotype.Component; - -import java.util.List; - -@Slf4j -//@Component -public class AprilFoolsDayRoomRemainZeroListener implements ApplicationListener { - - @Autowired - private RedEnvelopeRainRecordService redEnvelopeRainRecordService; - - @Autowired - private ActUserTaskService actUserTaskService; - - @Override - public void onApplicationEvent(RedEnvelopeRemainZeroEvent event) { - Object source = event.getSource(); - if (source == null) { - return; - } - Long redEnvelopeId = (Long) source; - List list = redEnvelopeRainRecordService.list(Wrappers.lambdaQuery() - .eq(RedEnvelopeRainRecord::getRedEnvelopeId, redEnvelopeId)); - if (CollectionUtil.isEmpty(list)) { - return; - } - RedEnvelopeRainRecord redEnvelopeRainRecord = list.get(0); - Long bizId = redEnvelopeRainRecord.getBizId(); - ActUserTask actUserTask = actUserTaskService.getById(bizId); - actUserTask.setCompleteValue((long) RedEnvelopStateEnum.REMAIN_ZERO.ordinal()); - actUserTaskService.updateById(actUserTask); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/listener/AprilFoolsDayRoomTimeOutBackListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/listener/AprilFoolsDayRoomTimeOutBackListener.java deleted file mode 100644 index e589b0dc3..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/listener/AprilFoolsDayRoomTimeOutBackListener.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.accompany.business.fools.listener; - -import cn.hutool.core.collection.CollectionUtil; -import com.accompany.business.activity.model.ActUserTask; -import com.accompany.business.activity.service.ActUserTaskService; -import com.accompany.business.constant.redenvelope.RedEnvelopStateEnum; -import com.accompany.business.event.redenvelope.RedEnvelopeTimeOutBackEvent; -import com.accompany.business.model.redenvelope.RedEnvelopeRainRecord; -import com.accompany.business.service.redenvelope.RedEnvelopeRainRecordService; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import groovy.util.logging.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.stereotype.Component; - -import java.util.List; - -@Slf4j -//@Component -public class AprilFoolsDayRoomTimeOutBackListener implements ApplicationListener { - - @Autowired - private RedEnvelopeRainRecordService redEnvelopeRainRecordService; - - @Autowired - private ActUserTaskService actUserTaskService; - - @Override - public void onApplicationEvent(RedEnvelopeTimeOutBackEvent event) { - Object source = event.getSource(); - if (source == null) { - return; - } - Long redEnvelopeId = (Long) source; - List list = redEnvelopeRainRecordService.list(Wrappers.lambdaQuery() - .eq(RedEnvelopeRainRecord::getRedEnvelopeId, redEnvelopeId)); - if (CollectionUtil.isEmpty(list)) { - return; - } - RedEnvelopeRainRecord redEnvelopeRainRecord = list.get(0); - Long bizId = redEnvelopeRainRecord.getBizId(); - ActUserTask actUserTask = actUserTaskService.getById(bizId); - actUserTask.setCompleteValue((long) RedEnvelopStateEnum.TIME_OUT_BACK.ordinal()); - actUserTaskService.updateById(actUserTask); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/listener/AprilFoolsDayRoomTimeOutListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/listener/AprilFoolsDayRoomTimeOutListener.java deleted file mode 100644 index bdaa4ee70..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/listener/AprilFoolsDayRoomTimeOutListener.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.accompany.business.fools.listener; - -import cn.hutool.core.collection.CollectionUtil; -import com.accompany.business.activity.model.ActUserTask; -import com.accompany.business.activity.service.ActUserTaskService; -import com.accompany.business.constant.redenvelope.RedEnvelopStateEnum; -import com.accompany.business.event.redenvelope.RedEnvelopeTimeOutEvent; -import com.accompany.business.model.redenvelope.RedEnvelopeRainRecord; -import com.accompany.business.service.redenvelope.RedEnvelopeRainRecordService; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import groovy.util.logging.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.stereotype.Component; - -import java.util.List; - -@Slf4j -//@Component -public class AprilFoolsDayRoomTimeOutListener implements ApplicationListener { - - @Autowired - private RedEnvelopeRainRecordService redEnvelopeRainRecordService; - - @Autowired - private ActUserTaskService actUserTaskService; - - @Override - public void onApplicationEvent(RedEnvelopeTimeOutEvent event) { - Object source = event.getSource(); - if (source == null) { - return; - } - Long redEnvelopeId = (Long) source; - List list = redEnvelopeRainRecordService.list(Wrappers.lambdaQuery() - .eq(RedEnvelopeRainRecord::getRedEnvelopeId, redEnvelopeId)); - if (CollectionUtil.isEmpty(list)) { - return; - } - RedEnvelopeRainRecord redEnvelopeRainRecord = list.get(0); - Long bizId = redEnvelopeRainRecord.getBizId(); - ActUserTask actUserTask = actUserTaskService.getById(bizId); - actUserTask.setCompleteValue((long) RedEnvelopStateEnum.TIME_OUT.ordinal()); - actUserTaskService.updateById(actUserTask); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/service/AprilFoolsDayRoomService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/service/AprilFoolsDayRoomService.java deleted file mode 100644 index 871fd43d2..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/service/AprilFoolsDayRoomService.java +++ /dev/null @@ -1,166 +0,0 @@ -package com.accompany.business.fools.service; - -import cn.hutool.core.collection.CollectionUtil; -import com.accompany.business.activity.enums.ActConditionKindEnum; -import com.accompany.business.activity.enums.ActTaskStatusEnum; -import com.accompany.business.activity.model.ActTask; -import com.accompany.business.activity.model.ActTaskCondition; -import com.accompany.business.activity.model.ActUserTask; -import com.accompany.business.activity.service.ActTaskConditionService; -import com.accompany.business.activity.service.ActTaskService; -import com.accompany.business.activity.service.ActUserTaskService; -import com.accompany.business.fools.vo.AprilFoolsDayRoomVo; -import com.accompany.business.service.redenvelope.RedEnvelopeRainService; -import com.accompany.business.service.room.RoomService; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.base.UidContextHolder; -import com.accompany.core.model.Room; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.*; -import java.util.stream.Collectors; - -/** - * @author: liaozetao - * @date: 2024/3/21 18:16 - * @description: - */ -@Slf4j -@Service -public class AprilFoolsDayRoomService { - - @Autowired - private ActTaskService actTaskService; - - @Autowired - private ActUserTaskService actUserTaskService; - - @Autowired - private ActTaskConditionService actTaskConditionService; - - @Autowired - private RoomService roomService; - - @Autowired - private RedEnvelopeRainService redEnvelopeRainService; - - public List getRooms(String activityCode, String taskCode) { - List actUserTasks = actUserTaskService.list(Wrappers.lambdaQuery() - .eq(ActUserTask::getActivityCode, activityCode) - .eq(ActUserTask::getTaskCode, taskCode)); - if (CollectionUtil.isEmpty(actUserTasks)) { - return Collections.emptyList(); - } - List actTaskConditions = actTaskConditionService.list(Wrappers.lambdaQuery() - .eq(ActTaskCondition::getActivityCode, activityCode) - .eq(ActTaskCondition::getTaskCode, taskCode) - .eq(ActTaskCondition::getConditionKind, ActConditionKindEnum.GE.name())); - if (CollectionUtil.isEmpty(actTaskConditions)) { - return Collections.emptyList(); - } - ActTaskCondition actTaskCondition = actTaskConditions.get(0); - List roomUidList = actUserTasks.stream().map(ActUserTask::getUid).distinct().collect(Collectors.toList()); - if (CollectionUtil.isEmpty(roomUidList)) { - return Collections.emptyList(); - } - Map roomMap = roomService.getRoomMap(roomUidList); - List rooms = new ArrayList<>(); - for (Long roomUid : roomUidList) { - AprilFoolsDayRoomVo aprilFoolsDayRoom = new AprilFoolsDayRoomVo(); - if (roomMap == null || !roomMap.containsKey(roomUid)) { - continue; - } - Room room = roomMap.get(roomUid); - aprilFoolsDayRoom.setRoomUid(roomUid); - aprilFoolsDayRoom.setRoomTitle(room.getTitle()); - aprilFoolsDayRoom.setRoomAvatar(room.getAvatar()); - aprilFoolsDayRoom.setConditionValue(actTaskCondition.getConditionValue()); - List tasks = actUserTasks.stream().filter(v -> Objects.equals(v.getUid(), roomUid) && (Arrays.asList(ActTaskStatusEnum.PROCESS.ordinal(), ActTaskStatusEnum.COMPLETE.ordinal()).contains(v.getTaskStatus()) || (ActTaskStatusEnum.GRANT.ordinal() == v.getTaskStatus() && v.getCompleteValue() == 0))).sorted((a, b) -> { - if (ActTaskStatusEnum.GRANT.ordinal() == a.getTaskStatus()) { - return -1; - } else if (ActTaskStatusEnum.GRANT.ordinal() == b.getTaskStatus()) { - return 1; - } else { - return b.getUpdateTime().compareTo(a.getUpdateTime()); - } - }).collect(Collectors.toList()); - if (CollectionUtil.isNotEmpty(tasks)) { - ActUserTask task = tasks.get(0); - aprilFoolsDayRoom.setActivityValue(task.getActivityValue()); - } - aprilFoolsDayRoom.setIsUnderway(redEnvelopeRainService.isUnderway(roomUid)); - aprilFoolsDayRoom.setIsLive(roomService.isOnline(roomUid)); - rooms.add(aprilFoolsDayRoom); - } - rooms.sort((a, b) -> { - if (a.getIsUnderway() && b.getIsUnderway()) { - if (a.getIsLive() && b.getIsLive()) { - return b.getActivityValue().compareTo(a.getActivityValue()); - } else { - if (a.getIsLive()) { - return -1; - } else if (b.getIsLive()) { - return 1; - } else { - return b.getActivityValue().compareTo(a.getActivityValue()); - } - } - } else { - if (a.getIsUnderway()) { - return -1; - } else if (b.getIsUnderway()) { - return 1; - } else { - if (a.getIsLive() && b.getIsLive()) { - return b.getActivityValue().compareTo(a.getActivityValue()); - } else { - if (a.getIsLive()) { - return -1; - } else if (b.getIsLive()) { - return 1; - } else { - return b.getActivityValue().compareTo(a.getActivityValue()); - } - } - } - } - }); - return rooms; - } - - public Date getTime(String activityCode, String taskCode) { - List actTasks = actTaskService.list(Wrappers.lambdaQuery() - .eq(ActTask::getActivityCode, activityCode) - .eq(ActTask::getTaskCode, taskCode) - .isNull(ActTask::getParentCode)); - if (CollectionUtil.isEmpty(actTasks)) { - return null; - } - ActTask actTask = actTasks.get(0); - String componentCode = actTask.getComponentCode(); - Integer timeDuration = actTask.getTimeDuration(); - Long uid = UidContextHolder.get(); - List actUserTasks = actUserTaskService.list(Wrappers.lambdaQuery() - .eq(ActUserTask::getActivityCode, activityCode) - .eq(ActUserTask::getComponentCode, componentCode) - .eq(ActUserTask::getUid, uid) - .eq(ActUserTask::getTaskStatus, ActTaskStatusEnum.PROCESS.ordinal()) - .orderByDesc(ActUserTask::getUpdateTime)); - if (CollectionUtil.isEmpty(actUserTasks)) { - if (timeDuration != null) { - return null; - } - } - Date now = new Date(); - ActUserTask task = actUserTasks.get(0); - Date startTime = task.getStartTime(); - Date endTime = task.getEndTime(); - if (DateTimeUtil.isBetweenDate(now, startTime, endTime)) { - return task.getEndTime(); - } - return null; - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/task/AprilFoolsDayBoxTaskService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/task/AprilFoolsDayBoxTaskService.java deleted file mode 100644 index ab83e85eb..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/task/AprilFoolsDayBoxTaskService.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.accompany.business.fools.task; - -import cn.hutool.core.collection.CollectionUtil; -import com.accompany.business.activity.model.ActActivity; -import com.accompany.business.activity.service.ActActivityService; -import com.accompany.business.param.neteasepush.NeteaseSendMsgParam; -import com.accompany.business.service.SendSysMsgService; -import com.accompany.common.config.SystemConfig; -import com.accompany.common.constant.Attach; -import com.accompany.common.constant.Constant; -import com.accompany.core.model.Users; -import com.accompany.core.service.task.AbstractTaskService; -import com.accompany.core.service.user.UsersBaseService; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.validation.constraints.NotNull; -import java.util.Date; -import java.util.List; -import java.util.Map; - -/** - * @author: liaozetao - * @date: 2024/3/20 10:17 - * @description: - */ -@Slf4j -@Service -public class AprilFoolsDayBoxTaskService extends AbstractTaskService { - - @Autowired - private UsersBaseService usersBaseService; - - @Autowired - private SendSysMsgService sendSysMsgService; - - @Autowired - private ActActivityService actActivityService; - - @Override - protected void execute(String taskKey, Map params) { - log.info("==== AprilFoolsDayBoxTaskService start ===="); - if (params.isEmpty()) { - return; - } - Date now = new Date(); - Long uid = Long.valueOf(params.get("uid").toString()); - String activityCode = params.get("activityCode").toString(); - List actActivities = actActivityService.list(Wrappers.lambdaQuery() - .eq(ActActivity::getActivityCode, activityCode) - .eq(ActActivity::getActivityStatus, Constant.Yes1No0.YES) - .le(ActActivity::getStartTime, now) - .ge(ActActivity::getEndTime, now)); - if (CollectionUtil.isEmpty(actActivities)) { - return; - } - Users users = usersBaseService.getUsersByUid(uid); - if (users == null) { - return; - } - String nick = users.getNick(); - ActActivity actActivity = actActivities.get(0); - String activityName = actActivity.getActivityName(); - String activityUrl = actActivity.getActivityUrl(); - String message = "[" + nick + "]倒計時就要結束啦，距離幸運之神的光臨就還差一點點啦，加油加油～"; - sendSysMsgService.sendMsg(getNeteaseSendMsgParam(activityName, activityUrl, message, uid)); - log.info("==== AprilFoolsDayBoxTaskService end ===="); - } - - @NotNull - private NeteaseSendMsgParam getNeteaseSendMsgParam(String activityName, String activityUrl, String message, Long uid) { - Attach attach = new Attach(); - attach.setFirst(Constant.DefineProtocol.CUSTOM_MESS_HEAD_SECRETARY); - attach.setSecond(Constant.DefineProtocol.CUSTOM_MESS_SUB_SECRETARY_INTRACTION); - JSONObject jsonObject = new JSONObject(); - jsonObject.put("title", "[" + activityName + "]"); - jsonObject.put("msg", message); - jsonObject.put("routerType", Constant.SecretarySkipType.H5); - jsonObject.put("routerValue", activityUrl); - attach.setData(jsonObject); - NeteaseSendMsgParam neteaseSendMsgParam = new NeteaseSendMsgParam(); - neteaseSendMsgParam.setType(Constant.DefineProtocol.CUSTOM_MESS_DEFINE); - neteaseSendMsgParam.setFrom(SystemConfig.secretaryUid); - neteaseSendMsgParam.setOpe(0); - neteaseSendMsgParam.setTo(String.valueOf(uid)); - neteaseSendMsgParam.setAttach(attach); - return neteaseSendMsgParam; - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/listener/HalloweenDrawBoxGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/listener/HalloweenDrawBoxGiftListener.java deleted file mode 100644 index c3f8464da..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/listener/HalloweenDrawBoxGiftListener.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.accompany.business.halloween.listener; - -import com.accompany.business.event.GiftMessageEvent; -import com.accompany.business.halloween.constant.HalloweenConstant; -import com.accompany.business.halloween.dto.HalloweenDrawConfigDto; -import com.accompany.business.halloween.service.HalloweenDrawBoxService; -import com.accompany.business.halloween.service.HalloweenDrawService; -import com.accompany.business.message.GiftMessage; -import com.accompany.common.utils.DateTimeUtil; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.scheduling.annotation.Async; -import org.springframework.util.CollectionUtils; - -import java.time.LocalDateTime; -import java.util.Comparator; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -@Slf4j -//@Component -public class HalloweenDrawBoxGiftListener implements ApplicationListener { - - @Autowired - private HalloweenDrawService service; - @Autowired - private HalloweenDrawBoxService boxService; - - @Override - @Async - public void onApplicationEvent(GiftMessageEvent giftMessageEvent) { - GiftMessage giftMessage = (GiftMessage) giftMessageEvent.getSource(); - Date sendGiftTime = DateTimeUtil.convertMsToDate(giftMessage.getMessTime()); - LocalDateTime sendGiftLocalDateTime = DateTimeUtil.converDateToLocalDateTime(sendGiftTime); - - HalloweenDrawConfigDto config = service.getConfig(); - if (!config.inActTimeRange(sendGiftLocalDateTime)){ - return; - } - - Integer giftId = giftMessage.getGiftId(); - List giftTaskList = config.getBoxTasks().stream() - .filter(task->task.getGiftIds().contains(giftId)) - .sorted(Comparator.comparing(HalloweenDrawConfigDto.Task::getBoxLevel)) - .collect(Collectors.toList()); - if (CollectionUtils.isEmpty(giftTaskList)){ - return; - } - - // 送礼人Uid - Long sendUid = giftMessage.getSendUid(); - Long receiveUid = giftMessage.getRecvUid(); - Integer giftNum = giftMessage.getGiftNum(); - - for (HalloweenDrawConfigDto.Task task: giftTaskList) { - Long uid = HalloweenConstant.BoxTaskType.SEND.equals(task.getType())? sendUid: receiveUid; - boxService.processTask(task, uid, giftNum); - } - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/listener/HalloweenDrawBoxLuckyBagListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/listener/HalloweenDrawBoxLuckyBagListener.java deleted file mode 100644 index 1756c35a1..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/listener/HalloweenDrawBoxLuckyBagListener.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.accompany.business.halloween.listener; - -import com.accompany.business.event.LuckyBagMessageEvent; -import com.accompany.business.halloween.constant.HalloweenConstant; -import com.accompany.business.halloween.dto.HalloweenDrawConfigDto; -import com.accompany.business.halloween.service.HalloweenDrawBoxService; -import com.accompany.business.halloween.service.HalloweenDrawService; -import com.accompany.business.message.LuckyBagMessage; -import com.accompany.common.utils.DateTimeUtil; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; -import org.springframework.util.CollectionUtils; - -import java.time.LocalDateTime; -import java.util.Comparator; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -@Slf4j -//@Component -public class HalloweenDrawBoxLuckyBagListener implements ApplicationListener { - - @Autowired - private HalloweenDrawService service; - @Autowired - private HalloweenDrawBoxService boxService; - - @Override - @Async - public void onApplicationEvent(LuckyBagMessageEvent luckyBagMessageEvent) { - LuckyBagMessage luckyBagMessage = (LuckyBagMessage) luckyBagMessageEvent.getSource(); - Date sendGiftTime = luckyBagMessage.getCreateTime(); - LocalDateTime sendGiftLocalDateTime = DateTimeUtil.converDateToLocalDateTime(sendGiftTime); - - HalloweenDrawConfigDto config = service.getConfig(); - if (!config.inActTimeRange(sendGiftLocalDateTime)){ - return; - } - - Integer giftId = luckyBagMessage.getLuckyBagId(); - List giftTaskList = config.getBoxTasks().stream() - .filter(task->task.getGiftIds().contains(giftId)) - .sorted(Comparator.comparing(HalloweenDrawConfigDto.Task::getBoxLevel)) - .collect(Collectors.toList()); - if (CollectionUtils.isEmpty(giftTaskList)){ - return; - } - - // 送礼人Uid - Long sendUid = luckyBagMessage.getUid(); - Long receiveUid = luckyBagMessage.getReceiveUid(); - Integer giftNum = 1; - - for (HalloweenDrawConfigDto.Task task: giftTaskList) { - Long uid = HalloweenConstant.BoxTaskType.SEND.equals(task.getType())? sendUid: receiveUid; - boxService.processTask(task, uid, giftNum); - } - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/listener/HalloweenRankGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/listener/HalloweenRankGiftListener.java deleted file mode 100644 index f0ca2d107..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/listener/HalloweenRankGiftListener.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.accompany.business.halloween.listener; - -import com.accompany.business.base.listener.RankGiftListener; -import com.accompany.business.event.GiftMessageEvent; -import com.accompany.business.halloween.service.HalloweenRankService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.context.ApplicationListener; -import org.springframework.scheduling.annotation.Async; - -@Slf4j -//@Component -public class HalloweenRankGiftListener extends RankGiftListener implements ApplicationListener{ - - @Async - @Override - public void onApplicationEvent(GiftMessageEvent giftMessageEvent) { - handleEvent(giftMessageEvent); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/listener/HalloweenTaskGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/listener/HalloweenTaskGiftListener.java deleted file mode 100644 index a7fc9e9d7..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/listener/HalloweenTaskGiftListener.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.accompany.business.halloween.listener; - -import com.accompany.business.base.listener.TaskGiftListener; -import com.accompany.business.event.GiftMessageEvent; -import com.accompany.business.halloween.service.HalloweenTaskService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.context.ApplicationListener; -import org.springframework.scheduling.annotation.Async; - -@Slf4j -//@Component -public class HalloweenTaskGiftListener extends TaskGiftListener implements ApplicationListener { - - @Override - @Async - public void onApplicationEvent(GiftMessageEvent giftMessageEvent) { - handleEvent(giftMessageEvent); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/listener/HalloweenTaskLuckyBagListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/listener/HalloweenTaskLuckyBagListener.java deleted file mode 100644 index 99ed7403b..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/listener/HalloweenTaskLuckyBagListener.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.accompany.business.halloween.listener; - -import com.accompany.business.event.LuckyBagMessageEvent; -import com.accompany.business.halloween.dto.HalloweenTaskConfigDto; -import com.accompany.business.halloween.service.HalloweenTaskService; -import com.accompany.business.message.LuckyBagMessage; -import com.accompany.business.midautumn.dto.MidAutumnTaskConfigDto; -import com.accompany.common.utils.DateTimeUtil; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; -import org.springframework.util.CollectionUtils; - -import java.time.LocalDateTime; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -@Slf4j -//@Component -public class HalloweenTaskLuckyBagListener implements ApplicationListener { - - @Autowired - private HalloweenTaskService service; - - @Async - @Override - public void onApplicationEvent(LuckyBagMessageEvent luckyBagMessageEvent) { - LuckyBagMessage luckyBagMessage = (LuckyBagMessage) luckyBagMessageEvent.getSource(); - Date sendGiftTime = luckyBagMessage.getCreateTime(); - LocalDateTime sendGiftLocalDateTime = DateTimeUtil.converDateToLocalDateTime(sendGiftTime); - - HalloweenTaskConfigDto config = service.getConfig(); - if (!config.inActTimeRange(sendGiftLocalDateTime)){ - return; - } - - Integer luckyBagId = luckyBagMessage.getLuckyBagId(); - List giftLoopTaskList = config.getLoopTask().values().stream() - .filter(task->task.getGiftIds().contains(luckyBagId)) - .collect(Collectors.toList()); - if (CollectionUtils.isEmpty(giftLoopTaskList)){ - return; - } - - // 送礼人Uid - Long sendUid = luckyBagMessage.getUid(); - Integer totalGoldNum = luckyBagMessage.getTotalGoldNum().intValue(); - String sendDate = DateTimeUtil.convertDate(sendGiftTime, DateTimeUtil.DEFAULT_DATE_PATTERN); - - for (MidAutumnTaskConfigDto.LoopTask loopTask: giftLoopTaskList) { - service.processLoopTask(loopTask, sendUid, sendDate, totalGoldNum); - } - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/listener/HalloweenTaskLuckySeaListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/listener/HalloweenTaskLuckySeaListener.java deleted file mode 100644 index ed8fa2ad2..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/listener/HalloweenTaskLuckySeaListener.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.accompany.business.halloween.listener; - -import com.accompany.business.common.dto.TaskActConfigDto; -import com.accompany.business.event.LuckySeaDrawMessageEvent; -import com.accompany.business.halloween.constant.HalloweenConstant; -import com.accompany.business.halloween.dto.HalloweenTaskConfigDto; -import com.accompany.business.halloween.service.HalloweenTaskService; -import com.accompany.business.message.LuckySeaDrawMessage; -import com.accompany.business.midautumn.dto.MidAutumnTaskConfigDto; -import com.accompany.common.utils.DateTimeUtil; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; - -import java.time.LocalDateTime; -import java.util.Date; - -@Slf4j -//@Component -public class HalloweenTaskLuckySeaListener implements ApplicationListener { - - @Autowired - private HalloweenTaskService service; - - @Async - @Override - public void onApplicationEvent(LuckySeaDrawMessageEvent event) { - LuckySeaDrawMessage luckySeaDrawMessage = (LuckySeaDrawMessage) event.getSource(); - Long uid = luckySeaDrawMessage.getUid(); - Date drawTime = luckySeaDrawMessage.getCreateTime(); - LocalDateTime drawLocalDateTime = DateTimeUtil.converDateToLocalDateTime(drawTime); - Integer num = luckySeaDrawMessage.getNum().intValue(); - - HalloweenTaskConfigDto config = service.getConfig(); - if (!config.inActTimeRange(drawLocalDateTime)){ - return; - } - - TaskActConfigDto.LoopTask luckyLoopTask = config.getLoopTask().get(HalloweenConstant.TaskId.LUCKY_SEA); - if (null == luckyLoopTask){ - return; - } - - String date = drawLocalDateTime.format(MidAutumnTaskConfigDto.DATE_FORMATTER); - service.processLoopTask(luckyLoopTask, uid, date, num); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/listener/HalloweenTaskStayRoomListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/listener/HalloweenTaskStayRoomListener.java deleted file mode 100644 index 875dcd723..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/listener/HalloweenTaskStayRoomListener.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.accompany.business.halloween.listener; - -import com.accompany.business.common.dto.TaskActConfigDto; -import com.accompany.business.event.room.UserOutRoomEvent; -import com.accompany.business.halloween.constant.HalloweenConstant; -import com.accompany.business.halloween.dto.HalloweenTaskConfigDto; -import com.accompany.business.halloween.service.HalloweenTaskService; -import com.accompany.business.message.room.UserOutRoomMessage; -import com.accompany.business.service.room.RoomService; -import com.accompany.common.constant.Constant; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.model.Room; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; - -import java.time.LocalDateTime; -import java.util.Date; -import java.util.Objects; - -@Slf4j -//@Component -public class HalloweenTaskStayRoomListener implements ApplicationListener { - - @Autowired - private HalloweenTaskService service; - @Autowired - private RoomService roomService; - - @Async - @Override - public void onApplicationEvent(UserOutRoomEvent event) { - UserOutRoomMessage userOutRoomMessage = (UserOutRoomMessage) event.getSource(); - Date outTime = DateTimeUtil.convertMsToDate(userOutRoomMessage.getOutTimestamp()); - LocalDateTime outLocalDateTime = DateTimeUtil.converDateToLocalDateTime(outTime); - - HalloweenTaskConfigDto config = service.getConfig(); - if (!config.inActTimeRange(outLocalDateTime)){ - return; - } - - Long uid = userOutRoomMessage.getUid(); - Long roomUid = userOutRoomMessage.getRoomUid(); - - if (Objects.equals(uid, roomUid)){ - return; - } - - Room room = roomService.getRoomByUid(roomUid); - if (null == room || !Constant.PermitType.PERMIT_ROOM.equals(room.getIsPermitRoom())){ - return; - } - - String date = DateTimeUtil.convertDate(outTime,DateTimeUtil.DEFAULT_DATE_PATTERN); - int minute = (int) (userOutRoomMessage.getRemainMillisecond() / (1000 * 60)); - if (minute <= 0){ - return; - } - - TaskActConfigDto.DailyTask dailyTask = config.getDailyTask().get(HalloweenConstant.TaskId.STAY_ROOM); - service.processDailyTask(dailyTask, uid, date, minute); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenDrawBoxRecordService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenDrawBoxRecordService.java deleted file mode 100644 index b48c5872c..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenDrawBoxRecordService.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.accompany.business.halloween.service; - -import com.accompany.business.halloween.dto.HalloweenDrawConfigDto; -import com.accompany.business.halloween.model.HalloweenDrawBoxRecord; -import com.accompany.business.mapper.HalloweenDrawBoxRecordDao; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.extern.slf4j.Slf4j; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Service; - -import java.util.Date; - -@Service -@Slf4j -public class HalloweenDrawBoxRecordService extends ServiceImpl { - - - @Async - public void saveRecord(HalloweenDrawConfigDto.Task task, Long uid) { - HalloweenDrawBoxRecord record = new HalloweenDrawBoxRecord(); - record.setBoxLevel(task.getBoxLevel()); - record.setUid(uid); - record.setCreateTime(new Date()); - save(record); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenDrawBoxService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenDrawBoxService.java deleted file mode 100644 index 7e5b703ac..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenDrawBoxService.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.accompany.business.halloween.service; - -import com.accompany.business.halloween.HalloweenBoxLevelDao; -import com.accompany.business.halloween.dto.HalloweenDrawConfigDto; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -@Service -@Slf4j -public class HalloweenDrawBoxService { - - @Autowired - private HalloweenBoxLevelDao boxLevelDao; - @Autowired - private HalloweenDrawBoxRecordService recordService; - - public void processTask(HalloweenDrawConfigDto.Task task, Long uid, Integer process) { - Integer taskId = task.getId(); - String taskKey = buildTaskKey(uid, taskId); - boolean finish = boxLevelDao.processTask(taskKey, task, uid, process); - if (finish) { - log.info("[2023万圣节]-地图 {} 完成宝箱任务 {}", uid, taskId); - recordService.saveRecord(task, uid); - } - } - - protected String buildTaskKey(Long uid, Integer taskId){ - return String.join("_", String.valueOf(uid), String.valueOf(taskId)); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenDrawHighRewardService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenDrawHighRewardService.java deleted file mode 100644 index b18326184..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenDrawHighRewardService.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.accompany.business.halloween.service; - -import com.accompany.business.base.service.BaseLinearDrawRewardActService; -import com.accompany.business.halloween.constant.HalloweenConstant; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -@Service -@Slf4j -public class HalloweenDrawHighRewardService extends BaseLinearDrawRewardActService { - - @Override - protected String getActName() { - return HalloweenConstant.actName + "_" + HalloweenConstant.PoolType.HIGH; - } - - @Override - protected String getActRewardRemark() { - return "[2023万圣节活动]-地图-高级"; - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenDrawLowRewardService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenDrawLowRewardService.java deleted file mode 100644 index 024082cee..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenDrawLowRewardService.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.accompany.business.halloween.service; - -import com.accompany.business.base.service.BaseLinearDrawRewardActService; -import com.accompany.business.halloween.constant.HalloweenConstant; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -@Service -@Slf4j -public class HalloweenDrawLowRewardService extends BaseLinearDrawRewardActService { - - @Override - protected String getActName() { - return HalloweenConstant.actName + "_" + HalloweenConstant.PoolType.LOW; - } - - @Override - protected String getActRewardRemark() { - return "[2023万圣节活动]-地图-初级"; - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenDrawMagicRewardService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenDrawMagicRewardService.java deleted file mode 100644 index 5d530c659..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenDrawMagicRewardService.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.accompany.business.halloween.service; - -import com.accompany.business.base.service.BaseLinearDrawRewardActService; -import com.accompany.business.halloween.constant.HalloweenConstant; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -@Service -@Slf4j -public class HalloweenDrawMagicRewardService extends BaseLinearDrawRewardActService { - - @Override - protected String getActName() { - return HalloweenConstant.actName + "_" + HalloweenConstant.PoolType.MAGIC; - } - - @Override - protected String getActRewardRemark() { - return "[2023万圣节活动]-地图-梦幻"; - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenDrawMiddleRewardService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenDrawMiddleRewardService.java deleted file mode 100644 index 520976d62..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenDrawMiddleRewardService.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.accompany.business.halloween.service; - -import com.accompany.business.base.service.BaseLinearDrawRewardActService; -import com.accompany.business.halloween.constant.HalloweenConstant; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -@Service -@Slf4j -public class HalloweenDrawMiddleRewardService extends BaseLinearDrawRewardActService { - - @Override - protected String getActName() { - return HalloweenConstant.actName + "_" + HalloweenConstant.PoolType.MIDDLE; - } - - @Override - protected String getActRewardRemark() { - return "[2023万圣节活动]-地图-中级"; - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenDrawRecordService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenDrawRecordService.java deleted file mode 100644 index ee6040208..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenDrawRecordService.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.accompany.business.halloween.service; - -import com.accompany.business.common.vo.RewardVo; -import com.accompany.business.halloween.model.HalloweenDrawUserRecord; -import com.accompany.business.halloween.vo.HalloweenDrawUserRecordVo; -import com.accompany.business.mapper.HalloweenDrawRecordDao; -import com.accompany.common.utils.DateTimeUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -@Service -@Slf4j -public class HalloweenDrawRecordService extends ServiceImpl { - - public void addUserRecord(Long uid, List rewardVoList, LocalDateTime now, Integer poolType) { - Date createTime = DateTimeUtil.converLocalDateTimeToDate(now); - List list = new ArrayList<>(); - for (RewardVo vo: rewardVoList) { - HalloweenDrawUserRecord record = new HalloweenDrawUserRecord(); - record.setUid(uid); - record.setPoolType(poolType); - record.setType(vo.getType()); - record.setRefId(vo.getRefId()); - record.setName(vo.getName()); - record.setNum(vo.getNum()); - record.setUnit(vo.getUnit()); - record.setCreateTime(createTime); - list.add(record); - } - saveBatch(list); - } - - public List pageRecord(Long uid, Integer page, Integer size) { - List voList = new ArrayList<>(); - - IPage pageInfo = new Page<>(page, size); - QueryWrapper queryWrapper = Wrappers.query(); - queryWrapper.lambda().eq(HalloweenDrawUserRecord::getUid, uid) - .orderByDesc(HalloweenDrawUserRecord::getId); - page(pageInfo, queryWrapper); - if (CollectionUtils.isEmpty(pageInfo.getRecords())){ - return voList; - } - - for (HalloweenDrawUserRecord entity: pageInfo.getRecords()) { - HalloweenDrawUserRecordVo vo = new HalloweenDrawUserRecordVo(); - vo.setUid(entity.getUid()); - vo.setRewardDesc(entity.getDesc()); - vo.setCreateTime(entity.getCreateTime()); - voList.add(vo); - } - - return voList; - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenDrawRewardService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenDrawRewardService.java deleted file mode 100644 index a807b801c..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenDrawRewardService.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.accompany.business.halloween.service; - -import com.accompany.business.base.service.BaseLinearDrawRewardActService; -import com.accompany.business.base.service.BaseMultiLinearDrawRewardActService; -import com.accompany.business.halloween.constant.HalloweenConstant; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.ServiceException; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -@Service -@Slf4j -public class HalloweenDrawRewardService extends BaseMultiLinearDrawRewardActService { - - @Autowired - private HalloweenDrawLowRewardService lowRewardService; - @Autowired - private HalloweenDrawMiddleRewardService middleRewardService; - @Autowired - private HalloweenDrawHighRewardService highRewardService; - @Autowired - private HalloweenDrawMagicRewardService magicRewardService; - - @Override - protected BaseLinearDrawRewardActService getServiceByPool(Integer poolType) { - if (HalloweenConstant.PoolType.LOW.equals(poolType)){ - return lowRewardService; - } else if (HalloweenConstant.PoolType.MIDDLE.equals(poolType)){ - return middleRewardService; - } else if (HalloweenConstant.PoolType.HIGH.equals(poolType)) { - return highRewardService; - } else if (HalloweenConstant.PoolType.MAGIC.equals(poolType)) { - return magicRewardService; - } - throw new ServiceException(BusiStatus.PARAMERROR); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenDrawService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenDrawService.java deleted file mode 100644 index 3bdaa1772..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenDrawService.java +++ /dev/null @@ -1,170 +0,0 @@ -package com.accompany.business.halloween.service; - -import com.accompany.business.base.service.BaseMultiLinearDrawActService; -import com.accompany.business.common.constant.RewardTypeEnum; -import com.accompany.business.common.dto.MultiLinearDrawActConfigDto; -import com.accompany.business.common.vo.RewardVo; -import com.accompany.business.halloween.HalloweenBoxLevelDao; -import com.accompany.business.halloween.HalloweenCandyNumDao; -import com.accompany.business.halloween.HalloweenMapPosDao; -import com.accompany.business.halloween.constant.HalloweenConstant; -import com.accompany.business.halloween.dto.HalloweenDrawConfigDto; -import com.accompany.business.halloween.vo.HalloweenDrawConfigVo; -import com.accompany.business.halloween.vo.HalloweenDrawResultVo; -import com.accompany.business.halloween.vo.HalloweenDrawUserRecordVo; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.common.utils.RandomUtil; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.service.SysConfService; -import com.alibaba.fastjson.JSON; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; -import org.springframework.util.StringUtils; - -import java.time.LocalDateTime; -import java.time.LocalTime; -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -@Service -@Slf4j -public class HalloweenDrawService extends BaseMultiLinearDrawActService { - - @Autowired - private SysConfService sysConfService; - @Autowired - private HalloweenDrawRecordService recordService; - @Autowired - private HalloweenBoxLevelDao boxLevelDao; - @Autowired - private HalloweenMapPosDao mapPosDao; - - public HalloweenDrawConfigVo getConfigVo(Long uid) { - HalloweenDrawConfigDto configDto = getConfig(); - - HalloweenDrawConfigVo configVo = new HalloweenDrawConfigVo(); - configVo.setStartTime(DateTimeUtil.localDateTime2Date(configDto.getStartTime())); - configVo.setEndTime(DateTimeUtil.localDateTime2Date(configDto.getEndTime())); - configVo.setUid(uid); - configVo.setCandyNum(ticketDao.getUserCurTicketNum(uid)); - - Integer userBoxLevel = boxLevelDao.getUserBoxLevel(uid); - configVo.setBoxLevel(userBoxLevel); - - if (userBoxLevel <= 0){ - configVo.setMapPos(0); - return configVo; - } - - configVo.setMapPos(mapPosDao.getUserMapPos(uid, configDto)); - return configVo; - } - - public HalloweenDrawResultVo drawByBox(Long uid, Integer num, Integer poolType) { - checkBoxLevel(uid, poolType); - - //9-10点换线 - if (HalloweenConstant.PoolType.HIGH.equals(poolType)){ - LocalTime now = LocalTime.now(); - HalloweenDrawConfigDto config = getConfig(); - if (null != config.getMagicStartTime() && now.isAfter(config.getMagicStartTime()) - && null != config.getMagicEndTime() && now.isBefore(config.getMagicEndTime())){ - poolType = HalloweenConstant.PoolType.MAGIC; - } - } - - List rewardVoList = draw(uid, num, poolType); - //todo log - return buildDrawResultVo(uid, num, rewardVoList); - } - - private HalloweenDrawResultVo buildDrawResultVo(Long uid, Integer num, - List rewardVoList) { - List notEmptyRewardVoList = rewardVoList.stream() - .filter(rewardVo-> !RewardTypeEnum.EMPTY.getType().equals(rewardVo.getType())) - .collect(Collectors.toList()); - - boolean hasReward = !CollectionUtils.isEmpty(notEmptyRewardVoList); - List step = move(uid, num, hasReward); - - HalloweenDrawResultVo vo = new HalloweenDrawResultVo(); - vo.setUid(uid); - vo.setHasReward(hasReward); - vo.setRewardList(notEmptyRewardVoList); - vo.setStep(step); - return vo; - } - - private List move(Long uid, Integer num, Boolean hasReward) { - if (null == num){ - mapPosDao.resetPos(uid); - return new ArrayList<>(); - } - - HalloweenDrawConfigDto config = getConfig(); - Integer pos = mapPosDao.getUserMapPos(uid, config); - List map = config.getMap(); - - List nonePosList = new ArrayList<>(); - List posList = new ArrayList<>(); - for (int i = 1; i <= 6; i++) { - int nextPos = (pos + i) % map.size(); - posList.add(nextPos); - Byte gridType = map.get(nextPos); - if (hasReward && HalloweenConstant.GridType.BOX.equals(gridType)){ - mapPosDao.addPos(uid, i); - return posList; - } - if (HalloweenConstant.GridType.NONE.equals(gridType)){ - nonePosList.add(i); - } - } - - int random = RandomUtil.randomByRange(0, nonePosList.size()-1); - Integer i = nonePosList.get(random); - mapPosDao.addPos(uid, i); - return posList.subList(0, i); - } - - private void checkBoxLevel(Long uid, Integer poolType){ - Integer boxLevel = boxLevelDao.getUserBoxLevel(uid); - if (boxLevel <= 0){ - throw new ServiceException(BusiStatus.PARAMERROR, "需要至少開啟一個寶箱才可參与該活動"); - } - if (boxLevel < poolType){ - throw new ServiceException(BusiStatus.BUSIERROR, "已開啟更高級寶箱，請刷新頁面"); - } - } - - public List pageRecord(Long uid, Integer page, Integer size) { - return recordService.pageRecord(uid, page, size); - } - - @Override - protected String getActName() { - return HalloweenConstant.actName; - } - - @Override - protected void addUserRecord(Long uid, List rewardVoList, LocalDateTime now, Integer poolType) { - recordService.addUserRecord(uid, rewardVoList, now, poolType); - } - - @Override - protected MultiLinearDrawActConfigDto getDrawActConfig() { - return getConfig(); - } - - public HalloweenDrawConfigDto getConfig(){ - String configStr = sysConfService.getSysConfValueById(HalloweenConstant.SysConfId.ACT_DRAW_CONFIG); - if (!StringUtils.hasText(configStr)){ - throw new ServiceException(BusiStatus.ALREADY_NOTEXISTS_CONFIG); - } - return JSON.parseObject(configStr, HalloweenDrawConfigDto.class); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenRankService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenRankService.java deleted file mode 100644 index 8aee20d45..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenRankService.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.accompany.business.halloween.service; - -import com.accompany.business.base.rankobj.UsersRankObjectProvider; -import com.accompany.business.base.service.BaseRankActService; -import com.accompany.business.common.constant.RankTypeEnum; -import com.accompany.business.common.dto.RankActConfigDto; -import com.accompany.business.common.vo.ActivityRankVo; -import com.accompany.business.common.vo.RewardVo; -import com.accompany.business.halloween.constant.HalloweenConstant; -import com.accompany.business.halloween.dto.HalloweenRankConfigDto; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.service.SysConfService; -import com.alibaba.fastjson.JSON; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; - -@Service -@Slf4j -public class HalloweenRankService extends BaseRankActService { - - @Autowired - private SysConfService sysConfService; - - @Override - protected String getActName() { - return HalloweenConstant.actName; - } - - public ActivityRankVo getRank(Long uid, RankTypeEnum rankType, String date) { - return super.getRank(uid, rankType, date, 30); - } - - @Override - protected void logUpdateSendRank(Long uid, Integer giftId, Integer giftNum, Long totalGoldNum, Double score) { - log.info("[2023万圣节活动]- 送礼榜 {} 收礼 {} {} 个 总价值 {} 钻石，增加值 {}", uid, giftId, giftNum, totalGoldNum, score); - } - - @Override - protected void logUpdateReceiveRank(Long uid, Integer giftId, Integer giftNum, Long totalGoldNum, Double score) { - log.info("[2023万圣节活动]- 收礼榜 {} 收礼 {} {} 个总价值 {} 钻石，增加值 {}", uid, giftId, giftNum, totalGoldNum, score); - } - - @Override - protected void logRankReward(RankTypeEnum rankType, String date, String rankKey, Integer rankIndex, Long uid, RewardVo reward) { - log.info("[2023万圣节活动]-收送礼榜 {} 发奖励， 第 {} 名 {} 奖励 {}", rankKey, rankIndex, uid, JSON.toJSONString(reward)); - } - - @Override - public RankActConfigDto getRankActConfig() { - return getConfig(); - } - - public HalloweenRankConfigDto getConfig(){ - String configStr = sysConfService.getSysConfValueById(HalloweenConstant.SysConfId.ACT_RANK_CONFIG); - if (!StringUtils.hasText(configStr)){ - throw new ServiceException(BusiStatus.ALREADY_NOTEXISTS_CONFIG); - } - return JSON.parseObject(configStr, HalloweenRankConfigDto.class); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenTaskRecordService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenTaskRecordService.java deleted file mode 100644 index 166b97bca..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenTaskRecordService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.accompany.business.halloween.service; - -import com.accompany.business.halloween.HalloweenTicketTaskDao; -import com.accompany.business.halloween.model.HalloweenTaskRecord; -import com.accompany.business.mapper.HalloweenTaskRecordDao; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -@Service -@Slf4j -public class HalloweenTaskRecordService extends ServiceImpl { - - @Autowired - private HalloweenTicketTaskDao dao; - - public void writeDb() { - List dailyTaskRecord = new ArrayList<>(); - Map dailyTaskMap = dao.getAllUserDailyTaskProgress(); - for (String key: dailyTaskMap.keySet()) { - String[] keys = key.split("_"); - Long uid = Long.parseLong(keys[0]); - String date = keys[1]; - Integer taskId = Integer.parseInt(keys[2]); - Integer proc = dailyTaskMap.get(key); - - HalloweenTaskRecord record = new HalloweenTaskRecord(); - record.setDate(date); - record.setUid(uid); - record.setTaskId(taskId); - record.setType((byte) 1); - record.setProc(proc); - dailyTaskRecord.add(record); - } - saveBatch(dailyTaskRecord); - - List loopTaskRecord = new ArrayList<>(); - Map loopTaskMap = dao.getAllUserLoopTaskProgress(); - for (String key: loopTaskMap.keySet()) { - String[] keys = key.split("_"); - Long uid = Long.parseLong(keys[0]); - String date = keys[1]; - Integer taskId = Integer.parseInt(keys[2]); - Integer proc = loopTaskMap.get(key); - - HalloweenTaskRecord record = new HalloweenTaskRecord(); - record.setDate(date); - record.setUid(uid); - record.setTaskId(taskId); - record.setType((byte) 2); - record.setProc(proc); - loopTaskRecord.add(record); - } - saveBatch(loopTaskRecord); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenTaskService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenTaskService.java deleted file mode 100644 index 1a1fdf5ce..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/service/HalloweenTaskService.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.accompany.business.halloween.service; - -import com.accompany.business.base.service.BaseTicketTaskActService; -import com.accompany.business.common.dto.TaskActConfigDto; -import com.accompany.business.halloween.HalloweenCandyNumDao; -import com.accompany.business.halloween.HalloweenTicketTaskDao; -import com.accompany.business.halloween.constant.HalloweenConstant; -import com.accompany.business.halloween.dto.HalloweenTaskConfigDto; -import com.accompany.business.halloween.vo.HalloweenTaskConfigVo; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.service.SysConfService; -import com.alibaba.fastjson.JSON; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; - -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; - -@Service -@Slf4j -public class HalloweenTaskService extends BaseTicketTaskActService { - - @Autowired - private SysConfService sysConfService; - private final DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern(DateTimeUtil.DEFAULT_DATE_PATTERN); - - - public HalloweenTaskConfigVo getConfigVo(Long uid){ - HalloweenTaskConfigDto dto = getConfig(); - - LocalDateTime now = LocalDateTime.now(); - String date = now.format(dateFormatter); - - if (dto.inActTimeRange(now)){ - TaskActConfigDto.DailyTask dailyTask = dto.getDailyTask().get(HalloweenConstant.TaskId.VISIT); - processDailyTask(dailyTask, uid, date, 1); - } - - HalloweenTaskConfigVo vo = new HalloweenTaskConfigVo(); - vo.setUid(uid); - vo.setStartTime(DateTimeUtil.localDateTime2Date(dto.getStartTime())); - vo.setEndTime(DateTimeUtil.localDateTime2Date(dto.getEndTime())); - vo.setCandyNum(ticketDao.getUserCurTicketNum(uid)); - - vo.setDailyTaskList(listUserDailyTaskVo(uid, date, dto.getDailyTask())); - vo.setLoopTaskList(listUserLoopTaskVo(uid, date, dto.getLoopTask())); - - return vo; - } - - @Override - protected void logAfterFinishDailyTask(Long uid, String date, Integer taskId, Integer reward, Integer curTicket) { - log.info("[2023万圣节]-任务 {} 在 {} 完成 {} 每日任务，获得 {} 糖果， 当前拥有 {} 糖果", uid, date, taskId, reward, curTicket); - } - - @Override - protected void logAfterFinishLoopTask(Long uid, String date, Integer taskId, Integer reward, Integer curTicket) { - log.info("[2023万圣节]-任务 {} 在 {} 完成 {} 循环任务，获得 {} 糖果， 当前拥有 {} 糖果", uid, date, taskId, reward, curTicket); - } - - public HalloweenTaskConfigDto getConfig(){ - String configStr = sysConfService.getSysConfValueById(HalloweenConstant.SysConfId.ACT_TASK_CONFIG); - if (!StringUtils.hasText(configStr)){ - throw new ServiceException(BusiStatus.ALREADY_NOTEXISTS_CONFIG); - } - return JSON.parseObject(configStr, HalloweenTaskConfigDto.class); - } - - @Override - public TaskActConfigDto getTaskActConfig() { - return getConfig(); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/hotlove/handler/ActHotLoveForReceiveHandler.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/hotlove/handler/ActHotLoveForReceiveHandler.java deleted file mode 100644 index 9eb92dbb6..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/hotlove/handler/ActHotLoveForReceiveHandler.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.accompany.business.hotlove.handler; - -import com.accompany.business.activity.dto.ActTaskContext; -import com.accompany.business.activity.handle.IActTaskHandler; -import com.accompany.business.activity.model.ActTask; -import com.accompany.business.activity.model.ActTaskCondition; -import com.accompany.business.service.SendSysMsgService; -import com.accompany.business.service.room.RoomService; -import com.accompany.business.vo.message.MessageTemplate; -import com.accompany.common.redis.RedisKey; -import com.accompany.core.model.Room; -import com.accompany.core.model.Users; -import com.accompany.core.service.user.UsersBaseService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import java.util.Collections; - -/** - * @author: liaozetao - * @date: 2024/5/10 16:01 - * @description: - */ -@Slf4j -@Component -public class ActHotLoveForReceiveHandler extends IActTaskHandler { - - @Autowired - private RoomService roomService; - - @Autowired - private UsersBaseService usersBaseService; - - @Autowired - private SendSysMsgService sendSysMsgService; - - @Override - protected boolean eq(ActTaskCondition actTaskCondition, ActTaskContext context) { - //保留半个月 - int HALF_MONTH = 15 * 24 * 60 * 60; - ActTask actTask = context.getActTask(); - Integer taskValue = actTask.getTaskValue(); - Integer giftId = context.getGiftId(); - Long receiveUid = context.getReceiveUid(); - log.info("receiveUid : {}, giftId : {}, conditionValue : {}", receiveUid, giftId, actTaskCondition.getConditionValue()); - if (giftId != null && !Long.valueOf(giftId).equals(actTaskCondition.getConditionValue())) { - return false; - } - String redisKey = RedisKey.act_user_task_extra_data.getKey(); - jedisService.hincrBy(redisKey, String.valueOf(receiveUid), Long.valueOf(taskValue)); - jedisService.expire(redisKey, HALF_MONTH); - if (taskValue > 0) { - Users users = usersBaseService.getUsersByUid(receiveUid); - Room room = roomService.getRoomByUid(context.getRoomUid()); - MessageTemplate messageTemplate = new MessageTemplate(); - messageTemplate.setMessage("恭喜！[" + users.getNick() + "]在全城熱戀活動中獲得熱戀幣" + taskValue + "個，快去熱戀商店兌換心動商品吧～"); - messageTemplate.setContents(Collections.emptyList()); - sendSysMsgService.sendTemplateMessage(room.getRoomId(), context.getRoomUid(), messageTemplate); - } - return super.eq(actTaskCondition, context); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/hotlove/handler/ActHotLoveForSendHandler.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/hotlove/handler/ActHotLoveForSendHandler.java deleted file mode 100644 index 444891fb0..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/hotlove/handler/ActHotLoveForSendHandler.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.accompany.business.hotlove.handler; - -import com.accompany.business.activity.dto.ActTaskContext; -import com.accompany.business.activity.handle.IActTaskHandler; -import com.accompany.business.activity.model.ActTask; -import com.accompany.business.activity.model.ActTaskCondition; -import com.accompany.business.service.SendSysMsgService; -import com.accompany.business.service.room.RoomService; -import com.accompany.business.vo.message.MessageTemplate; -import com.accompany.common.redis.RedisKey; -import com.accompany.core.model.Room; -import com.accompany.core.model.Users; -import com.accompany.core.service.user.UsersBaseService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import java.util.Collections; - -/** - * @author: liaozetao - * @date: 2024/5/10 15:12 - * @description: - */ -@Slf4j -@Component -public class ActHotLoveForSendHandler extends IActTaskHandler { - - @Autowired - private RoomService roomService; - - @Autowired - private UsersBaseService usersBaseService; - - @Autowired - private SendSysMsgService sendSysMsgService; - - @Override - protected boolean eq(ActTaskCondition actTaskCondition, ActTaskContext context) { - //保留半个月 - int HALF_MONTH = 15 * 24 * 60 * 60; - ActTask actTask = context.getActTask(); - Integer taskValue = actTask.getTaskValue(); - Integer giftId = context.getGiftId(); - Long sendUid = context.getSendUid(); - log.info("sendUid : {}, giftId : {}, conditionValue : {}", sendUid, giftId, actTaskCondition.getConditionValue()); - if (giftId != null && !Long.valueOf(giftId).equals(actTaskCondition.getConditionValue())) { - return false; - } - String redisKey = RedisKey.act_user_task_extra_data.getKey(); - jedisService.hincrBy(redisKey, String.valueOf(sendUid), Long.valueOf(taskValue)); - jedisService.expire(redisKey, HALF_MONTH); - if (taskValue > 0) { - Users users = usersBaseService.getUsersByUid(sendUid); - Room room = roomService.getRoomByUid(context.getRoomUid()); - MessageTemplate messageTemplate = new MessageTemplate(); - messageTemplate.setMessage("恭喜！[" + users.getNick() + "]在全城熱戀活動中獲得熱戀幣" + taskValue + "個，快去熱戀商店兌換心動商品吧～"); - messageTemplate.setContents(Collections.emptyList()); - sendSysMsgService.sendTemplateMessage(room.getRoomId(), context.getRoomUid(), messageTemplate); - } - return super.eq(actTaskCondition, context); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/hotlove/service/ActHotLoveService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/hotlove/service/ActHotLoveService.java deleted file mode 100644 index b5f995ca1..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/hotlove/service/ActHotLoveService.java +++ /dev/null @@ -1,209 +0,0 @@ -package com.accompany.business.hotlove.service; - -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.StrUtil; -import com.accompany.business.activity.dto.ActRewardContext; -import com.accompany.business.activity.enums.ActTaskStatusEnum; -import com.accompany.business.activity.model.*; -import com.accompany.business.activity.service.*; -import com.accompany.business.activity.strategy.ActRewardFactory; -import com.accompany.business.activity.vo.ActTaskRewardVo; -import com.accompany.business.activity.vo.ActivityReward; -import com.accompany.common.constant.Constant; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.base.UidContextHolder; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.service.common.JedisService; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.*; -import java.util.stream.Collectors; - -/** - * @author: liaozetao - * @date: 2024/5/10 14:41 - * @description: - */ -@Slf4j -@Service -public class ActHotLoveService { - - @Autowired - private JedisService jedisService; - - @Autowired - private ActActivityService actActivityService; - - @Autowired - private ActTaskService actTaskService; - - @Autowired - private ActUserTaskService actUserTaskService; - - @Autowired - private ActTaskRewardService actTaskRewardService; - - @Autowired - private ActTaskRewardStockService actTaskRewardStockService; - - public Integer currency(String redisKey) { - Long uid = UidContextHolder.get(); - String currencyStr = jedisService.hget(RedisKey.getCacheSign() + redisKey, String.valueOf(uid)); - if (StrUtil.isEmpty(currencyStr)) { - return 0; - } - return Integer.valueOf(currencyStr); - } - - @Transactional(rollbackFor = Exception.class) - public void exchange(String activityCode, String taskCode, String conditionCode) { - Long uid = UidContextHolder.get(); - Date now = new Date(); - Date endTime = DateTimeUtil.getBeginTimeOfDay(DateTimeUtil.addDays(now, 1)); - List actActivities = actActivityService.list(Wrappers.lambdaQuery() - .eq(ActActivity::getActivityStatus, Constant.Yes1No0.YES) - .eq(ActActivity::getActivityCode, activityCode) - .le(ActActivity::getStartTime, now) - .ge(ActActivity::getEndTime, now)); - if (CollectionUtil.isEmpty(actActivities)) { - return; - } - List actTasks = actTaskService.list(Wrappers.lambdaQuery() - .eq(ActTask::getActivityCode, activityCode) - .eq(ActTask::getTaskCode, taskCode)); - if (CollectionUtil.isEmpty(actTasks)) { - return; - } - //兑换所需热恋币数 - ActTask actTask = actTasks.get(0); - String componentCode = actTask.getComponentCode(); - Integer taskValue = actTask.getTaskValue(); - //当前用户热恋币余额 - Integer currency = currency(RedisKey.act_user_task_extra_data.name()); - if (currency < taskValue) { - throw new ServiceException(BusiStatus.UNENOUGH_ACT_PROP_ITEM); - } - List actTaskRewards = actTaskRewardService.list(Wrappers.lambdaQuery() - .eq(ActTaskReward::getActivityCode, activityCode) - .eq(ActTaskReward::getTaskCode, taskCode) - .eq(ActTaskReward::getConditionCode, conditionCode)); - if (CollectionUtil.isEmpty(actTaskRewards)) { - return; - } - //奖品 - ActTaskReward actTaskReward = actTaskRewards.get(0); - String rewardType = actTaskReward.getRewardType(); - jedisService.hincrBy(RedisKey.act_user_task_extra_data.getKey(), String.valueOf(uid), (long) -taskValue); - //库存扣减 - List actTaskRewardStocks = actTaskRewardStockService.list(Wrappers.lambdaQuery() - .eq(ActTaskRewardStock::getActivityCode, activityCode) - .eq(ActTaskRewardStock::getTaskCode, taskCode) - .eq(ActTaskRewardStock::getConditionCode, conditionCode) - .le(ActTaskRewardStock::getEndTime, endTime)); - if (CollectionUtil.isNotEmpty(actTaskRewardStocks)) { - //判断库存 - long stockValue = actTaskRewardStocks.stream().map(v -> v.getStockValue() - v.getExchangeValue()).count(); - if (stockValue <= 0) { - throw new ServiceException(BusiStatus.STOCK_NOT_ENOUGH); - } - //更新兑换记录 - Optional any = actTaskRewardStocks.stream().filter(v -> now.after(v.getStartTime()) && now.before(v.getEndTime())).findAny(); - if (any.isPresent()) { - ActTaskRewardStock actTaskRewardStock = any.get(); - actTaskRewardStock.setExchangeValue(actTaskRewardStock.getExchangeValue() + 1); - actTaskRewardStockService.updateById(actTaskRewardStock); - } - } - //完成兑换任务 - ActUserTask actUserTask = new ActUserTask(); - actUserTask.setUid(uid); - actUserTask.setActivityCode(activityCode); - actUserTask.setComponentCode(componentCode); - actUserTask.setTaskCode(taskCode); - actUserTask.setConditionCode(conditionCode); - actUserTask.setActivityValue(1L); - actUserTask.setStartTime(now); - actUserTask.setEndTime(endTime); - actUserTask.setTaskStatus(ActTaskStatusEnum.GRANT.ordinal()); - actUserTaskService.save(actUserTask); - //自动发放 - ActRewardContext context = new ActRewardContext(); - context.setUid(uid); - context.setReward(actTaskReward); - context.setTask(actUserTask); - ActRewardFactory.getReward(rewardType).grant(context); - } - - public List rewardList(String activityCode, String componentCode) { - Date now = new Date(); - Long uid = UidContextHolder.get(); - List actActivities = actActivityService.list(Wrappers.lambdaQuery() - .eq(ActActivity::getActivityCode, activityCode)); - if (CollectionUtil.isEmpty(actActivities)) { - return Collections.emptyList(); - } - ActActivity actActivity = actActivities.get(0); - List actTaskRewards = actTaskRewardService.list(Wrappers.lambdaQuery() - .eq(ActTaskReward::getActivityCode, activityCode) - .eq(ActTaskReward::getComponentCode, componentCode) - .orderByAsc(ActTaskReward::getId)); - if (CollectionUtil.isEmpty(actTaskRewards)) { - return Collections.emptyList(); - } - List rewards = new ArrayList<>(); - //任务 - List actTasks = actTaskService.list(Wrappers.lambdaQuery() - .eq(ActTask::getActivityCode, activityCode) - .eq(ActTask::getComponentCode, componentCode)); - //用户记录 - List actUserTasks = actUserTaskService.list(Wrappers.lambdaQuery() - .eq(ActUserTask::getActivityCode, activityCode) - .eq(ActUserTask::getComponentCode, componentCode) - .eq(ActUserTask::getUid, uid)); - //库存记录 - List actTaskRewardStocks = actTaskRewardStockService.list(Wrappers.lambdaQuery() - .eq(ActTaskRewardStock::getActivityCode, activityCode) - .eq(ActTaskRewardStock::getComponentCode, componentCode)); - for (ActTaskReward actTaskReward : actTaskRewards) { - ActTaskRewardVo reward = new ActTaskRewardVo(); - BeanUtils.copyProperties(actTaskReward, reward); - ActRewardContext context = new ActRewardContext(); - context.setUid(uid); - context.setReward(actTaskReward); - ActivityReward activityReward = ActRewardFactory.getReward(actTaskReward.getRewardType()).getReward(context); - reward.setRewardName(activityReward.getRewardName()); - reward.setRewardIcon(activityReward.getRewardIcon()); - reward.setShowValue(activityReward.getShowValue()); - if (CollectionUtil.isNotEmpty(actUserTasks)) { - reward.setIsExchange(actUserTasks.stream().anyMatch(v -> v.getTaskCode().equals(actTaskReward.getTaskCode()) && v.getComponentCode().equals(actTaskReward.getComponentCode()) && v.getConditionCode().equals(actTaskReward.getConditionCode()) && now.after(v.getStartTime()) && now.before(v.getEndTime()))); - } - if (CollectionUtil.isNotEmpty(actTasks)) { - Optional any = actTasks.stream().filter(v -> v.getTaskCode().equals(actTaskReward.getTaskCode())).findAny(); - if (any.isPresent()) { - ActTask actTask = any.get(); - reward.setTaskValue(actTask.getTaskValue()); - } - } - if (CollectionUtil.isNotEmpty(actTaskRewardStocks)) { - Date endTime = DateTimeUtil.getBeginTimeOfDay(DateTimeUtil.addDays(now, 1)); - List stocks = actTaskRewardStocks.stream().filter(v -> v.getTaskCode().equals(actTaskReward.getTaskCode()) && v.getComponentCode().equals(actTaskReward.getComponentCode()) && v.getConditionCode().equals(actTaskReward.getConditionCode()) && now.after(actActivity.getStartTime()) && now.before(endTime) && (v.getEndTime().equals(endTime) || v.getEndTime().before(endTime))).collect(Collectors.toList()); - if (CollectionUtil.isNotEmpty(stocks)) { - int stock = stocks.stream().mapToInt(v -> v.getStockValue() - v.getExchangeValue()).sum(); - reward.setStockValue(stock); - } else { - //默认99库存 - reward.setStockValue(99); - } - } - rewards.add(reward); - } - return rewards; - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/luckyprocessbar/listener/LuckyProcessBarGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/luckyprocessbar/listener/LuckyProcessBarGiftListener.java deleted file mode 100644 index 1f8cebd2b..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/luckyprocessbar/listener/LuckyProcessBarGiftListener.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.accompany.business.luckyprocessbar.listener; - -import com.accompany.business.event.GiftMessageEvent; -import com.accompany.business.luckyprocessbar.dto.LuckyProcessBarConfigDto; -import com.accompany.business.luckyprocessbar.service.LuckyProcessBarService; -import com.accompany.business.message.GiftMessage; -import com.accompany.common.utils.DateTimeUtil; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.scheduling.annotation.Async; -import org.springframework.util.CollectionUtils; - -import java.time.LocalDateTime; -import java.util.Date; - -@Slf4j -//@Component -public class LuckyProcessBarGiftListener implements ApplicationListener { - - @Autowired - private LuckyProcessBarService service; - - @Override - @Async - public void onApplicationEvent(GiftMessageEvent giftMessageEvent) { - GiftMessage giftMessage = (GiftMessage) giftMessageEvent.getSource(); - Date sendGiftTime = DateTimeUtil.convertMsToDate(giftMessage.getMessTime()); - LocalDateTime sendGiftLocalDateTime = DateTimeUtil.converDateToLocalDateTime(sendGiftTime); - - LuckyProcessBarConfigDto config = service.getConfig(); - if (!config.inActTimeRange(sendGiftLocalDateTime)){ - return; - } - - Integer giftId = giftMessage.getGiftId(); - if (CollectionUtils.isEmpty(config.getGiftIds()) || !config.getGiftIds().contains(giftId)) { - return; - } - - // 送礼人Uid - Long sendUid = giftMessage.getSendUid(); - String giftRecordId = giftMessage.getMessId(); - Integer giftNum = giftMessage.getGiftNum(); - - service.process(config, sendUid, giftRecordId, giftId, giftNum); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/luckyprocessbar/service/LuckyProcessBarRewardRecordService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/luckyprocessbar/service/LuckyProcessBarRewardRecordService.java deleted file mode 100644 index 8e425fc3f..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/luckyprocessbar/service/LuckyProcessBarRewardRecordService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.accompany.business.luckyprocessbar.service; - -import com.accompany.business.doubleeleven.DoubleElevenTaskDao; -import com.accompany.business.doubleeleven.model.DoubleElevenTaskRecord; -import com.accompany.business.mapper.DoubleElevenTaskRecordDao; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -@Service -@Slf4j -public class LuckyProcessBarRewardRecordService extends ServiceImpl { - - @Autowired - private DoubleElevenTaskDao dao; - - public void writeDb() { - List dailyTaskRecord = new ArrayList<>(); - Map dailyTaskMap = dao.getAllUserDailyTaskProgress(); - for (String key: dailyTaskMap.keySet()) { - String[] keys = key.split("_"); - Long uid = Long.parseLong(keys[0]); - String date = keys[1]; - Integer taskId = Integer.parseInt(keys[2]); - Integer proc = dailyTaskMap.get(key); - - DoubleElevenTaskRecord record = new DoubleElevenTaskRecord(); - record.setDate(date); - record.setUid(uid); - record.setTaskId(taskId); - record.setType((byte) 1); - record.setProc(proc); - dailyTaskRecord.add(record); - } - saveBatch(dailyTaskRecord); - - List loopTaskRecord = new ArrayList<>(); - Map loopTaskMap = dao.getAllUserLoopTaskProgress(); - for (String key: loopTaskMap.keySet()) { - String[] keys = key.split("_"); - Long uid = Long.parseLong(keys[0]); - String date = keys[1]; - Integer taskId = Integer.parseInt(keys[2]); - Integer proc = loopTaskMap.get(key); - - DoubleElevenTaskRecord record = new DoubleElevenTaskRecord(); - record.setDate(date); - record.setUid(uid); - record.setTaskId(taskId); - record.setType((byte) 2); - record.setProc(proc); - loopTaskRecord.add(record); - } - saveBatch(loopTaskRecord); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/luckyprocessbar/service/LuckyProcessBarService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/luckyprocessbar/service/LuckyProcessBarService.java deleted file mode 100644 index 4d79240ec..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/luckyprocessbar/service/LuckyProcessBarService.java +++ /dev/null @@ -1,147 +0,0 @@ -package com.accompany.business.luckyprocessbar.service; - -import com.accompany.business.common.dto.RewardDto; -import com.accompany.business.common.vo.ActivityUserVo; -import com.accompany.business.luckyprocessbar.constant.LuckyProcessBarConstant; -import com.accompany.business.luckyprocessbar.dto.LuckyProcessBarConfigDto; -import com.accompany.business.luckyprocessbar.vo.LuckyProcessBarConfigVo; -import com.accompany.business.service.SendSysMsgService; -import com.accompany.business.service.user.UsersService; -import com.accompany.business.util.RewardUtil; -import com.accompany.common.config.SystemConfig; -import com.accompany.common.constant.AppEnum; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.model.Users; -import com.accompany.core.service.SysConfService; -import com.alibaba.fastjson.JSON; -import lombok.extern.slf4j.Slf4j; -import org.redisson.api.RAtomicLong; -import org.redisson.api.RMap; -import org.redisson.api.RedissonClient; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; -import org.springframework.util.StringUtils; - -import java.util.Collections; -import java.util.Map; -import java.util.stream.Collectors; - -@Service -@Slf4j -public class LuckyProcessBarService implements InitializingBean { - - @Autowired - private RedissonClient redissonClient; - - private RAtomicLong process; - private RMap luckyUserMap; - - @Autowired - private SysConfService sysConfService; - @Autowired - private UsersService usersService; - @Autowired - private RewardUtil rewardUtil; - @Autowired - private SendSysMsgService sendSysMsgService; - - @Async - public void sendSecretMsg(Long uid, Long stage) { - String tip = String.format(LuckyProcessBarConstant.LUCKY_TIP, stage); - sendSysMsgService.sendPersonTextMsg(SystemConfig.secretaryUid, uid, tip); - } - - public LuckyProcessBarConfigVo getConfigVo(Long uid){ - LuckyProcessBarConfigDto dto = getConfig(); - - LuckyProcessBarConfigVo vo = new LuckyProcessBarConfigVo(); - vo.setUid(uid); - vo.setStartTime(DateTimeUtil.localDateTime2Date(dto.getStartTime())); - vo.setEndTime(DateTimeUtil.localDateTime2Date(dto.getEndTime())); - - vo.setMax(dto.getMax()); - vo.setCur(process.get()); - - Map luckyUidMap = luckyUserMap.readAllMap(); - Map usersMap = CollectionUtils.isEmpty(luckyUidMap)? - Collections.emptyMap(): - usersService.getUsersMapByUids(luckyUidMap.values().stream().distinct().collect(Collectors.toList())); - - Map stageRewardMap = dto.getStageRewardMap().values().stream().map(stageReward->{ - LuckyProcessBarConfigVo.StageReward stageVo = new LuckyProcessBarConfigVo.StageReward(); - stageVo.setStage(stageReward.getStage()); - Long luckyUid = luckyUidMap.get(stageReward.getStage()); - if (null == luckyUid){ - return stageVo; - } - - Users luckyUser = usersMap.get(luckyUid); - if (null == luckyUser){ - return stageVo; - } - - ActivityUserVo luckyUserVo = new ActivityUserVo(luckyUid, luckyUser.getErbanNo(), luckyUser.getNick(), luckyUser.getAvatar()); - stageVo.setLuckyUser(luckyUserVo); - - return stageVo; - }).collect(Collectors.toMap(LuckyProcessBarConfigVo.StageReward::getStage, s->s)); - vo.setStageMap(stageRewardMap); - - return vo; - } - - public void process(LuckyProcessBarConfigDto config, Long uid, String giftRecordId, Integer giftId, Integer giftNum) { - Long max = config.getMax(); - - long cur; - long target; - do { - cur = process.get(); - if (cur >= max){ - return; - } - target = Math.min(cur + giftNum, max); - } while (!process.compareAndSet(cur, target)); - - log.info("[2023时空幸运儿活动]-进度 {} 送出 {} 个 {}， 进度从 {} 增加到 {}, 送礼记录id {}", - uid, giftNum, giftId, cur, target, giftRecordId); - - for (LuckyProcessBarConfigDto.StageReward stageReward: config.getStageRewardMap().values()){ - if (cur >= stageReward.getStage() || target < stageReward.getStage()){ - continue; - } - - boolean success = luckyUserMap.fastPut(stageReward.getStage(), uid); - - log.info("[2023时空幸运儿活动]-阶段奖励 {} 进度从 {} 增加到 {}，获得第 {} 阶段奖励 {}，保存幸运儿结果 {}", - uid, cur, target, stageReward.getStage(), JSON.toJSONString(stageReward.getRewardList()), success); - - for (RewardDto reward: stageReward.getRewardList()) { - rewardUtil.sendRewardByType(uid, reward, "[2023时空幸运儿活动]-阶段奖励"); - } - - sendSecretMsg(uid, stageReward.getStage()); - } - } - - public LuckyProcessBarConfigDto getConfig(){ - String configStr = sysConfService.getSysConfValueById(LuckyProcessBarConstant.SysConfId.ACT_CONFIG); - if (!StringUtils.hasText(configStr)){ - throw new ServiceException(BusiStatus.ALREADY_NOTEXISTS_CONFIG); - } - return JSON.parseObject(configStr, LuckyProcessBarConfigDto.class); - } - - @Override - public void afterPropertiesSet() throws Exception { - String processKey = String.join("_", AppEnum.getCurApp().getValue(), LuckyProcessBarConstant.actName, "process"); - process = redissonClient.getAtomicLong(processKey); - String luckyUserKey = String.join("_", AppEnum.getCurApp().getValue(), LuckyProcessBarConstant.actName, "lucky_user"); - luckyUserMap = redissonClient.getMap(luckyUserKey); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/listener/MidAutumnJackpotFindLoveDrawListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/listener/MidAutumnJackpotFindLoveDrawListener.java deleted file mode 100644 index 4ce668bf8..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/listener/MidAutumnJackpotFindLoveDrawListener.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.accompany.business.midautumn.listener; - -import com.accompany.business.event.FindLoveDrawMessageEvent; -import com.accompany.business.message.FindLoveDrawMessage; -import com.accompany.business.midautumn.service.MidAutumnJackpotService; -import com.accompany.common.utils.DateTimeUtil; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; - -import java.time.LocalDateTime; -import java.util.Date; - -@Slf4j -//@Component -public class MidAutumnJackpotFindLoveDrawListener implements ApplicationListener { - - @Autowired - private MidAutumnJackpotService service; - - @Async - @Override - public void onApplicationEvent(FindLoveDrawMessageEvent findLoveDrawMessageEvent) { - FindLoveDrawMessage findLoveDrawMessage = (FindLoveDrawMessage) findLoveDrawMessageEvent.getSource(); - Long uid = findLoveDrawMessage.getUid(); - Date drawTime = findLoveDrawMessage.getCreateTime(); - LocalDateTime drawLocalDateTime = DateTimeUtil.converDateToLocalDateTime(drawTime); - Integer ticketPrice = findLoveDrawMessage.getTotalPrice().intValue(); - - service.addJackpot(uid, drawLocalDateTime, ticketPrice); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/listener/MidAutumnJackpotLuckyBagListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/listener/MidAutumnJackpotLuckyBagListener.java deleted file mode 100644 index 973545855..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/listener/MidAutumnJackpotLuckyBagListener.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.accompany.business.midautumn.listener; - -import com.accompany.business.event.LuckyBagMessageEvent; -import com.accompany.business.message.LuckyBagMessage; -import com.accompany.business.midautumn.service.MidAutumnJackpotService; -import com.accompany.common.utils.DateTimeUtil; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; - -import java.time.LocalDateTime; -import java.util.Date; - -@Slf4j -//@Component -public class MidAutumnJackpotLuckyBagListener implements ApplicationListener { - - @Autowired - private MidAutumnJackpotService service; - - @Async - @Override - public void onApplicationEvent(LuckyBagMessageEvent luckyBagMessageEvent) { - LuckyBagMessage luckyBagMessage = (LuckyBagMessage) luckyBagMessageEvent.getSource(); - Long sender = luckyBagMessage.getUid(); - Date sendGiftTime = luckyBagMessage.getCreateTime(); - LocalDateTime sendGiftLocalDateTime = DateTimeUtil.converDateToLocalDateTime(sendGiftTime); - - service.addJackpot(sender, sendGiftLocalDateTime, luckyBagMessage.getTotalGoldNum().intValue()); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/listener/MidAutumnRankGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/listener/MidAutumnRankGiftListener.java deleted file mode 100644 index b879a9d86..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/listener/MidAutumnRankGiftListener.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.accompany.business.midautumn.listener; - -import com.accompany.business.base.listener.RankGiftListener; -import com.accompany.business.event.GiftMessageEvent; -import com.accompany.business.midautumn.service.MidAutumnRankService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.context.ApplicationListener; -import org.springframework.scheduling.annotation.Async; - -@Slf4j -//@Component -public class MidAutumnRankGiftListener extends RankGiftListener implements ApplicationListener{ - - @Async - @Override - public void onApplicationEvent(GiftMessageEvent giftMessageEvent) { - handleEvent(giftMessageEvent); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/listener/MidAutumnTaskDynamicListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/listener/MidAutumnTaskDynamicListener.java deleted file mode 100644 index 90d9e835e..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/listener/MidAutumnTaskDynamicListener.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.accompany.business.midautumn.listener; - -import com.accompany.business.event.DynamicVerifyEvent; -import com.accompany.business.midautumn.constant.MidAutumnConstant; -import com.accompany.business.midautumn.dto.MidAutumnTaskConfigDto; -import com.accompany.business.midautumn.service.MidAutumnTaskService; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.community.constant.DynamicStatusEnum; -import com.accompany.community.entity.Dynamic; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; - -import java.time.LocalDateTime; -import java.util.Date; - -@Slf4j -//@Component -public class MidAutumnTaskDynamicListener implements ApplicationListener{ - - @Autowired - private MidAutumnTaskService service; - - @Async - @Override - public void onApplicationEvent(DynamicVerifyEvent dynamicVerifyEvent) { - Dynamic dynamic = (Dynamic) dynamicVerifyEvent.getSource(); - if (!DynamicStatusEnum.PASS.getValue().equals(dynamic.getStatus())){ - return; - } - - Date verifyTime = dynamic.getUpdateTime(); - LocalDateTime verifyLocalDateTime = DateTimeUtil.converDateToLocalDateTime(verifyTime); - - MidAutumnTaskConfigDto config = service.getConfig(); - if (!config.inActTimeRange(verifyLocalDateTime)){ - return; - } - - Long worldId = dynamic.getWorldId(); - if (!worldId.equals(config.getMidAutumnWorldId())){ - return; - } - - Long uid = dynamic.getUid(); - String date = DateTimeUtil.convertDate(verifyTime, DateTimeUtil.DEFAULT_DATE_PATTERN); - - MidAutumnTaskConfigDto.DailyTask dailyTask = config.getDailyTask().get(MidAutumnConstant.TaskId.DYNAMIC); - service.processDailyTask(dailyTask, uid, date, 1); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/listener/MidAutumnTaskFindLoveDrawListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/listener/MidAutumnTaskFindLoveDrawListener.java deleted file mode 100644 index 85d72803e..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/listener/MidAutumnTaskFindLoveDrawListener.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.accompany.business.midautumn.listener; - -import com.accompany.business.event.FindLoveDrawMessageEvent; -import com.accompany.business.message.FindLoveDrawMessage; -import com.accompany.business.midautumn.constant.MidAutumnConstant; -import com.accompany.business.midautumn.dto.MidAutumnTaskConfigDto; -import com.accompany.business.midautumn.service.MidAutumnTaskService; -import com.accompany.common.utils.DateTimeUtil; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; - -import java.time.LocalDateTime; -import java.util.Date; - -@Slf4j -//@Component -public class MidAutumnTaskFindLoveDrawListener implements ApplicationListener { - - @Autowired - private MidAutumnTaskService service; - - @Async - @Override - public void onApplicationEvent(FindLoveDrawMessageEvent findLoveDrawMessageEvent) { - FindLoveDrawMessage findLoveDrawMessage = (FindLoveDrawMessage) findLoveDrawMessageEvent.getSource(); - Long uid = findLoveDrawMessage.getUid(); - Date drawTime = findLoveDrawMessage.getCreateTime(); - LocalDateTime drawLocalDateTime = DateTimeUtil.converDateToLocalDateTime(drawTime); - Integer num = findLoveDrawMessage.getNum(); - - MidAutumnTaskConfigDto config = service.getConfig(); - if (!config.inActTimeRange(drawLocalDateTime)){ - return; - } - - MidAutumnTaskConfigDto.LoopTask findLoveLoopTask = config.getLoopTask().get(MidAutumnConstant.TaskId.FIND_LOVE_LOOP); - if (null == findLoveLoopTask){ - return; - } - - String date = drawLocalDateTime.format(MidAutumnTaskConfigDto.DATE_FORMATTER); - service.processLoopTask(findLoveLoopTask, uid, date, num); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/listener/MidAutumnTaskGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/listener/MidAutumnTaskGiftListener.java deleted file mode 100644 index 5b0ffc497..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/listener/MidAutumnTaskGiftListener.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.accompany.business.midautumn.listener; - -import com.accompany.business.base.listener.TaskGiftListener; -import com.accompany.business.event.GiftMessageEvent; -import com.accompany.business.midautumn.service.MidAutumnTaskService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.context.ApplicationListener; -import org.springframework.scheduling.annotation.Async; - -@Slf4j -//@Component -public class MidAutumnTaskGiftListener extends TaskGiftListener implements ApplicationListener { - - @Override - @Async - public void onApplicationEvent(GiftMessageEvent giftMessageEvent) { - handleEvent(giftMessageEvent); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/listener/MidAutumnTaskLuckyBagListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/listener/MidAutumnTaskLuckyBagListener.java deleted file mode 100644 index cf10080da..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/listener/MidAutumnTaskLuckyBagListener.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.accompany.business.midautumn.listener; - -import com.accompany.business.event.LuckyBagMessageEvent; -import com.accompany.business.message.LuckyBagMessage; -import com.accompany.business.midautumn.dto.MidAutumnTaskConfigDto; -import com.accompany.business.midautumn.service.MidAutumnTaskService; -import com.accompany.common.utils.DateTimeUtil; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; -import org.springframework.util.CollectionUtils; - -import java.time.LocalDateTime; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -@Slf4j -//@Component -public class MidAutumnTaskLuckyBagListener implements ApplicationListener { - - @Autowired - private MidAutumnTaskService service; - - @Async - @Override - public void onApplicationEvent(LuckyBagMessageEvent luckyBagMessageEvent) { - LuckyBagMessage luckyBagMessage = (LuckyBagMessage) luckyBagMessageEvent.getSource(); - Date sendGiftTime = luckyBagMessage.getCreateTime(); - LocalDateTime sendGiftLocalDateTime = DateTimeUtil.converDateToLocalDateTime(sendGiftTime); - - MidAutumnTaskConfigDto config = service.getConfig(); - if (!config.inActTimeRange(sendGiftLocalDateTime)){ - return; - } - - Integer luckyBagId = luckyBagMessage.getLuckyBagId(); - List giftLoopTaskList = config.getLoopTask().values().stream() - .filter(task->task.getGiftIds().contains(luckyBagId)) - .collect(Collectors.toList()); - if (CollectionUtils.isEmpty(giftLoopTaskList)){ - return; - } - - // 送礼人Uid - Long sendUid = luckyBagMessage.getUid(); - Integer totalGoldNum = luckyBagMessage.getTotalGoldNum().intValue(); - String sendDate = DateTimeUtil.convertDate(sendGiftTime, DateTimeUtil.DEFAULT_DATE_PATTERN); - - for (MidAutumnTaskConfigDto.LoopTask loopTask: giftLoopTaskList) { - service.processLoopTask(loopTask, sendUid, sendDate, totalGoldNum); - } - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/service/MidAutumnDrawRecordService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/service/MidAutumnDrawRecordService.java deleted file mode 100644 index 21a371843..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/service/MidAutumnDrawRecordService.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.accompany.business.midautumn.service; - -import com.accompany.business.common.vo.RewardVo; -import com.accompany.business.mapper.MidAutumnDrawRecordDao; -import com.accompany.business.midautumn.model.MidAutumnDrawUserRecord; -import com.accompany.business.midautumn.vo.MidAutumnDrawUserRecordVo; -import com.accompany.common.utils.DateTimeUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -@Service -@Slf4j -public class MidAutumnDrawRecordService extends ServiceImpl { - - public void addUserRecord(Long uid, List rewardVoList, LocalDateTime now) { - Date createTime = DateTimeUtil.converLocalDateTimeToDate(now); - List list = new ArrayList<>(); - for (RewardVo vo: rewardVoList) { - MidAutumnDrawUserRecord record = new MidAutumnDrawUserRecord(); - record.setUid(uid); - record.setType(vo.getType()); - record.setRefId(vo.getRefId()); - record.setName(vo.getName()); - record.setNum(vo.getNum()); - record.setUnit(vo.getUnit()); - record.setCreateTime(createTime); - list.add(record); - } - saveBatch(list); - } - - public List pageRecord(Long uid, Integer page, Integer size) { - List voList = new ArrayList<>(); - - IPage pageInfo = new Page<>(page, size); - QueryWrapper queryWrapper = Wrappers.query(); - queryWrapper.lambda().eq(MidAutumnDrawUserRecord::getUid, uid).orderByDesc(MidAutumnDrawUserRecord::getCreateTime); - page(pageInfo, queryWrapper); - if (CollectionUtils.isEmpty(pageInfo.getRecords())){ - return voList; - } - - for (MidAutumnDrawUserRecord entity: pageInfo.getRecords()) { - MidAutumnDrawUserRecordVo vo = new MidAutumnDrawUserRecordVo(); - vo.setUid(entity.getUid()); - vo.setRewardDesc(entity.getDesc()); - vo.setCreateTime(entity.getCreateTime()); - voList.add(vo); - } - - return voList; - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/service/MidAutumnDrawRewardService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/service/MidAutumnDrawRewardService.java deleted file mode 100644 index e8f38b068..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/service/MidAutumnDrawRewardService.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.accompany.business.midautumn.service; - -import com.accompany.business.base.service.BaseLinearDrawRewardActService; -import com.accompany.business.midautumn.constant.MidAutumnConstant; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -@Service -@Slf4j -public class MidAutumnDrawRewardService extends BaseLinearDrawRewardActService { - - @Override - protected String getActName() { - return MidAutumnConstant.actName; - } - - @Override - protected String getActRewardRemark() { - return "[2023中秋活动]-兑换"; - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/service/MidAutumnDrawService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/service/MidAutumnDrawService.java deleted file mode 100644 index 13643e3af..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/service/MidAutumnDrawService.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.accompany.business.midautumn.service; - -import com.accompany.business.base.service.BaseLinearDrawActService; -import com.accompany.business.common.dto.LinearDrawActConfigDto; -import com.accompany.business.common.vo.RewardVo; -import com.accompany.business.midautumn.MidAutumnMoonCakeNumDao; -import com.accompany.business.midautumn.constant.MidAutumnConstant; -import com.accompany.business.midautumn.dto.MidAutumnDrawConfigDto; -import com.accompany.business.midautumn.vo.MidAutumnDrawConfigVo; -import com.accompany.business.midautumn.vo.MidAutumnDrawUserRecordVo; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.service.SysConfService; -import com.alibaba.fastjson.JSON; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; - -import java.time.LocalDateTime; -import java.util.List; - -@Service -@Slf4j -public class MidAutumnDrawService extends BaseLinearDrawActService { - - @Autowired - private SysConfService sysConfService; - @Autowired - private MidAutumnDrawRecordService recordService; - - public MidAutumnDrawConfigVo getConfigVo(Long uid) { - MidAutumnDrawConfigDto configDto = getConfig(); - - MidAutumnDrawConfigVo configVo = new MidAutumnDrawConfigVo(); - configVo.setStartTime(DateTimeUtil.localDateTime2Date(configDto.getStartTime())); - configVo.setEndTime(DateTimeUtil.localDateTime2Date(configDto.getEndTime())); - configVo.setUid(uid); - configVo.setMoonCakeNum(ticketDao.getUserCurTicketNum(uid)); - return configVo; - } - - public List pageRecord(Long uid, Integer page, Integer size) { - return recordService.pageRecord(uid, page, size); - } - - @Override - protected String getActName() { - return MidAutumnConstant.actName; - } - - @Override - protected void addUserRecord(Long uid, List rewardVoList, LocalDateTime now) { - recordService.addUserRecord(uid, rewardVoList, now); - } - - @Override - protected LinearDrawActConfigDto getDrawActConfig() { - return getConfig(); - } - - public MidAutumnDrawConfigDto getConfig(){ - String configStr = sysConfService.getSysConfValueById(MidAutumnConstant.SysConfId.ACT_MID_AUTUMN_DRAW_CONFIG); - if (!StringUtils.hasText(configStr)){ - throw new ServiceException(BusiStatus.ALREADY_NOTEXISTS_CONFIG); - } - return JSON.parseObject(configStr, MidAutumnDrawConfigDto.class); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/service/MidAutumnJackpotCalculateService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/service/MidAutumnJackpotCalculateService.java deleted file mode 100644 index abf380db7..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/service/MidAutumnJackpotCalculateService.java +++ /dev/null @@ -1,245 +0,0 @@ -package com.accompany.business.midautumn.service; - -import com.accompany.business.mapper.MidAutumnJackpotContributionDao; -import com.accompany.business.midautumn.constant.MidAutumnConstant; -import com.accompany.business.midautumn.dto.MidAutumnJackpotConfig; -import com.accompany.business.midautumn.model.MidAutumnJackpotContribution; -import com.accompany.common.constant.Constant; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.ServiceException; -import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.extern.slf4j.Slf4j; -import org.redisson.api.RMap; -import org.redisson.api.RedissonClient; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import javax.annotation.Resource; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.LocalTime; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.stream.Collectors; - -@Slf4j -@Service -public class MidAutumnJackpotCalculateService extends ServiceImpl { - - @Autowired - private RedissonClient redissonClient; - - @Autowired - private MidAutumnJackpotService jackpotService; - - @Resource(name = "async-executor") - private ThreadPoolExecutor asyncExecutor; - - //分配 - public void calculateJackpot(LocalDate date) { - MidAutumnJackpotConfig config = jackpotService.getConfig(); - - LocalDate today = null != date? date: LocalDate.now(); - LocalDateTime now = LocalDateTime.of(today, LocalTime.now()); - if (!config.inActTimeRange(now)){ - return; - } - - String todayStr = now.format(MidAutumnJackpotConfig.DATE_FORMATTER); - - Double jackpot = jackpotService.getJackpot(todayStr); - BigDecimal jackpotB = BigDecimal.valueOf(jackpot); - - String cacheKey = MidAutumnConstant.RedisKey.MID_AUTUMN_JACKPOT_USER_CONTRIBUTION + "_" + todayStr; - RMap todayContributionCache = redissonClient.getMap(cacheKey); - Map todayMap = todayContributionCache.readAllMap(); - List todayList = todayMap - .values().stream().filter(c->c.getContribution() > 0d) - .collect(Collectors.toList()); - if (CollectionUtils.isEmpty(todayList)){ - log.error("[2023中秋活动-奖池] {} 奖池 {} 没人玩不用计算", todayStr, jackpotB.toPlainString()); - return; - } - - BigDecimal todayAllContribution = todayList.stream().map(MidAutumnJackpotContribution::getContribution).map(BigDecimal::valueOf).reduce(BigDecimal.ZERO, BigDecimal::add); - log.info("[2023中秋活动-奖池] {} 奖池 {} 全服总贡献 {}", todayStr, jackpotB.toPlainString(), todayAllContribution.toPlainString()); - - Map calculateMap = new HashMap<>(); - Map needMap = new HashMap<>(); - Map extraMap = new HashMap<>(); - - //第一次预分配，先分类汇总 - for (MidAutumnJackpotContribution c: todayList){ - BigDecimal rate = BigDecimal.valueOf(c.getContribution()).divide(todayAllContribution, 5, RoundingMode.DOWN); - c.setAllotRate(rate); - - BigDecimal firstCalculate = jackpotB.multiply(rate); - c.setFirstAllot(firstCalculate); - - //实际分配，向下取整 - BigDecimal calculate = firstCalculate; - - //不足1要补足，小数部分向下取整 - if (firstCalculate.compareTo(BigDecimal.TEN) < 0){ - - calculate = BigDecimal.TEN; - - BigDecimal need = calculate.subtract(firstCalculate); - needMap.put(c.getUid(), need); - - } else if (firstCalculate.compareTo(BigDecimal.TEN) > 0) { - - calculate = BigDecimal.valueOf(firstCalculate.longValue()); - - BigDecimal extra = firstCalculate.subtract(calculate); - extraMap.put(c.getUid(), extra); - } - - calculateMap.put(c.getUid(), calculate); - } - - //太难了，几乎不可能 - if (CollectionUtils.isEmpty(needMap)){ - saveCalculate(todayContributionCache, todayMap, calculateMap); - log.info("[2023中秋活动-奖池] 没人需要补钻，保存"); - return; - } - - BigDecimal allNeed = needMap.values().stream().reduce(BigDecimal.ZERO, BigDecimal::add); - BigDecimal allExtra = extraMap.values().stream().reduce(BigDecimal.ZERO, BigDecimal::add); - - log.info("[2023中秋活动-奖池] 总共 {} 个人不足 10 钻，总共需要补 {} 钻， 向下取整总共多出 {} 钻", needMap.keySet().size(), allNeed.toPlainString(), allExtra.toPlainString()); - - //向下取整部分大于需要补充部分，皆大欢喜 - if (allExtra.compareTo(allNeed) >= 0){ - saveCalculate(todayContributionCache, todayMap, calculateMap); - log.info("[2023中秋活动-奖池] 向下取整总共多出的钻 多于 需要补的钻，保存"); - return; - } - - //rebalance - BigDecimal allExtraNeed = allNeed.subtract(allExtra); - BigDecimal threshold = BigDecimal.TEN.add(BigDecimal.ONE); - - int num = 0; - do { - //倒序 - List> leek = calculateMap.entrySet().stream().filter(entry->entry.getValue().compareTo(threshold)>0) - .sorted((s1,s2)->s2.getValue().compareTo(s1.getValue())).collect(Collectors.toList()); - - if (CollectionUtils.isEmpty(leek)){ - log.error("[2023中秋活动-奖池] 没有韭菜割下去了 500"); - //todo wechat - return; - } - - num++; - - log.info("[2023中秋活动-奖池] 第 {} 次 重平衡开始， 当前还需要补 {} 钻， 还有 {} 个韭菜等着割", num, allExtraNeed, leek.size()); - - int index = 0; - for (Map.Entry i: leek){ - Long uid = i.getKey(); - BigDecimal calValue = i.getValue(); - - calValue = calValue.subtract(BigDecimal.ONE); - calculateMap.put(uid, calValue); - - allExtraNeed = allExtraNeed.subtract(BigDecimal.ONE); - - index++; - - log.info("[2023中秋活动-奖池] 第 {} 次 重平衡 中 扣 第 {} 棵韭菜， 韭菜 uid {}， 请记住这位同志，还需要补 {} 钻", num, index, uid, allExtraNeed.toPlainString()); - - //补够了，提前结束 - if (allExtraNeed.compareTo(BigDecimal.ZERO) <= 0){ - saveCalculate(todayContributionCache, todayMap, calculateMap); - log.info("[2023中秋活动-奖池] 第 {} 次 重平衡 中 扣 第 {} 棵韭菜后， 还需要补 {} 钻，重平衡结束，再也没有韭菜被害", num, index, allExtraNeed.toPlainString()); - return; - } - } - } while (allExtraNeed.compareTo(BigDecimal.ZERO) > 0); - - } - - private void saveCalculate(RMap todayContributionCache, - Map todayMap, - Map calculateMap) { - for (Map.Entry entry: todayMap.entrySet()){ - Long uid = entry.getKey(); - MidAutumnJackpotContribution contribution = entry.getValue(); - - BigDecimal calculate = calculateMap.get(uid); - if (null != calculate){ - contribution.setAllot(calculate.longValue()); - } - } - - log.info("[2023中秋活动-奖池] 最终计算值 {}", JSON.toJSONString(calculateMap)); - - todayContributionCache.putAll(todayMap); - - log.info("[2023中秋活动-奖池] 保存瓜分计算值 {}", JSON.toJSONString(todayMap)); - } - - public void writeDb(LocalDate date){ - MidAutumnJackpotConfig config = jackpotService.getConfig(); - - LocalDate today = null != date? date: LocalDate.now(); - LocalDateTime now = LocalDateTime.of(today, LocalTime.now()); - if (now.isBefore(config.getStartTime()) || now.isAfter(config.getEndTime())){ - throw new ServiceException(BusiStatus.PARAMERROR); - } - - String todayStr = now.format(MidAutumnJackpotConfig.DATE_FORMATTER); - - String cacheKey = MidAutumnConstant.RedisKey.MID_AUTUMN_JACKPOT_USER_CONTRIBUTION + "_" + todayStr; - RMap todayContributionCache = redissonClient.getMap(cacheKey); - Map todayMap = todayContributionCache.readAllMap(); - if (CollectionUtils.isEmpty(todayMap)){ - return ; - } - - saveBatch(todayMap.values()); - } - - public void helpUserAllot(LocalDate date){ - - MidAutumnJackpotConfig config = jackpotService.getConfig(); - - LocalDate today = null != date? date: LocalDate.now(); - LocalDateTime now = LocalDateTime.of(today, LocalTime.now()); - if (now.isBefore(config.getStartTime()) || now.isAfter(config.getEndTime())){ - throw new ServiceException(BusiStatus.PARAMERROR); - } - - String todayStr = now.format(MidAutumnJackpotConfig.DATE_FORMATTER); - - String cacheKey = MidAutumnConstant.RedisKey.MID_AUTUMN_JACKPOT_USER_CONTRIBUTION + "_" + todayStr; - RMap todayContributionCache = redissonClient.getMap(cacheKey); - Map todayMap = todayContributionCache.readAllMap(); - if (CollectionUtils.isEmpty(todayMap)){ - return; - } - - List todayList = todayMap - .values().stream().filter(c->null != c.getStatus() && !Constant.status.invalid.equals(c.getStatus())) - .collect(Collectors.toList()); - if (CollectionUtils.isEmpty(todayList)){ - return; - } - - for (MidAutumnJackpotContribution uc: todayList) { - asyncExecutor.execute(()->{ - jackpotService.allotJackpot(uc.getUid(), today); - }); - } - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/service/MidAutumnJackpotCalculateTestService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/service/MidAutumnJackpotCalculateTestService.java deleted file mode 100644 index 4788f62ac..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/service/MidAutumnJackpotCalculateTestService.java +++ /dev/null @@ -1,189 +0,0 @@ -package com.accompany.business.midautumn.service; - -import com.accompany.business.midautumn.constant.MidAutumnConstant; -import com.accompany.business.midautumn.dto.MidAutumnJackpotConfig; -import com.accompany.business.midautumn.model.MidAutumnJackpotContribution; -import com.alibaba.fastjson.JSON; -import lombok.extern.slf4j.Slf4j; -import org.redisson.api.RMap; -import org.redisson.api.RedissonClient; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.LocalTime; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -@Slf4j -@Service -public class MidAutumnJackpotCalculateTestService { - - @Autowired - private RedissonClient redissonClient; - - @Autowired - private MidAutumnJackpotService jackpotService; - - public List calculateJackpot(LocalDate date) { - List result = new ArrayList<>(); - - MidAutumnJackpotConfig config = jackpotService.getConfig(); - - LocalDate today = null != date? date: LocalDate.now(); - LocalDateTime now = LocalDateTime.of(today, LocalTime.now()); - if (now.isBefore(config.getStartTime()) || now.isAfter(config.getEndTime())){ - result.add("当前时间不在配置时间内，请检查 开始时间、结束时间、getTime"); - return result; - } - - String todayStr = now.format(MidAutumnJackpotConfig.DATE_FORMATTER); - - Double jackpot = jackpotService.getJackpot(todayStr); - BigDecimal jackpotB = BigDecimal.valueOf(jackpot); - - String cacheKey = MidAutumnConstant.RedisKey.MID_AUTUMN_JACKPOT_USER_CONTRIBUTION + "_" + todayStr; - RMap todayContributionCache = redissonClient.getMap(cacheKey); - Map todayMap = todayContributionCache.readAllMap(); - List todayList = todayMap - .values().stream().filter(c->c.getContribution() > 0d) - .collect(Collectors.toList()); - if (CollectionUtils.isEmpty(todayList)){ - result.add(String.format(" %s 奖池 %s 没人玩不用计算", todayStr, jackpotB.toPlainString())); - return result; - } - - BigDecimal todayAllContribution = todayList.stream().map(MidAutumnJackpotContribution::getContribution).map(BigDecimal::valueOf).reduce(BigDecimal.ZERO, BigDecimal::add); - result.add(String.format(" %s 奖池 %s 全服总贡献 %s", todayStr, jackpotB.toPlainString(), todayAllContribution.toPlainString())); - - Map calculateMap = new HashMap<>(); - Map needMap = new HashMap<>(); - Map extraMap = new HashMap<>(); - - //第一次预分配，先分类汇总 - for (MidAutumnJackpotContribution c: todayList){ - BigDecimal rate = BigDecimal.valueOf(c.getContribution()).divide(todayAllContribution, 5, RoundingMode.DOWN); - c.setAllotRate(rate); - - BigDecimal firstCalculate = jackpotB.multiply(rate); - c.setFirstAllot(firstCalculate); - - //实际分配，向下取整 - BigDecimal calculate = firstCalculate; - - //不足1要补足，小数部分向下取整 - if (firstCalculate.compareTo(BigDecimal.TEN) < 0){ - - calculate = BigDecimal.TEN; - - BigDecimal need = calculate.subtract(firstCalculate); - needMap.put(c.getUid(), need); - - } else if (firstCalculate.compareTo(BigDecimal.TEN) > 0) { - - calculate = BigDecimal.valueOf(firstCalculate.longValue()); - - BigDecimal extra = firstCalculate.subtract(calculate); - extraMap.put(c.getUid(), extra); - } - - calculateMap.put(c.getUid(), calculate); - } - - //太难了，几乎不可能 - if (CollectionUtils.isEmpty(needMap)){ - result.addAll(saveCalculate(todayContributionCache, todayMap, calculateMap)); - result.add("没人需要补钻，保存"); - return result; - } - - BigDecimal allNeed = needMap.values().stream().reduce(BigDecimal.ZERO, BigDecimal::add); - BigDecimal allExtra = extraMap.values().stream().reduce(BigDecimal.ZERO, BigDecimal::add); - - result.add(String.format("总共 %d 个人不足 10 钻，总共需要补 %s 钻， 向下取整总共多出 %s 钻",needMap.keySet().size(), allNeed.toPlainString(), allExtra.toPlainString())); - - //向下取整部分大于需要补充部分，皆大欢喜 - if (allExtra.compareTo(allNeed) >= 0){ - result.addAll(saveCalculate(todayContributionCache, todayMap, calculateMap)); - result.add("向下取整总共多出的钻 多于 需要补的钻，保存"); - return result; - } - - //rebalance - BigDecimal allExtraNeed = allNeed.subtract(allExtra); - BigDecimal threshold = BigDecimal.TEN.add(BigDecimal.ONE); - - int num = 0; - do { - //倒序 - List> leek = calculateMap.entrySet().stream().filter(entry->entry.getValue().compareTo(threshold)>0) - .sorted((s1,s2)->s2.getValue().compareTo(s1.getValue())).collect(Collectors.toList()); - - if (CollectionUtils.isEmpty(leek)){ - result.add("没有韭菜割下去了 500"); - //todo wechat - return result; - } - - num++; - - result.add(String.format("第 %d 次 重平衡开始， 当前还需要补 %s 钻， 还有 %d 个韭菜等着割", num, allExtraNeed.toPlainString(), leek.size())); - - int index = 0; - for (Map.Entry i: leek){ - Long uid = i.getKey(); - BigDecimal calValue = i.getValue(); - - calValue = calValue.subtract(BigDecimal.ONE); - calculateMap.put(uid, calValue); - - allExtraNeed = allExtraNeed.subtract(BigDecimal.ONE); - - index++; - - result.add(String.format("第 %d 次 重平衡 中 扣 第 %d 棵韭菜， 韭菜 uid %d， 请记住这位同志，还需要补 %s 钻", num, index, uid, allExtraNeed.toPlainString())); - - //补够了，提前结束 - if (allExtraNeed.compareTo(BigDecimal.ZERO) <= 0){ - result.addAll(saveCalculate(todayContributionCache, todayMap, calculateMap)); - result.add(String.format("第 %d 次 重平衡 中 扣 第 %d 棵韭菜后， 还需要补 %s 钻，重平衡结束，再也没有韭菜被害", num, index, allExtraNeed.toPlainString())); - return result; - } - } - } while (allExtraNeed.compareTo(BigDecimal.ZERO) > 0); - - return result; - } - - private List saveCalculate(RMap todayContributionCache, - Map todayMap, - Map calculateMap) { - List result = new ArrayList<>(); - - for (Map.Entry entry: todayMap.entrySet()){ - Long uid = entry.getKey(); - MidAutumnJackpotContribution contribution = entry.getValue(); - - BigDecimal calculate = calculateMap.get(uid); - if (null != calculate){ - contribution.setAllot(calculate.longValue()); - } - } - - result.add(String.format("最终计算值 %s", JSON.toJSONString(calculateMap))); - - todayContributionCache.putAll(todayMap); - - result.add(String.format("保存瓜分计算值 %s", JSON.toJSONString(todayMap))); - - return result; - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/service/MidAutumnJackpotService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/service/MidAutumnJackpotService.java deleted file mode 100644 index eee503726..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/service/MidAutumnJackpotService.java +++ /dev/null @@ -1,276 +0,0 @@ -package com.accompany.business.midautumn.service; - -import com.accompany.business.midautumn.constant.MidAutumnConstant; -import com.accompany.business.midautumn.dto.MidAutumnJackpotConfig; -import com.accompany.business.midautumn.model.MidAutumnJackpotContribution; -import com.accompany.business.midautumn.vo.MidAutumnJackpotConfigVo; -import com.accompany.business.midautumn.vo.MidAutumnJackpotRecordVo; -import com.accompany.business.service.purse.UserPurseService; -import com.accompany.business.service.record.BillRecordService; -import com.accompany.common.constant.Constant; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.enumeration.BillObjTypeEnum; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.service.SysConfService; -import com.alibaba.fastjson.JSON; -import org.redisson.api.RLock; -import org.redisson.api.RMap; -import org.redisson.api.RedissonClient; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; -import org.springframework.util.StringUtils; - -import java.math.BigDecimal; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.LocalTime; -import java.time.format.DateTimeFormatter; -import java.util.*; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; - -@Service -public class MidAutumnJackpotService implements InitializingBean { - - @Autowired - private RedissonClient redissonClient; - @Autowired - private SysConfService sysConfService; - @Autowired - private UserPurseService userPurseService; - @Autowired - private BillRecordService billRecordService; - - private RMap jackpotMap; - private RMap> userJackpotRecordMap; - - public MidAutumnJackpotConfigVo getConfigVo(Long uid) { - MidAutumnJackpotConfigVo vo = new MidAutumnJackpotConfigVo(); - - MidAutumnJackpotConfig config = getConfig(); - - LocalDateTime dateTime = config.getCurDateTime(); - String dateStr = dateTime.format(MidAutumnJackpotConfig.DATE_FORMATTER); - vo.setCurDate(dateStr); - - vo.setJackpotDiamonds(getJackpot(dateStr)); - - LocalDateTime jackpotEndTime = LocalDateTime.of(dateTime.toLocalDate(), config.getGetTime()); - vo.setJackpotEndTime(DateTimeUtil.converLocalDateTimeToDate(jackpotEndTime)); - - if (dateTime.toLocalTime().isAfter(config.getGetTime())){ - String cacheKey = MidAutumnConstant.RedisKey.MID_AUTUMN_JACKPOT_USER_CONTRIBUTION + "_" + dateStr; - RMap todayContribution = redissonClient.getMap(cacheKey); - MidAutumnJackpotContribution userTodayContribution = todayContribution.get(uid); - vo.setAllotStatus(null != userTodayContribution? userTodayContribution.getStatus(): Constant.status.valid); - } else { - vo.setAllotStatus(Constant.status.delete); - } - - vo.setContribution(0D); - vo.setCurDateTime(new Date()); - return vo; - } - - public Double getJackpot(String dateStr){ - return jackpotMap.getOrDefault(dateStr, 0D); - } - - public Long allotJackpot(Long uid, LocalDate date) { - MidAutumnJackpotConfig config = getConfig(); - - LocalDateTime now = null == date? LocalDateTime.now(): LocalDateTime.of(date, LocalTime.MAX); - if (!config.inActTimeRange(now) - || now.toLocalTime().isBefore(config.getGetTime())){ - throw new ServiceException(BusiStatus.NOT_IN_ACT_TIME_RANGE); - } - - String todayStr = now.format(MidAutumnJackpotConfig.DATE_FORMATTER); - String cacheKey = MidAutumnConstant.RedisKey.MID_AUTUMN_JACKPOT_USER_CONTRIBUTION + "_" + todayStr; - RMap todayContribution = redissonClient.getMap(cacheKey); - MidAutumnJackpotContribution userTodayContribution = todayContribution.get(uid); - if (null == userTodayContribution){ - userTodayContribution = new MidAutumnJackpotContribution(); - userTodayContribution.setDate(todayStr); - userTodayContribution.setUid(uid); - userTodayContribution.setStatus(Constant.status.invalid); - userTodayContribution.setContribution(0D); - userTodayContribution.setShowContribution(0D); - userTodayContribution.setAllot(0L); - } - if (userTodayContribution.getContribution() <= 0D || userTodayContribution.getAllot() <= 0L){ - todayContribution.fastPut(uid, userTodayContribution); - - //todo - throw new ServiceException(BusiStatus.NOT_IN_ACT_TIME_RANGE, MidAutumnConstant.BusiStatus.NERVER_JOIN_JACKPOT); - } else if (Constant.status.invalid.equals(userTodayContribution.getStatus())) { - //todo - throw new ServiceException(BusiStatus.NOT_IN_ACT_TIME_RANGE, MidAutumnConstant.BusiStatus. ALREADY_JACKPOT); - } - - String lockKey = MidAutumnConstant.RedisKey.MID_AUTUMN_JACKPOT_USER_CONTRIBUTION_LOCK + "_" + uid; - boolean locked = false; - RLock lock = redissonClient.getLock(lockKey); - try { - locked = lock.tryLock(5, TimeUnit.SECONDS); - if (!locked){ - throw new ServiceException(BusiStatus.SERVERBUSY); - } - - userTodayContribution = todayContribution.get(uid); - if (null == userTodayContribution){ - userTodayContribution = new MidAutumnJackpotContribution(); - userTodayContribution.setDate(todayStr); - userTodayContribution.setUid(uid); - userTodayContribution.setStatus(Constant.status.invalid); - userTodayContribution.setContribution(0D); - userTodayContribution.setShowContribution(0D); - userTodayContribution.setAllot(0L); - } - if (userTodayContribution.getContribution() <= 0D || userTodayContribution.getAllot() <= 0L){ - todayContribution.fastPut(uid, userTodayContribution); - - //todo - throw new ServiceException(BusiStatus.NOT_IN_ACT_TIME_RANGE, MidAutumnConstant.BusiStatus.NERVER_JOIN_JACKPOT); - } else if (Constant.status.invalid.equals(userTodayContribution.getStatus())) { - //todo - throw new ServiceException(BusiStatus.NOT_IN_ACT_TIME_RANGE, MidAutumnConstant.BusiStatus. ALREADY_JACKPOT); - } - - //todo log - - Long rewardDiamonds = userTodayContribution.getAllot(); - Double rewardDiamondsD = rewardDiamonds.doubleValue(); - - //todo log - - userPurseService.addDiamond(uid, rewardDiamondsD, BillObjTypeEnum.MID_AUTUMN_JACKPOT_ALLOT_DIAMOND_IN); - - userTodayContribution.setStatus(Constant.status.invalid); - todayContribution.fastPut(uid, userTodayContribution); - - // record - String timeStr = now.format(DateTimeFormatter.ofPattern(DateTimeUtil.DEFAULT_DATETIME_PATTERN)); - Map userJackpotRecord = userJackpotRecordMap.getOrDefault(uid, new HashMap<>()); - userJackpotRecord.put(timeStr, rewardDiamonds); - userJackpotRecordMap.fastPut(uid, userJackpotRecord); - - return rewardDiamonds; - - } catch (InterruptedException e) { - //todo log - throw new RuntimeException(e); - } finally { - if (locked){ - lock.unlock(); - } - } - } - - public List listRecord(Long uid) { - List recordList = new ArrayList<>(); - - Map userRecordMap = userJackpotRecordMap.get(uid); - if (CollectionUtils.isEmpty(userRecordMap)){ - return recordList; - } - - for (String dateTime: userRecordMap.keySet()) { - MidAutumnJackpotRecordVo vo = new MidAutumnJackpotRecordVo(); - vo.setTime(DateTimeUtil.convertStrToDate(dateTime)); - vo.setDiamonds(userRecordMap.get(dateTime)); - recordList.add(vo); - } - - return recordList.stream() - .sorted(Comparator.comparing(MidAutumnJackpotRecordVo::getTime).reversed()) - .collect(Collectors.toList()); - } - - public void addJackpot(Long uid, LocalDateTime now, Integer input) { - MidAutumnJackpotConfig config = getConfig(); - - if (!config.inActTimeRange(now) - || now.toLocalTime().isAfter(config.getSettlementTime())){ - //todo 超时 - return; - } - - double contribution = BigDecimal.valueOf(input).multiply(BigDecimal.valueOf(config.getContributionRate())).doubleValue(); - if (contribution <= 0D){ - return; - } - - String dateStr = now.format(MidAutumnJackpotConfig.DATE_FORMATTER); - - boolean locked = false; - RLock lock = redissonClient.getLock(MidAutumnConstant.RedisKey.MID_AUTUMN_JACKPOT_POOL_LOCK); - try { - locked = lock.tryLock(3, TimeUnit.SECONDS); - if (!locked){ - throw new ServiceException(BusiStatus.SERVERBUSY); - } - - Double jackpot = jackpotMap.getOrDefault(dateStr, 0D); - - double showContribution = 0D; - double remain = BigDecimal.valueOf(config.getJackpotMax()).subtract(BigDecimal.valueOf(jackpot)).doubleValue(); - if (remain < 0D){ - jackpotMap.fastPut(dateStr, config.getJackpotMax()); - } else if (remain > 0D) { - showContribution = Math.min(contribution, remain); - Double afterJackpot = BigDecimal.valueOf(jackpot).add(BigDecimal.valueOf(showContribution)).doubleValue(); - jackpotMap.fastPut(dateStr, afterJackpot); - } - - //todo log - - String cacheKey = MidAutumnConstant.RedisKey.MID_AUTUMN_JACKPOT_USER_CONTRIBUTION + "_" + dateStr; - RMap userContributionCache = redissonClient.getMap(cacheKey); - MidAutumnJackpotContribution userContribution = userContributionCache.get(uid); - if (null == userContribution){ - userContribution = new MidAutumnJackpotContribution(); - userContribution.setDate(dateStr); - userContribution.setUid(uid); - userContribution.setShowContribution(0D); - userContribution.setContribution(0D); - userContribution.setAllot(0L); - userContribution.setStatus(Constant.status.valid); - } - - if (showContribution > 0D){ - userContribution.setShowContribution(BigDecimal.valueOf(contribution).add(BigDecimal.valueOf(userContribution.getShowContribution())).doubleValue()); - } - userContribution.setContribution(BigDecimal.valueOf(contribution).add(BigDecimal.valueOf(userContribution.getContribution())).doubleValue()); - userContributionCache.fastPut(uid, userContribution); - - //todo log - - } catch (InterruptedException e) { - //todo log - throw new RuntimeException(e); - } finally { - if (locked){ - lock.unlock(); - } - } - - } - - public MidAutumnJackpotConfig getConfig(){ - String configStr = sysConfService.getSysConfValueById(MidAutumnConstant.SysConfId.ACT_MID_AUTUMN_JACKPOT_CONFIG); - if (!StringUtils.hasText(configStr)){ - throw new ServiceException(BusiStatus.ALREADY_NOTEXISTS_CONFIG); - } - return JSON.parseObject(configStr, MidAutumnJackpotConfig.class); - } - - @Override - public void afterPropertiesSet() throws Exception { - jackpotMap = redissonClient.getMap(MidAutumnConstant.RedisKey.MID_AUTUMN_JACKPOT_POOL); - userJackpotRecordMap = redissonClient.getMap(MidAutumnConstant.RedisKey.MID_AUTUMN_JACKPOT_USER_RECORD); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/service/MidAutumnRankService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/service/MidAutumnRankService.java deleted file mode 100644 index 9fd186b9e..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/service/MidAutumnRankService.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.accompany.business.midautumn.service; - -import com.accompany.business.base.rankobj.UsersRankObjectProvider; -import com.accompany.business.base.service.BaseRankActService; -import com.accompany.business.common.constant.RankTypeEnum; -import com.accompany.business.common.dto.RankActConfigDto; -import com.accompany.business.common.vo.ActivityRankVo; -import com.accompany.business.common.vo.RewardVo; -import com.accompany.business.midautumn.constant.MidAutumnConstant; -import com.accompany.business.midautumn.dto.MidAutumnRankConfigDto; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.service.SysConfService; -import com.alibaba.fastjson.JSON; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; - -@Service -@Slf4j -public class MidAutumnRankService extends BaseRankActService { - - @Autowired - private SysConfService sysConfService; - - @Override - protected String getActName() { - return MidAutumnConstant.actName; - } - - public ActivityRankVo getRank(Long uid, RankTypeEnum rankType, String date) { - return super.getRank(uid, rankType, date, 30); - } - - @Override - protected void logUpdateSendRank(Long uid, Integer giftId, Integer giftNum, Long totalGoldNum, Double score) { - log.info("[2023中秋活动]- 送礼榜 {} 收礼 {} {} 个 总价值 {} 钻石，增加思慕值 {}", uid, giftId, giftNum, totalGoldNum, score); - } - - @Override - protected void logUpdateReceiveRank(Long uid, Integer giftId, Integer giftNum, Long totalGoldNum, Double score) { - log.info("[2023中秋活动]- 收礼榜 {} 收礼 {} {} 个总价值 {} 钻石，增加寄情值 {}", uid, giftId, giftNum, totalGoldNum, score); - } - - @Override - protected void logRankReward(RankTypeEnum rankType, String date, String rankKey, Integer rankIndex, Long uid, RewardVo reward) { - log.info("[2023中秋活动]-收送礼榜 {} 发奖励， 第 {} 名 {} 奖励 {}", rankKey, rankIndex, uid, JSON.toJSONString(reward)); - } - - @Override - public RankActConfigDto getRankActConfig() { - return getConfig(); - } - - public MidAutumnRankConfigDto getConfig(){ - String configStr = sysConfService.getSysConfValueById(MidAutumnConstant.SysConfId.ACT_MID_AUTUMN_RANK_CONFIG); - if (!StringUtils.hasText(configStr)){ - throw new ServiceException(BusiStatus.ALREADY_NOTEXISTS_CONFIG); - } - return JSON.parseObject(configStr, MidAutumnRankConfigDto.class); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/service/MidAutumnTaskRecordService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/service/MidAutumnTaskRecordService.java deleted file mode 100644 index da07ab776..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/service/MidAutumnTaskRecordService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.accompany.business.midautumn.service; - -import com.accompany.business.mapper.MidAutumnTaskRecordDao; -import com.accompany.business.midautumn.MidAutumnTicketTaskDao; -import com.accompany.business.midautumn.model.MidAutumnTaskRecord; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -@Service -@Slf4j -public class MidAutumnTaskRecordService extends ServiceImpl { - - @Autowired - private MidAutumnTicketTaskDao dao; - - public void writeDb() { - List dailyTaskRecord = new ArrayList<>(); - Map dailyTaskMap = dao.getAllUserDailyTaskProgress(); - for (String key: dailyTaskMap.keySet()) { - String[] keys = key.split("_"); - Long uid = Long.parseLong(keys[0]); - String date = keys[1]; - Integer taskId = Integer.parseInt(keys[2]); - Integer proc = dailyTaskMap.get(key); - - MidAutumnTaskRecord record = new MidAutumnTaskRecord(); - record.setDate(date); - record.setUid(uid); - record.setTaskId(taskId); - record.setType((byte) 1); - record.setProc(proc); - dailyTaskRecord.add(record); - } - saveBatch(dailyTaskRecord); - - List loopTaskRecord = new ArrayList<>(); - Map loopTaskMap = dao.getAllUserLoopTaskProgress(); - for (String key: loopTaskMap.keySet()) { - String[] keys = key.split("_"); - Long uid = Long.parseLong(keys[0]); - String date = keys[1]; - Integer taskId = Integer.parseInt(keys[2]); - Integer proc = loopTaskMap.get(key); - - MidAutumnTaskRecord record = new MidAutumnTaskRecord(); - record.setDate(date); - record.setUid(uid); - record.setTaskId(taskId); - record.setType((byte) 2); - record.setProc(proc); - loopTaskRecord.add(record); - } - saveBatch(loopTaskRecord); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/service/MidAutumnTaskService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/service/MidAutumnTaskService.java deleted file mode 100644 index a2280ab21..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/service/MidAutumnTaskService.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.accompany.business.midautumn.service; - -import com.accompany.business.base.service.BaseTicketTaskActService; -import com.accompany.business.common.dto.TaskActConfigDto; -import com.accompany.business.midautumn.MidAutumnMoonCakeNumDao; -import com.accompany.business.midautumn.MidAutumnTicketTaskDao; -import com.accompany.business.midautumn.constant.MidAutumnConstant; -import com.accompany.business.midautumn.dto.MidAutumnTaskConfigDto; -import com.accompany.business.midautumn.vo.MidAutumnTaskConfigVo; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.service.SysConfService; -import com.alibaba.fastjson.JSON; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; - -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; - -@Service -@Slf4j -public class MidAutumnTaskService extends BaseTicketTaskActService { - - @Autowired - private SysConfService sysConfService; - private final DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern(DateTimeUtil.DEFAULT_DATE_PATTERN); - - - public MidAutumnTaskConfigVo getConfigVo(Long uid){ - MidAutumnTaskConfigDto dto = getConfig(); - - LocalDateTime now = LocalDateTime.now(); - String date = now.format(dateFormatter); - - if (dto.inActTimeRange(now)){ - MidAutumnTaskConfigDto.DailyTask dailyTask = dto.getDailyTask().get(MidAutumnConstant.TaskId.VISIT); - processDailyTask(dailyTask, uid, date, 1); - } - - MidAutumnTaskConfigVo vo = new MidAutumnTaskConfigVo(); - vo.setUid(uid); - vo.setStartTime(DateTimeUtil.localDateTime2Date(dto.getStartTime())); - vo.setEndTime(DateTimeUtil.localDateTime2Date(dto.getEndTime())); - vo.setMoonCakeNum(ticketDao.getUserCurTicketNum(uid)); - vo.setWorldId(dto.getMidAutumnWorldId()); - - vo.setDailyTaskList(listUserDailyTaskVo(uid, date, dto.getDailyTask())); - vo.setLoopTaskList(listUserLoopTaskVo(uid, date, dto.getLoopTask())); - - return vo; - } - - @Override - protected void logAfterFinishDailyTask(Long uid, String date, Integer taskId, Integer reward, Integer curTicket) { - log.info("[2023中秋]-任务 {} 在 {} 完成 {} 每日任务，获得 {} 月饼， 当前拥有 {} 月饼", uid, date, taskId, reward, curTicket); - } - - @Override - protected void logAfterFinishLoopTask(Long uid, String date, Integer taskId, Integer reward, Integer curTicket) { - log.info("[2023中秋]-任务 {} 在 {} 完成 {} 循环任务，获得 {} 月饼， 当前拥有 {} 月饼", uid, date, taskId, reward, curTicket); - } - - public MidAutumnTaskConfigDto getConfig(){ - String configStr = sysConfService.getSysConfValueById(MidAutumnConstant.SysConfId.ACT_MID_AUTUMN_TASK_CONFIG); - if (!StringUtils.hasText(configStr)){ - throw new ServiceException(BusiStatus.ALREADY_NOTEXISTS_CONFIG); - } - return JSON.parseObject(configStr, MidAutumnTaskConfigDto.class); - } - - @Override - public TaskActConfigDto getTaskActConfig() { - return getConfig(); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/event/QixiXiqueAddEvent.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/event/QixiXiqueAddEvent.java deleted file mode 100644 index f9d5b187f..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/event/QixiXiqueAddEvent.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.accompany.business.qixi.event; - -import org.springframework.context.ApplicationEvent; - -/** - * Created by yangming on 2018/8/31. - * 礼物消息发送 - */ -public class QixiXiqueAddEvent extends ApplicationEvent { - /** - * 构造方法 送礼物消息事件 - * @param source - */ - public QixiXiqueAddEvent(Object source) { - super(source); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/listener/QixiRankGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/listener/QixiRankGiftListener.java deleted file mode 100644 index 6801ec75b..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/listener/QixiRankGiftListener.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.accompany.business.qixi.listener; - -import com.accompany.business.event.GiftMessageEvent; -import com.accompany.business.message.GiftMessage; -import com.accompany.business.model.Hall; -import com.accompany.business.qixi.dto.QixiRankConfigDto; -import com.accompany.business.qixi.service.QixiRankService; -import com.accompany.business.service.hall.HallService; -import com.accompany.common.utils.DateTimeUtil; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.scheduling.annotation.Async; - -import java.time.LocalDateTime; -import java.util.Date; - -@Slf4j -//@Component -public class QixiRankGiftListener implements ApplicationListener { - - @Autowired - private QixiRankService service; - @Autowired - private HallService hallService; - - @Override - @Async - public void onApplicationEvent(GiftMessageEvent giftMessageEvent) { - GiftMessage giftMessage = (GiftMessage) giftMessageEvent.getSource(); - - Date sendGiftTime = DateTimeUtil.convertMsToDate(giftMessage.getMessTime()); - LocalDateTime sendGiftLocalDateTime = DateTimeUtil.converDateToLocalDateTime(sendGiftTime); - - QixiRankConfigDto config = service.getConfig(); - if (!config.inActTimeRange(sendGiftLocalDateTime)){ - return; - } - - Long senderUid = giftMessage.getSendUid(); - Long receiverUid = giftMessage.getRecvUid(); - - Hall senderHall = hallService.getValidHallByUid(senderUid); - if (null != senderHall){ - return; - } - - Integer giftId = giftMessage.getGiftId(); - Long goldNum = giftMessage.getGoldNum(); - String sendDate = DateTimeUtil.convertDate(sendGiftTime, DateTimeUtil.DEFAULT_DATE_PATTERN); - - service.updateLoveRank(senderUid, config, giftId, goldNum, sendDate); - service.updateHoneyRank(receiverUid, config, giftId, goldNum, sendDate); - } - - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/listener/QixiRedLineXiqueListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/listener/QixiRedLineXiqueListener.java deleted file mode 100644 index e29b5b780..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/listener/QixiRedLineXiqueListener.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.accompany.business.qixi.listener; - -import com.accompany.business.qixi.QixiXiqueNumDao; -import com.accompany.business.qixi.dto.QixiRedLineConfigDto; -import com.accompany.business.qixi.event.QixiXiqueAddEvent; -import com.accompany.business.qixi.service.QixiRedLineService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; - -import java.time.LocalDateTime; - -@Slf4j -//@Component -public class QixiRedLineXiqueListener implements ApplicationListener { - - @Autowired - private QixiXiqueNumDao xiqueNumDao; - @Autowired - private QixiRedLineService redLineService; - - @Override - @Async - public void onApplicationEvent(QixiXiqueAddEvent event) { - LocalDateTime now = LocalDateTime.now(); - Long uid = (Long) event.getSource(); - - QixiRedLineConfigDto config = redLineService.getConfig(); - if (!config.inActTimeRange(now)){ - return; - } - - Integer userTotalNum = xiqueNumDao.getUserTotalXiqueNum(uid); - - redLineService.addUserRedLine(uid, userTotalNum); - } - - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/listener/QixiRoomRankGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/listener/QixiRoomRankGiftListener.java deleted file mode 100644 index 9aa4d32ca..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/listener/QixiRoomRankGiftListener.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.accompany.business.qixi.listener; - -import com.accompany.business.event.GiftMessageEvent; -import com.accompany.business.message.GiftMessage; -import com.accompany.business.qixi.dto.QixiRoomRankConfigDto; -import com.accompany.business.qixi.service.QixiRoomRankService; -import com.accompany.common.utils.DateTimeUtil; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.scheduling.annotation.Async; - -import java.time.LocalDateTime; -import java.util.Date; - -@Slf4j -//@Component -public class QixiRoomRankGiftListener implements ApplicationListener { - - @Autowired - private QixiRoomRankService service; - - @Override - @Async - public void onApplicationEvent(GiftMessageEvent giftMessageEvent) { - GiftMessage giftMessage = (GiftMessage) giftMessageEvent.getSource(); - - Long roomUid = giftMessage.getRoomUid(); - if (null == roomUid){ - return; - } - - Date sendGiftTime = DateTimeUtil.convertMsToDate(giftMessage.getMessTime()); - LocalDateTime sendGiftLocalDateTime = DateTimeUtil.converDateToLocalDateTime(sendGiftTime); - - QixiRoomRankConfigDto config = service.getConfig(); - if (!config.inActTimeRange(sendGiftLocalDateTime)){ - return; - } - - Long sendUid = giftMessage.getSendUid(); - Long recvUid = giftMessage.getRecvUid(); - - Integer giftId = giftMessage.getGiftId(); - Long goldNum = giftMessage.getGoldNum(); - - service.updateRank(roomUid, sendUid, recvUid, config, giftId, goldNum); - } - - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/listener/QixiXiqueGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/listener/QixiXiqueGiftListener.java deleted file mode 100644 index e7fc2256f..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/listener/QixiXiqueGiftListener.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.accompany.business.qixi.listener; - -import com.accompany.business.event.GiftMessageEvent; -import com.accompany.business.message.GiftMessage; -import com.accompany.business.qixi.dto.QixiXiqueConfigDto; -import com.accompany.business.qixi.service.QixiXiqueService; -import com.accompany.common.utils.DateTimeUtil; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.scheduling.annotation.Async; - -import java.time.LocalDateTime; -import java.util.Date; -@Slf4j -//@Component -public class QixiXiqueGiftListener implements ApplicationListener { - - @Autowired - private QixiXiqueService service; - - @Override - @Async - public void onApplicationEvent(GiftMessageEvent giftMessageEvent) { - GiftMessage giftMessage = (GiftMessage) giftMessageEvent.getSource(); - Date sendGiftTime = DateTimeUtil.convertMsToDate(giftMessage.getMessTime()); - LocalDateTime sendGiftLocalDateTime = DateTimeUtil.converDateToLocalDateTime(sendGiftTime); - - QixiXiqueConfigDto config = service.getConfig(); - if (!config.inActTimeRange(sendGiftLocalDateTime)){ - return; - } - - Integer giftId = giftMessage.getGiftId(); - QixiXiqueConfigDto.QixiXiqueGiftTask giftXiqueConfig = config.getGiftTask().get(giftId); - if (null == giftXiqueConfig){ - return; - } - - Integer giftNum = giftMessage.getGiftNum(); - // 送礼人Uid - Long sendUid = giftMessage.getSendUid(); - // 收礼人Uid - Long recvUid = giftMessage.getRecvUid(); - - Integer senderXiqueNum = giftXiqueConfig.getSenderXiqueNum() * giftNum; - Integer senderCurXique = service.addUserXique(sendUid, senderXiqueNum); - log.info("[2023七夕]-喜鹊 {} 送出礼物 {} {}个， 增加 {} 喜鹊， 当前拥有 {} 喜鹊", sendUid, giftId, giftNum, senderXiqueNum, senderCurXique); - - Integer receiverXiqueNum = giftXiqueConfig.getReceiverXiqueNum() * giftNum; - Integer receiverCurXique = service.addUserXique(recvUid, receiverXiqueNum); - log.info("[2023七夕]-喜鹊 {} 收到礼物 {} {}个， 增加 {} 喜鹊， 当前拥有 {} 喜鹊", recvUid, giftId, giftNum, receiverXiqueNum, receiverCurXique); - } - - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/listener/QixiXiqueRoomChatListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/listener/QixiXiqueRoomChatListener.java deleted file mode 100644 index 16f0d1f5b..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/listener/QixiXiqueRoomChatListener.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.accompany.business.qixi.listener; - -import com.accompany.business.dto.netease.IMChatMsgDTO; -import com.accompany.business.event.RoomChatEvent; -import com.accompany.business.qixi.constant.QixiConstant; -import com.accompany.business.qixi.dto.QixiXiqueConfigDto; -import com.accompany.business.qixi.service.QixiXiqueService; -import com.accompany.common.utils.DateTimeUtil; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; - -import java.time.LocalDateTime; -import java.util.Date; - -@Slf4j -//@Component -public class QixiXiqueRoomChatListener implements ApplicationListener { - - @Autowired - private QixiXiqueService service; - - @Async - @Override - public void onApplicationEvent(RoomChatEvent roomChatEvent) { - IMChatMsgDTO chatMsgDTO = (IMChatMsgDTO) roomChatEvent.getSource(); - Date chatTime = DateTimeUtil.convertMsToDate(chatMsgDTO.getMsgTimestamp()); - LocalDateTime chatLocalDateTime = DateTimeUtil.converDateToLocalDateTime(chatTime); - - QixiXiqueConfigDto config = service.getConfig(); - if (!config.inActTimeRange(chatLocalDateTime)){ - return; - } - - String date = DateTimeUtil.convertDate(chatTime, DateTimeUtil.DEFAULT_DATE_PATTERN); - Long sendUid = Long.parseLong(chatMsgDTO.getFromAccount()); - QixiXiqueConfigDto.QixiXiqueDailyTask dailyTask = config.getDailyTask().get(QixiConstant.XiqueTaskId.SEND_ROOM_MSG); - service.processTask(dailyTask, sendUid, date, 1); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/listener/QixiXiqueStayRoomListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/listener/QixiXiqueStayRoomListener.java deleted file mode 100644 index 1be72f836..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/listener/QixiXiqueStayRoomListener.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.accompany.business.qixi.listener; - -import com.accompany.business.event.room.UserOutRoomEvent; -import com.accompany.business.message.room.UserOutRoomMessage; -import com.accompany.business.qixi.constant.QixiConstant; -import com.accompany.business.qixi.dto.QixiXiqueConfigDto; -import com.accompany.business.qixi.service.QixiXiqueService; -import com.accompany.common.utils.DateTimeUtil; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; - -import java.time.LocalDateTime; -import java.util.Date; - -@Slf4j -//@Component -public class QixiXiqueStayRoomListener implements ApplicationListener { - - @Autowired - private QixiXiqueService service; - - @Async - @Override - public void onApplicationEvent(UserOutRoomEvent event) { - UserOutRoomMessage userOutRoomMessage = (UserOutRoomMessage) event.getSource(); - Date outTime = DateTimeUtil.convertMsToDate(userOutRoomMessage.getOutTimestamp()); - LocalDateTime outLocalDateTime = DateTimeUtil.converDateToLocalDateTime(outTime); - - QixiXiqueConfigDto config = service.getConfig(); - if (!config.inActTimeRange(outLocalDateTime)){ - return; - } - - String date = DateTimeUtil.convertDate(outTime,DateTimeUtil.DEFAULT_DATE_PATTERN); - Long uid = userOutRoomMessage.getUid(); - int minute = (int) (userOutRoomMessage.getRemainMillisecond() / (1000 * 60)); - if (minute <= 0){ - return; - } - - QixiXiqueConfigDto.QixiXiqueDailyTask dailyTask = config.getDailyTask().get(QixiConstant.XiqueTaskId.STAY_ROOM); - service.processTask(dailyTask, uid, date, minute); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/service/QixiRankService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/service/QixiRankService.java deleted file mode 100644 index dd4117bab..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/service/QixiRankService.java +++ /dev/null @@ -1,370 +0,0 @@ -package com.accompany.business.qixi.service; - -import com.accompany.business.common.dto.RewardDto; -import com.accompany.business.common.vo.ActivityDateRankVo; -import com.accompany.business.common.vo.ActivityRankItemVo; -import com.accompany.business.common.vo.ActivityRankVo; -import com.accompany.business.common.vo.RewardVo; -import com.accompany.business.mapper.QixiRankDao; -import com.accompany.business.model.Hall; -import com.accompany.business.qixi.constant.QixiConstant; -import com.accompany.business.qixi.dto.QixiRankConfigDto; -import com.accompany.business.qixi.dto.QixiRoomRankConfigDto; -import com.accompany.business.qixi.model.QixiRankHourCp; -import com.accompany.business.qixi.vo.QixiRankHourCpVo; -import com.accompany.business.service.hall.HallService; -import com.accompany.business.service.user.UsersService; -import com.accompany.business.util.RewardUtil; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.base.SpringContextHolder; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.model.Users; -import com.accompany.core.service.SysConfService; -import com.alibaba.fastjson.JSON; -import lombok.extern.slf4j.Slf4j; -import org.redisson.api.RBucket; -import org.redisson.api.RScoredSortedSet; -import org.redisson.api.RSet; -import org.redisson.api.RedissonClient; -import org.redisson.client.protocol.ScoredEntry; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; -import org.springframework.util.StringUtils; - -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.time.Duration; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.*; -import java.util.stream.Collectors; - -@Service -@Slf4j -public class QixiRankService implements InitializingBean { - - @Autowired - private SysConfService sysConfService; - @Autowired - private RedissonClient redissonClient; - @Autowired - private UsersService usersService; - @Autowired - private HallService hallService; - @Autowired - private RewardUtil rewardUtil; - @Autowired - private QixiRankDao qixiRankDao; - private final DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern(DateTimeUtil.DEFAULT_DATETIME_PATTERN); - - private RBucket hourCpBucket; - - public QixiRankHourCpVo getHourCpRank() { - QixiRankHourCpVo vo = new QixiRankHourCpVo(); - - LocalDateTime nexHour = LocalDateTime.now().plusHours(1L); - LocalDateTime nextHourStart = LocalDateTime.of(nexHour.getYear(), nexHour.getMonth(), nexHour.getDayOfMonth(), - nexHour.getHour(), 0, 0); - - QixiRankConfigDto configDto = getConfig(); - if (configDto.inActTimeRange(nextHourStart)){ - Date nexHourStartTimeStamp = DateTimeUtil.converLocalDateTimeToDate(nextHourStart); - vo.setNextHourTimeStamp(nexHourStartTimeStamp); - } - - QixiRankHourCp hourCp = hourCpBucket.get(); - if (null == hourCp){ - return vo; - } - - vo.setSenderUid(hourCp.getSenderUid()); - vo.setReceiverUid(hourCp.getReceiverUid()); - - List uidList = new ArrayList<>(); - uidList.add(hourCp.getSenderUid()); - uidList.add(hourCp.getReceiverUid()); - Map usersMap = usersService.getUsersMapByUids(uidList); - - Users sender = usersMap.get(hourCp.getSenderUid()); - if (null != sender){ - vo.setSenderErbanNo(sender.getErbanNo()); - vo.setSenderNick(sender.getNick()); - vo.setSenderAvatar(sender.getAvatar()); - } - - Users receiver = usersMap.get(hourCp.getReceiverUid()); - if (null != receiver){ - vo.setReceiverErbanNo(receiver.getErbanNo()); - vo.setReceiverNick(receiver.getNick()); - vo.setReceiverAvatar(receiver.getAvatar()); - } - - return vo; - } - - public ActivityRankVo getRank(Long uid, Byte rankType, String date) { - - QixiRankConfigDto configDto = getConfig(); - - String rankKey = getRankKey(rankType, date, configDto); - - RScoredSortedSet rank = redissonClient.getScoredSortedSet(rankKey); - //拿前30 - Collection> uidScoreList = rank.entryRangeReversed(0, 29); - - int meRankIndex = 0; - Long meScore = null; - - List rankItemVoList = new ArrayList<>(); - - if (!CollectionUtils.isEmpty(uidScoreList)){ - int rankIndex = 1; - for (ScoredEntry uidScore: uidScoreList){ - if (uid.equals(uidScore.getValue())){ - meRankIndex = rankIndex; - meScore = BigDecimal.valueOf(uidScore.getScore()).setScale(0, RoundingMode.DOWN).longValue(); - break; - } - rankIndex++; - } - - List uidList = uidScoreList.stream().map(ScoredEntry::getValue).collect(Collectors.toList()); - Map usersMap = usersService.getUsersMapByUids(uidList); - - rankIndex = 1; - for (ScoredEntry uidScore: uidScoreList){ - Users user = usersMap.get(uidScore.getValue()); - - ActivityRankItemVo rankItemVo = new ActivityRankItemVo(); - rankItemVo.setRanking(rankIndex++); - rankItemVo.setScore(BigDecimal.valueOf(uidScore.getScore()).setScale(0, RoundingMode.DOWN).longValue()); - rankItemVo.setUid(uidScore.getValue()); - - if (null != user){ - rankItemVo.setErbanNo(user.getErbanNo()); - rankItemVo.setNick(user.getNick()); - rankItemVo.setAvatar(user.getAvatar()); - } - - rankItemVoList.add(rankItemVo); - } - } - - if (null == meScore){ - Double meScoreD = rank.getScore(uid); - if (null == meScoreD){ - meScore = 0L; - } else { - meScore = BigDecimal.valueOf(meScoreD).setScale(0, RoundingMode.DOWN).longValue(); - } - } - - ActivityRankItemVo meRankVo = new ActivityRankItemVo(); - meRankVo.setUid(uid); - meRankVo.setRanking(meRankIndex); - meRankVo.setScore(meScore); - - Users meUser = usersService.getUsersByUid(uid); - if (null != meUser){ - meRankVo.setErbanNo(meUser.getErbanNo()); - meRankVo.setNick(meUser.getNick()); - meRankVo.setAvatar(meUser.getAvatar()); - } - - return buildActivityRankVo(rankItemVoList, meRankVo, configDto, rankType, date); - } - - private ActivityRankVo buildActivityRankVo(List rankItemVoList, ActivityRankItemVo meRankVo, - QixiRankConfigDto config, Byte rankType, String date) { - Date startTime = DateTimeUtil.converLocalDateTimeToDate(config.getStartTime()); - Date endTime = DateTimeUtil.converLocalDateTimeToDate(config.getEndTime()); - - if (QixiConstant.RankType.HONEY_TOTAL.equals(rankType) || QixiConstant.RankType.LOVE_TOTAL.equals(rankType)){ - return new ActivityRankVo(startTime, endTime, rankType, rankItemVoList, meRankVo); - } - - List dateList = config.listBetweenDateStr(); - String curDate = StringUtils.hasText(date)? date: config.getCurDateStr(); - return new ActivityDateRankVo(startTime, endTime, rankType, rankItemVoList, meRankVo, dateList, curDate); - } - - private String getRankKey(Byte rankType, String date, QixiRankConfigDto config) { - // 日榜时预处理日期 - if ((QixiConstant.RankType.HONEY_DAY.equals(rankType) || QixiConstant.RankType.LOVE_DAY.equals(rankType)) - && !StringUtils.hasText(date)){ - date = config.getCurDateStr(); - } - - if (QixiConstant.RankType.HONEY_DAY.equals(rankType)){ - return QixiConstant.RedisKey.QIXI_RANK_HONEY_DAY_KEY + "_" + date; - } else if (QixiConstant.RankType.HONEY_TOTAL.equals(rankType)){ - return QixiConstant.RedisKey.QIXI_RANK_HONEY_TOTAL_KEY; - } else if (QixiConstant.RankType.LOVE_DAY.equals(rankType)){ - return QixiConstant.RedisKey.QIXI_RANK_LOVE_DAY_KEY + "_" + date; - } else if (QixiConstant.RankType.LOVE_TOTAL.equals(rankType)){ - return QixiConstant.RedisKey.QIXI_RANK_LOVE_TOTAL_KEY; - } - throw new ServiceException(BusiStatus.PARAMERROR); - } - - public void updateHoneyRank(Long uid, QixiRankConfigDto config, Integer giftId, Long goldNum, String sendDate) { - // 收礼榜只限签约主播，不要大头 - Hall hall = hallService.getValidHallByUid(uid); - if (null != hall){ - return; - } - - double score = goldNum * config.getScorePercent(giftId); - - String dayRankKey = QixiConstant.RedisKey.QIXI_RANK_HONEY_DAY_KEY + "_" + sendDate; - RScoredSortedSet dayRank = redissonClient.getScoredSortedSet(dayRankKey); - dayRank.addScore(uid, score); - - String totalRankKey = QixiConstant.RedisKey.QIXI_RANK_HONEY_TOTAL_KEY; - RScoredSortedSet totalRank = redissonClient.getScoredSortedSet(totalRankKey); - totalRank.addScore(uid, score); - - log.info("[2023七夕活动]- 收礼甜蜜榜 {} 收礼 {} 总价值 {} 钻石，增加情缘值 {}", uid, giftId, goldNum, score); - } - - public void updateLoveRank(Long uid, QixiRankConfigDto config, Integer giftId, Long goldNum, String sendDate) { - - double score = goldNum * config.getScorePercent(giftId); - - String dayRankKey = QixiConstant.RedisKey.QIXI_RANK_LOVE_DAY_KEY + "_" + sendDate; - RScoredSortedSet dayRank = redissonClient.getScoredSortedSet(dayRankKey); - dayRank.addScore(uid, score); - - String totalRankKey = QixiConstant.RedisKey.QIXI_RANK_LOVE_TOTAL_KEY; - RScoredSortedSet totalRank = redissonClient.getScoredSortedSet(totalRankKey); - totalRank.addScore(uid, score); - - log.info("[2023七夕活动]- 送礼爱意榜 {} 送礼 {} 总价值 {} 钻石，增加情缘值 {}", uid, giftId, goldNum, score); - } - - public QixiRankConfigDto getConfig(){ - String configStr = sysConfService.getSysConfValueById(QixiConstant.SysConfId.ACT_QIXI_RANK_CONFIG); - if (!StringUtils.hasText(configStr)){ - throw new ServiceException(BusiStatus.ALREADY_NOTEXISTS_CONFIG); - } - return JSON.parseObject(configStr, QixiRoomRankConfigDto.class); - } - - public void settlement(LocalDateTime now) { - settlement(now, Boolean.TRUE); - } - - public void settlement(LocalDateTime now, boolean needFlag) { - QixiRankConfigDto config = getConfig(); - String yesterDayStr = now.minusDays(1L).format(DateTimeFormatter.ofPattern(DateTimeUtil.DEFAULT_DATE_PATTERN)); - List rankTypes = new ArrayList<>(); - if (config.inActTimeRange(now)){ - rankTypes.add(QixiConstant.RankType.HONEY_DAY); - rankTypes.add(QixiConstant.RankType.LOVE_DAY); - } else if (Duration.between(now, config.getEndTime()).toDays() == 0L){ - rankTypes.add(QixiConstant.RankType.HONEY_DAY); - rankTypes.add(QixiConstant.RankType.LOVE_DAY); - rankTypes.add(QixiConstant.RankType.HONEY_TOTAL); - rankTypes.add(QixiConstant.RankType.LOVE_TOTAL); - } - - if (CollectionUtils.isEmpty(rankTypes)){ - return; - } - - for (Byte rankType: rankTypes) { - SpringContextHolder.getBean(QixiRankService.class).sendRankReward(config, rankType, yesterDayStr, needFlag); - } - } - - @Async - public void sendRankReward(QixiRankConfigDto config, Byte rankType, String date, boolean needFlag) { - if (CollectionUtils.isEmpty(config.getRankRewardMap()) - || CollectionUtils.isEmpty(config.getRankSettlentSizeMap())){ - return; - } - - String rankKey = getRankKey(rankType, date, config); - - RScoredSortedSet rank = redissonClient.getScoredSortedSet(rankKey); - - Integer settlementSize = config.getRankSettlentSizeMap().get(rankType); - if (null == settlementSize){ - return; - } - - Collection> uidScoreList = rank.entryRangeReversed(0, settlementSize - 1); - if (CollectionUtils.isEmpty(uidScoreList)){ - //todo log error - return; - } - - List> rewardConfigList = config.getRankRewardMap().get(rankType); - if (CollectionUtils.isEmpty(rewardConfigList)){ - return; - } - - String sendRewardFlagKey = rankKey + "_send_reward_flag"; - RSet flagSet = redissonClient.getSet(sendRewardFlagKey); - - int rankIndex = 0; - for (ScoredEntry rankItem: uidScoreList) { - Long uid = rankItem.getValue(); - - int rewardIndex = Math.min(rankIndex, rewardConfigList.size()-1); - List rewards = rewardConfigList.get(rewardIndex); - for (RewardDto r: rewards) { - String uidRewardKey = uid + "_" + r.getType() + "_" + r.getRefId(); - if (needFlag && flagSet.contains(uidRewardKey)){ - continue; - } - - RewardVo vo = rewardUtil.sendRewardByType(uid, r, "2023七夕活动-收送礼榜奖励结算"); - - log.info("[2023七夕活动]-收送礼榜 {} 发奖励， 第 {} 名 {} 奖励 {}", rankKey, rankIndex, uid, JSON.toJSONString(vo)); - - if (needFlag){ - flagSet.add(uidRewardKey); - } - } - - rankIndex++; - } - - } - - public void buildCpHourRank(LocalDateTime now) { - LocalDateTime hourAgo = now.minusHours(1L); - QixiRankConfigDto config = getConfig(); - if (!config.inActTimeRange(hourAgo)){ - return; - } - - hourCpBucket.set(null); - - DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern(DateTimeUtil.DEFAULT_DATETIME_PATTERN); - String startTime = hourAgo.format(dateTimeFormatter); - String endTime = now.format(dateTimeFormatter); - - QixiRankHourCp hourCp = qixiRankDao.getHourCp(startTime, endTime, config.getActivityGiftId()); - if (null == hourCp){ - log.info("[2023七夕]-收送礼榜 {} - {} 内 甜蜜榜没人上榜", startTime, endTime); - return; - } - - hourCpBucket.set(hourCp); - - log.info("[2023七夕]-收送礼榜 {} - {} 内 甜蜜榜榜一 {} 和 贡献了 {} 甜蜜值的御前带刀侍卫 {}", - startTime, endTime, hourCp.getReceiverUid(), hourCp.getTotalScore(), hourCp.getSenderUid()); - - } - - @Override - public void afterPropertiesSet() throws Exception { - hourCpBucket = redissonClient.getBucket(QixiConstant.RedisKey.QIXI_RANK_HOUR_CP); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/service/QixiRedLineDrawService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/service/QixiRedLineDrawService.java deleted file mode 100644 index 35487e48c..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/service/QixiRedLineDrawService.java +++ /dev/null @@ -1,138 +0,0 @@ -package com.accompany.business.qixi.service; - -import com.accompany.business.common.dto.RewardDto; -import com.accompany.business.common.dto.RewardDtoLinearConfig; -import com.accompany.business.common.vo.RewardVo; -import com.accompany.business.qixi.constant.QixiConstant; -import com.accompany.business.qixi.dto.QixiRedLineConfigDto; -import com.accompany.business.util.RewardUtil; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.exception.ServiceException; -import com.alibaba.fastjson.JSON; -import lombok.extern.slf4j.Slf4j; -import org.redisson.api.RMap; -import org.redisson.api.RQueue; -import org.redisson.api.RedissonClient; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; -import org.springframework.util.StopWatch; -import org.springframework.util.StringUtils; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -@Service -@Slf4j -public class QixiRedLineDrawService implements InitializingBean { - - @Autowired - private RedissonClient redissonClient; - @Autowired - private RewardUtil rewardUtil; - - private RQueue pool; - - private RMap totalStock; - - public RewardVo draw(QixiRedLineConfigDto config, Long uid, String date) { - List rewardList = pool.poll(1); - if (CollectionUtils.isEmpty(rewardList)){ - appendToPool(config, date); - return draw(config, uid, date); - } - - RewardDto reward = rewardList.get(0); - - //String recordListStr = recordList.stream().map(r->String.format("%d-%s x %d", r.getGiftId(), r.getGiftName(), r.getNum())).collect(Collectors.joining("，")); - //log.info("[寻爱之旅] {} 抽 {} 次 产出 {}", uid, num, recordListStr); - - - RewardVo vo = rewardUtil.sendRewardByType(uid, reward, "[2023七夕活动]-红线 祈愿"); - - //todo log - - return vo; - } - - private void appendToPool(QixiRedLineConfigDto config, String date) { - // 最大连抽是200，当少于 3个最大连抽时， 需要添加礼物到抽奖池水 - int poolSize = pool.size(); - if (poolSize > 0){ - return; - } - - StopWatch watch = new StopWatch(); - watch.start(); - - List rewardList = config.getRewardList(); - if (CollectionUtils.isEmpty(rewardList)){ - log.error("[2023七夕活动]-红线 未获取到奖池配置"); - throw new ServiceException(BusiStatus.SERVERERROR); - } - - String dateStr = StringUtils.hasText(date)? date : DateTimeUtil.getCurrentDate(); - String dayStockKey = QixiConstant.RedisKey.QIXI_REDLINE_DRAW_DAY_STOCK + "_" + dateStr; - RMap dayStock = redissonClient.getMap(dayStockKey); - - List newPool = new ArrayList<>(); - - for (RewardDtoLinearConfig item: rewardList) { - int count = item.getCount(); - - if (null != item.getTotalStock() && item.getTotalStock() > 0){ - String totalStockItemKey = item.getType() + "_" + item.getRefId(); - Integer totalCount = totalStock.getOrDefault(totalStockItemKey, 0); - int totalRemain = item.getTotalStock() - totalCount; - if (totalRemain <= 0){ - continue; - } - count = Math.min(count, totalRemain); - } - if (null != item.getDayStock() && item.getDayStock() > 0){ - String dayStockItemKey = item.getType() + "_" + item.getRefId(); - Integer dayCount = dayStock.getOrDefault(dayStockItemKey, 0); - int dayRemain = item.getDayStock() - dayCount; - if (dayRemain <= 0){ - continue; - } - count = Math.min(count, dayRemain); - } - - RewardDto dto = new RewardDto(); - BeanUtils.copyProperties(item, dto); - - for (int i = 0; i < count; i++) { - newPool.add(dto); - } - - if (null != item.getTotalStock() && item.getTotalStock() > 0){ - String totalStockItemKey = item.getType() + "_" + item.getRefId(); - totalStock.addAndGet(totalStockItemKey, count); - } - if (null != item.getDayStock() && item.getDayStock() > 0){ - String dayStockItemKey = item.getType() + "_" + item.getRefId(); - dayStock.addAndGet(dayStockItemKey, count); - } - } - - Collections.shuffle(newPool); - - pool.addAll(newPool); - - watch.stop(); - long ms = watch.getTotalTimeMillis(); - log.info("[2023七夕活动]-红线 生成奖池 耗时 {} ms，总共 {} 个礼物， 配置 {}", - ms, newPool.size(), JSON.toJSONString(rewardList)); - } - - @Override - public void afterPropertiesSet() throws Exception { - pool = redissonClient.getQueue(QixiConstant.RedisKey.QIXI_REDLINE_DRAW_POOL); - totalStock = redissonClient.getMap(QixiConstant.RedisKey.QIXI_REDLINE_DRAW_TOTAL_STOCK); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/service/QixiRedLineService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/service/QixiRedLineService.java deleted file mode 100644 index c3b3fd3d2..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/service/QixiRedLineService.java +++ /dev/null @@ -1,265 +0,0 @@ -package com.accompany.business.qixi.service; - -import com.accompany.business.common.vo.RewardVo; -import com.accompany.business.mapper.QixiRedLineRecordDao; -import com.accompany.business.qixi.QixiRedBagDao; -import com.accompany.business.qixi.QixiRedLineNumDao; -import com.accompany.business.qixi.constant.QixiConstant; -import com.accompany.business.qixi.dto.QixiRedLineConfigDto; -import com.accompany.business.qixi.dto.QixiUserRedBagDto; -import com.accompany.business.qixi.model.QixiRedLineUserRecord; -import com.accompany.business.qixi.vo.QixiRedLineConfigVo; -import com.accompany.business.qixi.vo.QixiRedLineUserRecordVo; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.base.SpringContextHolder; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.service.SysConfService; -import com.alibaba.fastjson.JSON; -import lombok.extern.slf4j.Slf4j; -import org.redisson.api.RLock; -import org.redisson.api.RedissonClient; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; -import org.springframework.util.StringUtils; - -import java.time.LocalDateTime; -import java.util.*; -import java.util.concurrent.TimeUnit; -import java.util.function.Function; - -@Service -@Slf4j -public class QixiRedLineService { - - @Autowired - private RedissonClient redissonClient; - @Autowired - private SysConfService sysConfService; - @Autowired - private QixiRedBagDao qixiRedBagDao; - @Autowired - private QixiRedLineNumDao qixiRedLineNumDao; - @Autowired - private QixiRedLineRecordDao qixiRedLineRecordDao; - @Autowired - private QixiRedLineDrawService drawService; - - public QixiRedLineConfigVo getConfigVo(Long uid) { - QixiRedLineConfigVo configVo = new QixiRedLineConfigVo(); - configVo.setUid(uid); - configVo.setRedLineNum(qixiRedLineNumDao.getUserRedLineNum(uid)); - - List userRedBagVoList = new ArrayList<>(); - Map userRedBagMap = qixiRedBagDao.getUserRedBagMap(uid); - for (QixiUserRedBagDto dto: userRedBagMap.values()) { - QixiRedLineConfigVo.QixiUserRedBagVo vo = new QixiRedLineConfigVo.QixiUserRedBagVo(); - vo.setId(dto.getId()); - vo.setAble(dto.getAble()); - vo.setType(dto.getType()); - vo.setName(dto.getName()); - vo.setNum(dto.getNum()); - vo.setUnit(dto.getUnit()); - vo.setPic(dto.getPic()); - userRedBagVoList.add(vo); - } - userRedBagVoList.sort(Comparator.comparingInt(QixiRedLineConfigVo.QixiUserRedBagVo::getId)); - configVo.setDrawList(userRedBagVoList); - return configVo; - } - - public void freshRedBag(Long uid) { - withLock(uid, (userRedBagMap)->{ - if (!userRedBagMap.values().stream().allMatch(QixiUserRedBagDto::getAble)){ - qixiRedBagDao.freshRedBag(uid); - log.info("[2023七夕活动]-红线 {} 刷新成功", uid); - } - return null; - }); - } - - public void addUserRedLine(Long uid, Integer userTotalXiqueNum) { - if (userTotalXiqueNum <= 0){ - return; - } - int totalRedLineNum = userTotalXiqueNum / 10; - Integer userTotalRedLineNum = qixiRedLineNumDao.getUserTotalRedLineNum(uid); - int needAddNum = totalRedLineNum - userTotalRedLineNum; - if (needAddNum > 0){ - qixiRedLineNumDao.addUserRedLineNum(uid, needAddNum); - } - } - - public Integer draw(Long uid, Integer id) { - LocalDateTime now = LocalDateTime.now(); - QixiRedLineConfigDto config = getConfig(); - if (!config.inActTimeRange(now)){ - throw new ServiceException(BusiStatus.NOT_IN_ACT_TIME_RANGE); - } - - int redLineNum = qixiRedLineNumDao.getUserRedLineNum(uid); - if (redLineNum <= 0){ - throw new ServiceException(BusiStatus.PARAMERROR, QixiConstant.BusiStatus.UNENOUGH_RED_LINE_NUM); - } - - Map userRedBagMap = qixiRedBagDao.getUserRedBagMap(uid); - Integer redBagId = getAbleRedBagIdById(userRedBagMap, id); - - return withLock(uid, (redBagMap)->{ - int curRedLineNum = qixiRedLineNumDao.getUserRedLineNum(uid); - if (curRedLineNum <= 0){ - throw new ServiceException(BusiStatus.PARAMERROR, QixiConstant.BusiStatus.UNENOUGH_RED_LINE_NUM); - } - - String redBagIdStr = String.valueOf(redBagId); - QixiUserRedBagDto redBag = redBagMap.get(redBagIdStr); - if (!redBag.getAble()){ - if (null != id){ - throw new ServiceException(BusiStatus.SERVERERROR, QixiConstant.BusiStatus.UNABLE_RED_BAG); - } - Integer newRedBagId = getAbleRedBagIdById(userRedBagMap, null); - String newRedBagIdStr = String.valueOf(newRedBagId); - redBag = redBagMap.get(newRedBagIdStr); - } - - RewardVo reward = drawService.draw(config, uid, null); - - SpringContextHolder.getBean(QixiRedLineService.class).addUserRecord(uid, redBag.getId(), reward, now); - - updateRedBagMap(uid, redBagMap, redBag, reward); - - qixiRedLineNumDao.reduceUserRedLineNum(uid); - - return redBag.getId(); - }); - } - - public List batchDraw(Long uid, Integer num, String date) { - LocalDateTime now = LocalDateTime.now(); - QixiRedLineConfigDto config = getConfig(); - if (!config.inActTimeRange(now)){ - throw new ServiceException(BusiStatus.NOT_IN_ACT_TIME_RANGE); - } - - int redLineNum = qixiRedLineNumDao.getUserRedLineNum(uid); - if (redLineNum < num){ - throw new ServiceException(BusiStatus.PARAMERROR, QixiConstant.BusiStatus.UNENOUGH_RED_LINE_NUM); - } - - return withLock(uid, (redBagMap)->{ - int curRedLineNum = qixiRedLineNumDao.getUserRedLineNum(uid); - if (curRedLineNum < num){ - throw new ServiceException(BusiStatus.PARAMERROR, QixiConstant.BusiStatus.UNENOUGH_RED_LINE_NUM); - } - - List rewardVoList = new ArrayList<>(); - - for (int i = 0; i < num; i++) { - RewardVo reward = drawService.draw(config, uid, date); - - SpringContextHolder.getBean(QixiRedLineService.class).addUserRecord(uid, null, reward, now); - - qixiRedLineNumDao.reduceUserRedLineNum(uid); - - rewardVoList.add(reward); - } - - return rewardVoList; - }); - } - - private void updateRedBagMap(Long uid, Map redBagMap, QixiUserRedBagDto redBag, RewardVo reward) { - redBag.setAble(Boolean.FALSE); - redBag.setType(reward.getType()); - redBag.setName(reward.getName()); - redBag.setNum(reward.getNum()); - redBag.setUnit(reward.getUnit()); - redBag.setPic(reward.getPic()); - redBagMap.put(String.valueOf(redBag.getId()), redBag); - qixiRedBagDao.updateUserRedBagMap(uid, redBagMap); - } - - @Async - public void addUserRecord(Long uid, Integer redBagId, RewardVo reward, LocalDateTime now) { - QixiRedLineUserRecord record = new QixiRedLineUserRecord(); - record.setUid(uid); - record.setRedBagId(redBagId); - record.setType(reward.getType()); - record.setRefId(reward.getRefId()); - record.setName(reward.getName()); - record.setNum(reward.getNum()); - record.setUnit(reward.getUnit()); - record.setCreateTime(DateTimeUtil.converLocalDateTimeToDate(now)); - qixiRedLineRecordDao.insertRecord(record); - } - - private Integer getAbleRedBagIdById(Map userRedBagMap, Integer id){ - QixiUserRedBagDto redBag = null; - if (null != id){ - redBag = userRedBagMap.get(String.valueOf(id)); - if (null == redBag || !redBag.getAble()){ - throw new ServiceException(BusiStatus.SERVERERROR, QixiConstant.BusiStatus.UNABLE_RED_BAG); - } - } else { - Optional ableRedbagOptional = userRedBagMap.values().stream().filter(QixiUserRedBagDto::getAble).findAny(); - if (!ableRedbagOptional.isPresent()){ - throw new ServiceException(BusiStatus.SERVERERROR, QixiConstant.BusiStatus.NONE_ABLE_RED_BAG); - } - redBag = ableRedbagOptional.get(); - } - return redBag.getId(); - } - - private T withLock(Long uid, Function, T> function){ - String lockKey = QixiConstant.RedisKey.QIXI_REDLINE_USER_RED_BAG_LOCK + "_" + uid; - RLock lock = redissonClient.getLock(lockKey); - boolean isLocked = false; - try { - isLocked = lock.tryLock(3, TimeUnit.SECONDS); - if (!isLocked){ - log.error("[2023七夕活动]-红线 {} 获取 {} 锁超时", uid, lockKey); - throw new ServiceException(BusiStatus.SERVERBUSY); - } - Map userRedBagMap = qixiRedBagDao.getUserRedBagMap(uid); - return function.apply(userRedBagMap); - } catch (Exception e) { - log.error("[2023七夕活动]-红线 {} 获取 {} 锁异常", uid, lockKey, e); - throw new ServiceException(BusiStatus.SERVERBUSY); - } finally { - if (isLocked){ - lock.unlock(); - } - } - } - - public List pageRecord(Long uid, Integer page, Integer size) { - List voList = new ArrayList<>(); - - int start = (page-1)*size; - List entityList = qixiRedLineRecordDao.pageUserRecord(uid, start, size); - if (CollectionUtils.isEmpty(entityList)){ - return voList; - } - - for (QixiRedLineUserRecord entity: entityList) { - QixiRedLineUserRecordVo vo = new QixiRedLineUserRecordVo(); - vo.setUid(entity.getUid()); - vo.setRewardDesc(entity.getDesc()); - vo.setCreateTime(entity.getCreateTime()); - voList.add(vo); - } - - return voList; - } - - public QixiRedLineConfigDto getConfig(){ - String configStr = sysConfService.getSysConfValueById(QixiConstant.SysConfId.ACT_QIXI_REDLINE_CONFIG); - if (!StringUtils.hasText(configStr)){ - throw new ServiceException(BusiStatus.ALREADY_NOTEXISTS_CONFIG); - } - return JSON.parseObject(configStr, QixiRedLineConfigDto.class); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/service/QixiRoomRankService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/service/QixiRoomRankService.java deleted file mode 100644 index 6528c19ea..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/service/QixiRoomRankService.java +++ /dev/null @@ -1,147 +0,0 @@ -package com.accompany.business.qixi.service; - -import com.accompany.business.common.vo.ActivityRankItemVo; -import com.accompany.business.common.vo.ActivityRankVo; -import com.accompany.business.model.Hall; -import com.accompany.business.qixi.constant.QixiConstant; -import com.accompany.business.qixi.dto.QixiRoomRankConfigDto; -import com.accompany.business.service.hall.HallService; -import com.accompany.business.service.room.RoomService; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.model.Room; -import com.accompany.core.service.SysConfService; -import com.alibaba.fastjson.JSON; -import lombok.extern.slf4j.Slf4j; -import org.redisson.api.RScoredSortedSet; -import org.redisson.api.RedissonClient; -import org.redisson.client.protocol.ScoredEntry; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; -import org.springframework.util.StringUtils; - -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -@Service -@Slf4j -public class QixiRoomRankService implements InitializingBean { - - @Autowired - private SysConfService sysConfService; - @Autowired - private RedissonClient redissonClient; - @Autowired - private RoomService roomService; - @Autowired - private HallService hallService; - - private RScoredSortedSet rank; - - public ActivityRankVo getRank(Long uid) { - - //拿前30 - Collection> uidScoreList = rank.entryRangeReversed(0, 29); - - int meRankIndex = 0; - Long meScore = null; - - List rankItemVoList = new ArrayList<>(); - - if (!CollectionUtils.isEmpty(uidScoreList)){ - int rankIndex = 1; - for (ScoredEntry uidScore: uidScoreList){ - if (uid.equals(uidScore.getValue())){ - meRankIndex = rankIndex; - meScore = BigDecimal.valueOf(uidScore.getScore()).setScale(0, RoundingMode.DOWN).longValue(); - break; - } - rankIndex++; - } - - List uidList = uidScoreList.stream().map(ScoredEntry::getValue).collect(Collectors.toList()); - Map roomMap = roomService.getRoomMap(uidList); - - rankIndex = 1; - for (ScoredEntry uidScore: uidScoreList){ - Room room = roomMap.get(uidScore.getValue()); - - ActivityRankItemVo rankItemVo = new ActivityRankItemVo(); - rankItemVo.setRanking(rankIndex++); - rankItemVo.setScore(BigDecimal.valueOf(uidScore.getScore()).setScale(0, RoundingMode.DOWN).longValue()); - rankItemVo.setUid(uidScore.getValue()); - - if (null != room){ - rankItemVo.setNick(room.getTitle()); - rankItemVo.setAvatar(room.getAvatar()); - } - - rankItemVoList.add(rankItemVo); - } - } - - if (null == meScore){ - Double meScoreD = rank.getScore(uid); - if (null == meScoreD){ - meScore = 0L; - } else { - meScore = BigDecimal.valueOf(meScoreD).setScale(0, RoundingMode.DOWN).longValue(); - } - } - - ActivityRankItemVo meRankVo = new ActivityRankItemVo(); - meRankVo.setUid(uid); - meRankVo.setRanking(meRankIndex); - meRankVo.setScore(meScore); - - Room meRoom = roomService.getRoomByUid(uid); - if (null != meRoom){ - meRankVo.setNick(meRoom.getTitle()); - meRankVo.setAvatar(meRoom.getAvatar()); - } - - return new ActivityRankVo(null, null, null, rankItemVoList, meRankVo); - } - - public void updateRank(Long roomUid, Long sendUid, Long recvUid, QixiRoomRankConfigDto config, Integer giftId, Long goldNum) { - Hall roomHall = hallService.getValidHallByUid(roomUid); - if (null == roomHall){ - return; - } - - Hall sendHall = hallService.getValidHallByUid(sendUid); - if (null != sendHall){ - return; - } - - Hall recvHall = hallService.getValidHallByUid(recvUid); - if (null != recvHall){ - return; - } - - double score = goldNum * config.getScorePercent(giftId); - rank.addScore(roomUid, score); - log.info("[2023七夕活动]-房间榜 {} 房间发送送礼 {} 总价值 {} 钻石，增加情缘值 {}", roomUid, giftId, goldNum, score); - } - - public QixiRoomRankConfigDto getConfig(){ - String configStr = sysConfService.getSysConfValueById(QixiConstant.SysConfId.ACT_QIXI_ROOM_RANK_CONFIG); - if (!StringUtils.hasText(configStr)){ - throw new ServiceException(BusiStatus.ALREADY_NOTEXISTS_CONFIG); - } - return JSON.parseObject(configStr, QixiRoomRankConfigDto.class); - } - - @Override - public void afterPropertiesSet() throws Exception { - rank = redissonClient.getScoredSortedSet(QixiConstant.RedisKey.QIXI_ROOM_RANK); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/service/QixiXiqueService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/service/QixiXiqueService.java deleted file mode 100644 index eaa36dea2..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/service/QixiXiqueService.java +++ /dev/null @@ -1,241 +0,0 @@ -package com.accompany.business.qixi.service; - -import com.accompany.business.common.constant.RewardTypeEnum; -import com.accompany.business.qixi.QixiXiqueNumDao; -import com.accompany.business.qixi.QixiXiqueTaskDao; -import com.accompany.business.qixi.constant.QixiConstant; -import com.accompany.business.qixi.dto.QixiXiqueConfigDto; -import com.accompany.business.qixi.event.QixiXiqueAddEvent; -import com.accompany.business.qixi.vo.QixiXiqueConfigVo; -import com.accompany.business.util.RewardUtil; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.service.SysConfService; -import com.alibaba.fastjson.JSON; -import lombok.extern.slf4j.Slf4j; -import org.redisson.api.RLock; -import org.redisson.api.RedissonClient; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; - -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; - -@Service -@Slf4j -public class QixiXiqueService { - - @Autowired - private SysConfService sysConfService; - @Autowired - private RedissonClient redissonClient; - @Autowired - private QixiXiqueNumDao qixiXiqueNumDao; - @Autowired - private QixiXiqueTaskDao qixiXiqueTaskDao; - @Autowired - private RewardUtil rewardUtil; - @Autowired - private ApplicationContext applicationContext; - - private final DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern(DateTimeUtil.DEFAULT_DATE_PATTERN); - - public QixiXiqueConfigVo getConfigVo(Long uid){ - QixiXiqueConfigDto dto = getConfig(); - - LocalDateTime now = LocalDateTime.now(); - String date = now.format(dateFormatter); - - if (dto.inActTimeRange(now)){ - QixiXiqueConfigDto.QixiXiqueDailyTask dailyTask = dto.getDailyTask().get(QixiConstant.XiqueTaskId.VISIT); - processTask(dailyTask, uid, date, 1); - } - - QixiXiqueConfigVo vo = new QixiXiqueConfigVo(); - vo.setUid(uid); - vo.setStartTime(DateTimeUtil.localDateTime2Date(dto.getStartTime())); - vo.setEndTime(DateTimeUtil.localDateTime2Date(dto.getEndTime())); - vo.setXiqueNum(qixiXiqueNumDao.getUserXiqueNum(uid)); - - Long serverMaxXiqueNum = dto.getServerMaxXiqueNum(); - vo.setServerMaxXiqueNum(serverMaxXiqueNum); - - Long serverCurXiqueNum = getServerCurXiqueNum(); - vo.setServerCurXiqueNum(serverCurXiqueNum); - - vo.setDevotedBtnStatus(getDevotedStatus(uid, serverMaxXiqueNum, serverCurXiqueNum)); - - vo.setDailyTaskList(listUserDailyTaskVo(uid, date, dto.getDailyTask())); - - return vo; - } - - private Byte getDevotedStatus(Long uid, Long serverMaxXiqueNum, Long serverCurXiqueNum) { - if (serverCurXiqueNum < serverMaxXiqueNum){ - return QixiConstant.XiqueDevotedBtnStatus.DEVOTED; - } - - Integer userDevotedXiqueNum = qixiXiqueNumDao.getUserDevotedXiqueNum(uid); - if (null == userDevotedXiqueNum){ - return QixiConstant.XiqueDevotedBtnStatus.NOT_GET; - } - - return userDevotedXiqueNum > 0? - QixiConstant.XiqueDevotedBtnStatus.CAN_GET: - QixiConstant.XiqueDevotedBtnStatus.HAS_GOT; - } - - public Integer devotedXique(Long uid, Integer num) { - LocalDateTime now = LocalDateTime.now(); - - QixiXiqueConfigDto configDto = getConfig(); - if (!configDto.inActTimeRange(now)){ - throw new ServiceException(BusiStatus.NOT_IN_ACT_TIME_RANGE); - } - - Integer curNum = qixiXiqueNumDao.getUserXiqueNum(uid); - if (curNum < num){ - throw new ServiceException(BusiStatus.SERVERERROR, QixiConstant.BusiStatus.UNENOUGH_XIQUE); - } - - Long maxNum = configDto.getServerMaxXiqueNum(); - Long serverNum = qixiXiqueNumDao.getServerCurXiqueNum(); - if (serverNum >= maxNum){ - throw new ServiceException(BusiStatus.SERVERERROR, QixiConstant.BusiStatus.OVER_XIQUE_SERVER_MAX); - } - - boolean locked = false; - RLock lock = redissonClient.getLock(QixiConstant.RedisKey.QIXI_XIQUE_DEVOTED_LOCK); - try { - locked = lock.tryLock(3, TimeUnit.SECONDS); - if (!locked){ - throw new ServiceException(BusiStatus.SERVERBUSY); - } - - serverNum = qixiXiqueNumDao.getServerCurXiqueNum(); - if (serverNum >= maxNum){ - throw new ServiceException(BusiStatus.SERVERERROR, QixiConstant.BusiStatus.OVER_XIQUE_SERVER_MAX); - } - - Long remainNum = maxNum - serverNum; - Integer devotedNum = Math.min(remainNum.intValue(), num); - - serverNum = qixiXiqueNumDao.devotedXique(uid, devotedNum); - - log.info("[2023七夕活动]-喜鹊 {} 投放 {} 喜鹊 成功， 全服累计投入 {} 喜鹊", uid, devotedNum, serverNum); - - } catch (InterruptedException e) { - log.error("[2023七夕活动]-喜鹊 投放喜鹊 加锁异常", e); - throw new ServiceException(BusiStatus.SERVERBUSY); - } finally { - if (locked){ - lock.unlock(); - } - } - - return 0; - } - - public void getXiqueReward(Long uid) { - LocalDateTime now = LocalDateTime.now(); - - QixiXiqueConfigDto configDto = getConfig(); - if (!configDto.inActTimeRange(now)){ - throw new ServiceException(BusiStatus.NOT_IN_ACT_TIME_RANGE); - } - - Long serverCurXiqueNum = getServerCurXiqueNum(); - Byte userDevotedStatus = getDevotedStatus(uid, configDto.getServerMaxXiqueNum(), serverCurXiqueNum); - if (QixiConstant.XiqueDevotedBtnStatus.DEVOTED.equals(userDevotedStatus)){ - throw new ServiceException(BusiStatus.SERVERERROR, QixiConstant.BusiStatus.UNENOUGH_XIQUE_SERVER_NUM); - } else if (QixiConstant.XiqueDevotedBtnStatus.NOT_GET.equals(userDevotedStatus)) { - throw new ServiceException(BusiStatus.SERVERERROR, QixiConstant.BusiStatus.NEVER_DEVOTED_XIQUE); - } else if (QixiConstant.XiqueDevotedBtnStatus.HAS_GOT.equals(userDevotedStatus)) { - throw new ServiceException(BusiStatus.SERVERERROR, QixiConstant.BusiStatus.HAS_GET_REWARD); - } - - if (!qixiXiqueNumDao.updateDevotedStatus(uid)){ - throw new ServiceException(BusiStatus.SERVERERROR, QixiConstant.BusiStatus.HAS_GET_REWARD); - } - - rewardUtil.sendRewardByType(uid, RewardTypeEnum.HEADWEAR, configDto.getXiqueHeadwearId(), configDto.getXiqueHeadwearDay(), "2023七夕活动-喜鹊", Boolean.FALSE, null); - } - - public void processTask(QixiXiqueConfigDto.QixiXiqueDailyTask dailyTask, Long uid, String date, Integer process) { - if (null == dailyTask){ - throw new ServiceException(BusiStatus.SERVERERROR); - } - - Integer taskId = dailyTask.getId(); - String taskKey = buildTaskKey(uid, date, taskId); - int xiqueReward = qixiXiqueTaskDao.processTask(taskKey, dailyTask, process); - if (xiqueReward > 0) { - Integer curXique = addUserXique(uid, xiqueReward); - log.info("[2023七夕]-喜鹊 {} 在 {} 完成 {} 任务，获得 {} 喜鹊， 当前拥有 {} 喜鹊", uid, date, taskId, xiqueReward, curXique); - } - } - - public Integer addUserXique(Long uid, Integer num){ - Integer userXique = qixiXiqueNumDao.addUserXiqueNum(uid, num); - applicationContext.publishEvent(new QixiXiqueAddEvent(uid)); - return userXique; - } - - public Long getServerCurXiqueNum(){ - return qixiXiqueNumDao.getServerCurXiqueNum(); - } - - public List listUserDailyTaskVo(Long uid, String date, - Map dailyTaskConfig){ - Set keySet = dailyTaskConfig.keySet().stream() - .map(id->buildTaskKey(uid, date, id)).collect(Collectors.toSet()); - Map progressMap = qixiXiqueTaskDao.getUserDailyTaskProgress(keySet); - - List taskVoList = new ArrayList<>(); - - for (Map.Entry entry: dailyTaskConfig.entrySet()) { - String key = buildTaskKey(uid, date, entry.getKey()); - Integer progress = progressMap.getOrDefault(key, 0); - - QixiXiqueConfigDto.QixiXiqueDailyTask dto = entry.getValue(); - - Integer maxNeed = dto.getNeedMap().keySet().stream().mapToInt(Integer::intValue).max().getAsInt(); - Integer maxXiqueNum = dto.getNeedMap().get(maxNeed); - - QixiXiqueConfigVo.QixiXiqueDailyTask vo = new QixiXiqueConfigVo.QixiXiqueDailyTask(); - vo.setId(dto.getId()); - vo.setDesc(dto.getDesc()); - vo.setXiqueNum(maxXiqueNum); - vo.setNeed(maxNeed); - vo.setCur(progress); - vo.setBtnStatus(progress >= maxNeed? - QixiConstant.XiqueDailyTaskBtnStatus.HAS_FINISH: - QixiConstant.XiqueDailyTaskBtnStatus.UN_FINISH); - - taskVoList.add(vo); - } - - return taskVoList; - } - - private String buildTaskKey(Long uid, String date, Integer taskId){ - return String.join("_", String.valueOf(uid), date, String.valueOf(taskId)); - } - - public QixiXiqueConfigDto getConfig(){ - String configStr = sysConfService.getSysConfValueById(QixiConstant.SysConfId.ACT_QIXI_XIQUE_CONFIG); - if (!StringUtils.hasText(configStr)){ - throw new ServiceException(BusiStatus.ALREADY_NOTEXISTS_CONFIG); - } - return JSON.parseObject(configStr, QixiXiqueConfigDto.class); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/signin/handler/RepairSignInHandler.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/signin/handler/RepairSignInHandler.java deleted file mode 100644 index 9d52d689f..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/signin/handler/RepairSignInHandler.java +++ /dev/null @@ -1,190 +0,0 @@ -package com.accompany.business.signin.handler; - -import cn.hutool.core.collection.CollectionUtil; -import com.accompany.business.activity.dto.ActTaskContext; -import com.accompany.business.activity.enums.ActTaskStatusEnum; -import com.accompany.business.activity.handle.IActTaskHandler; -import com.accompany.business.activity.model.ActTask; -import com.accompany.business.activity.model.ActTaskCondition; -import com.accompany.business.activity.model.ActUserTask; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.utils.DateTimeUtil; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.Arrays; -import java.util.Date; -import java.util.List; - -/** - * @author: liaozetao - * @date: 2024/4/25 09:50 - * @description: - */ -@Slf4j -@Component -public class RepairSignInHandler extends IActTaskHandler { - - @Override - protected boolean eq(ActTaskCondition actTaskCondition, ActTaskContext context) { - Date now = new Date(); - Long conditionValue = actTaskCondition.getConditionValue(); - String giftSendUuid = context.getGiftSendUuid(); - Integer giftId = context.getGiftId(); - Integer index = context.getIndex(); - Long uid = context.getSendUid(); - ActTask actTask = context.getActTask(); - if (giftId == null) { - return false; - } - if (jedisService.exits(RedisKey.act_user_complete_task_status.getKey(giftSendUuid, giftId.toString(), index.toString()))) { - return false; - } - if (conditionValue == null || !conditionValue.equals(giftId.longValue())) { - return false; - } - String startTimeFormat = actTask.getStartTimeFormat(); - if (startTimeFormat.equals(DateTimeUtil.convertDate(DateTimeUtil.getBeginTimeOfDay(now)))) { - return false; - } - Integer timeDuration = actTask.getTimeDuration(); - Date startTime = DateTimeUtil.convertStrToDate(LocalDateTime.now().minusDays(1).format(DateTimeFormatter.ofPattern(startTimeFormat)), DateTimeUtil.DEFAULT_DATETIME_PATTERN); - Date endTime = null; - if (startTime != null) { - if (startTime.after(now)) { - log.info("giftSendUuid : {}, startTime : {}", giftSendUuid, startTime); - return false; - } - endTime = new Date(startTime.getTime() + timeDuration * 1000); - } - String conditionCode = actTaskCondition.getConditionCode(); - String activityCode = actTask.getActivityCode(); - String componentCode = actTask.getComponentCode(); - String taskCode = actTask.getTaskCode(); - ActUserTask actUserTask = new ActUserTask(); - actUserTask.setUid(uid); - actUserTask.setActivityCode(activityCode); - actUserTask.setComponentCode(componentCode); - actUserTask.setTaskCode(taskCode); - actUserTask.setConditionCode(conditionCode); - actUserTask.setActivityValue(0L); - actUserTask.setStartTime(startTime); - actUserTask.setEndTime(endTime); - List actUserTasks = actUserTaskService.list(Wrappers.lambdaQuery() - .eq(ActUserTask::getActivityCode, activityCode) - .eq(ActUserTask::getComponentCode, componentCode) - .eq(ActUserTask::getTaskCode, taskCode) - .eq(ActUserTask::getConditionCode, conditionCode) - .eq(ActUserTask::getUid, uid)); - if (CollectionUtil.isNotEmpty(actUserTasks)) { - ActUserTask task = actUserTasks.get(0); - Integer taskStatus = task.getTaskStatus(); - if (ActTaskStatusEnum.COMPLETE.ordinal() == taskStatus || ActTaskStatusEnum.GRANT.ordinal() == taskStatus) { - log.info("gift send taskCode : {} is already complete.", taskCode); - return true; - } - actUserTask.setId(task.getId()); - } - actUserTask.setActivityValue(giftId.longValue()); - actUserTask.setTaskStatus(ActTaskStatusEnum.COMPLETE.ordinal()); - actUserTaskService.saveOrUpdate(actUserTask); - jedisService.set(RedisKey.act_user_complete_task_status.getKey(giftSendUuid, giftId.toString(), index.toString()), String.valueOf(actUserTask.getId()), 5 * 60); - log.info("gift send conditionValue : {}, uid : {}, giftId : {}, startTime : {}, endTime : {} is complete.", conditionValue, uid, giftId, startTime, endTime); - return true; - } - - @Override - public void doHandle(ActTaskContext context) { - Long uid = context.getSendUid(); - Date startTime = context.getTaskStartTime(); - Date endTime = context.getTaskEndTime(); - ActTask actTask = context.getActTask(); - String activityCode = actTask.getActivityCode(); - String componentCode = actTask.getComponentCode(); - String parentCode = actTask.getTaskCode(); - log.info("doHandle uid : {}, parentCode : {}", uid, parentCode); - List actTasks = actTaskService.list(Wrappers.lambdaQuery() - .eq(ActTask::getActivityCode, activityCode) - .eq(ActTask::getComponentCode, componentCode) - .eq(ActTask::getParentCode, parentCode) - .orderByAsc(ActTask::getSeqNo)); - if (CollectionUtil.isEmpty(actTasks)) { - return; - } - List actTaskConditions = actTaskConditionService.list(Wrappers.lambdaQuery() - .eq(ActTaskCondition::getActivityCode, activityCode) - .eq(ActTaskCondition::getComponentCode, componentCode) - .eq(ActTaskCondition::getTaskCode, parentCode)); - if (CollectionUtil.isEmpty(actTaskConditions)) { - return; - } - ActTaskCondition actTaskCondition = actTaskConditions.get(0); - String conditionCode = actTaskCondition.getConditionCode(); - Long conditionValue = actTaskCondition.getConditionValue(); - ActUserTask actUserTask = new ActUserTask(); - actUserTask.setUid(uid); - actUserTask.setActivityCode(activityCode); - actUserTask.setComponentCode(componentCode); - actUserTask.setTaskCode(parentCode); - actUserTask.setConditionCode(conditionCode); - actUserTask.setActivityValue(0L); - actUserTask.setTaskStatus(ActTaskStatusEnum.PROCESS.ordinal()); - actUserTask.setStartTime(startTime); - actUserTask.setEndTime(endTime); - int length = actTasks.size(); - log.info("task execute length : {}", length); - Boolean[] completeArray = new Boolean[length]; - for (int i = 0; i < length; i++) { - completeArray[i] = false; - ActTask children = actTasks.get(i); - String taskCode = children.getTaskCode(); - long taskCount = actUserTaskService.count(Wrappers.lambdaQuery() - .eq(ActUserTask::getActivityCode, activityCode) - .eq(ActUserTask::getComponentCode, componentCode) - .eq(ActUserTask::getTaskCode, taskCode) - .eq(ActUserTask::getUid, uid) - .in(ActUserTask::getTaskStatus, ActTaskStatusEnum.COMPLETE.ordinal(), ActTaskStatusEnum.GRANT.ordinal())); - completeArray[i] = taskCount > 0L; - } - long count = Arrays.stream(completeArray).filter(v -> v).count(); - log.info("task taskCount : {}", count); - actUserTask.setActivityValue(count); - if (conditionValue != null && conditionValue.equals(count)) { - actUserTask.setTaskStatus(ActTaskStatusEnum.COMPLETE.ordinal()); - } - List actUserTasks = actUserTaskService.list(Wrappers.lambdaQuery() - .eq(ActUserTask::getActivityCode, activityCode) - .eq(ActUserTask::getComponentCode, componentCode) - .eq(ActUserTask::getTaskCode, parentCode) - .eq(ActUserTask::getUid, uid) - .eq(ActUserTask::getTaskStatus, ActTaskStatusEnum.PROCESS.ordinal())); - if (CollectionUtil.isEmpty(actUserTasks)) { - actUserTaskService.save(actUserTask); - } else { - ActUserTask task = actUserTasks.get(0); - actUserTask.setId(task.getId()); - actUserTaskService.updateById(actUserTask); - } - if (ActTaskStatusEnum.COMPLETE.ordinal() == actUserTask.getTaskStatus()) { - for (int i = 0; i < length; i++) { - ActTask children = actTasks.get(i); - String taskCode = children.getTaskCode(); - List childTasks = actUserTaskService.list(Wrappers.lambdaQuery() - .eq(ActUserTask::getActivityCode, activityCode) - .eq(ActUserTask::getComponentCode, componentCode) - .eq(ActUserTask::getTaskCode, taskCode) - .eq(ActUserTask::getUid, uid) - .eq(ActUserTask::getTaskStatus, ActTaskStatusEnum.COMPLETE.ordinal())); - if (CollectionUtil.isNotEmpty(childTasks)) { - ActUserTask task = childTasks.get(0); - task.setTaskStatus(ActTaskStatusEnum.GRANT.ordinal()); - actUserTaskService.updateById(task); - } - } - } - log.info("doHandle uid : {}, parentCode : {} is end.", uid, parentCode); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/signin/service/ActSignInService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/signin/service/ActSignInService.java deleted file mode 100644 index 01284f923..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/signin/service/ActSignInService.java +++ /dev/null @@ -1,185 +0,0 @@ -package com.accompany.business.signin.service; - -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.StrUtil; -import com.accompany.business.activity.dto.ActRewardContext; -import com.accompany.business.activity.dto.ActTaskContext; -import com.accompany.business.activity.enums.ActTaskStatusEnum; -import com.accompany.business.activity.model.*; -import com.accompany.business.activity.service.*; -import com.accompany.business.activity.strategy.ActRewardFactory; -import com.accompany.business.activity.vo.ActivityReward; -import com.accompany.business.signin.handler.RepairSignInHandler; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.base.UidContextHolder; -import com.accompany.mq.constant.MqConstant; -import com.accompany.mq.model.ActTaskRewardMqMessage; -import com.accompany.mq.producer.MQMessageProducer; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.*; - -/** - * @author: liaozetao - * @date: 2024/4/25 10:02 - * @description: - */ -@Slf4j -@Service -public class ActSignInService { - - @Autowired - private ActActivityService actActivityService; - - @Autowired - private ActTaskService actTaskService; - - @Autowired - private ActTaskConditionService actTaskConditionService; - - @Autowired - private ActUserTaskService actUserTaskService; - - @Autowired - private ActTaskRewardService actTaskRewardService; - - @Autowired - private MQMessageProducer mqMessageProducer; - - @Autowired - private RepairSignInHandler repairSignInHandler; - - public List click(String activityCode) { - Long uid = UidContextHolder.get(); - Date now = new Date(); - Date beginTimeOfDay = DateTimeUtil.getBeginTimeOfDay(now); - log.info("activityCode : {}, uid : {}, now : {}, beginTimeOfDay : {}", activityCode, uid, now, beginTimeOfDay); - List actTasks = actTaskService.list(Wrappers.lambdaQuery() - .eq(ActTask::getActivityCode, activityCode) - .eq(ActTask::getStartTimeFormat, DateTimeUtil.convertDate(beginTimeOfDay))); - if (CollectionUtil.isEmpty(actTasks)) { - return Collections.emptyList(); - } - ActTask actTask = actTasks.get(0); - String taskCode = actTask.getTaskCode(); - String parentCode = actTask.getParentCode(); - String componentCode = actTask.getComponentCode(); - String startTimeFormat = actTask.getStartTimeFormat(); - Integer timeDuration = actTask.getTimeDuration(); - Date startTime = DateTimeUtil.convertStrToDate(DateTimeUtil.convertDate(now, startTimeFormat)); - Date endTime = startTime; - if (startTime != null) { - endTime = new Date(startTime.getTime() + timeDuration * 1000); - } - List actTaskConditions = actTaskConditionService.list(Wrappers.lambdaQuery() - .eq(ActTaskCondition::getActivityCode, activityCode) - .eq(ActTaskCondition::getComponentCode, componentCode) - .eq(ActTaskCondition::getTaskCode, taskCode) - .orderByAsc(ActTaskCondition::getId)); - if (CollectionUtil.isEmpty(actTaskConditions)) { - return Collections.emptyList(); - } - ActTaskCondition actTaskCondition = actTaskConditions.get(0); - String conditionCode = actTaskCondition.getConditionCode(); - List actUserTasks = actUserTaskService.list(Wrappers.lambdaQuery() - .eq(ActUserTask::getActivityCode, activityCode) - .eq(ActUserTask::getComponentCode, componentCode) - .eq(ActUserTask::getTaskCode, taskCode) - .eq(ActUserTask::getConditionCode, conditionCode) - .eq(ActUserTask::getUid, uid) - .between(ActUserTask::getCreateTime, startTime, endTime) - .orderByAsc(ActUserTask::getCreateTime)); - if (CollectionUtil.isNotEmpty(actUserTasks)) { - ActUserTask task = actUserTasks.get(0); - Integer taskStatus = task.getTaskStatus(); - if (ActTaskStatusEnum.COMPLETE.ordinal() == taskStatus || ActTaskStatusEnum.GRANT.ordinal() == taskStatus) { - log.info("uid : {} 当天已签到.", uid); - return Collections.emptyList(); - } - } - ActUserTask actUserTask = new ActUserTask(); - actUserTask.setUid(uid); - actUserTask.setActivityCode(activityCode); - actUserTask.setComponentCode(componentCode); - actUserTask.setTaskCode(taskCode); - actUserTask.setConditionCode(conditionCode); - actUserTask.setActivityValue(0L); - actUserTask.setStartTime(startTime); - actUserTask.setEndTime(endTime); - actUserTask.setTaskStatus(ActTaskStatusEnum.COMPLETE.ordinal()); - actUserTaskService.save(actUserTask); - //更新签到天数 - String parentTaskCode = null; - actTasks = actTaskService.list(Wrappers.lambdaQuery() - .eq(ActTask::getActivityCode, activityCode) - .eq(ActTask::getTaskCode, parentCode)); - if (CollectionUtil.isNotEmpty(actTasks)) { - ActTask parentTask = actTasks.get(0); - parentTaskCode = parentTask.getTaskCode(); - ActTaskContext context = new ActTaskContext(); - context.setRoomUid(uid); - context.setSendUid(uid); - context.setReceiveUid(uid); - context.setTaskTime(now.getTime()); - context.setGiftSendUuid(UUID.randomUUID().toString()); - context.setActivityStartTime(startTime); - context.setActivityEndTime(endTime); - context.setTaskStartTime(startTime); - context.setTaskEndTime(endTime); - context.setActTask(parentTask); - repairSignInHandler.doHandle(context); - } - List actActivities = actActivityService.list(Wrappers.lambdaQuery() - .eq(ActActivity::getActivityCode, activityCode)); - if (CollectionUtil.isEmpty(actActivities)) { - return Collections.emptyList(); - } - ActActivity actActivity = actActivities.get(0); - //奖品处理 - actUserTasks = actUserTaskService.list(Wrappers.lambdaQuery() - .eq(ActUserTask::getActivityCode, activityCode) - .eq(ActUserTask::getUid, uid) - .eq(ActUserTask::getTaskStatus, ActTaskStatusEnum.COMPLETE.ordinal()) - .between(ActUserTask::getCreateTime, actActivity.getStartTime(), actActivity.getEndTime())); - if (CollectionUtil.isNotEmpty(actUserTasks)) { - for (ActUserTask userTask : actUserTasks) { - long count = actTaskRewardService.count(Wrappers.lambdaQuery() - .eq(ActTaskReward::getActivityCode, activityCode) - .eq(ActTaskReward::getTaskCode, userTask.getTaskCode()) - .eq(StrUtil.isNotEmpty(userTask.getConditionCode()), ActTaskReward::getConditionCode, userTask.getConditionCode())); - if (count > 0L) { - Long userTaskId = actUserTask.getId(); - log.info("sendUser userTaskId : {}", userTaskId); - ActTaskRewardMqMessage message = new ActTaskRewardMqMessage(); - message.setUserTaskId(userTaskId); - mqMessageProducer.send(MqConstant.ACT_TASK_REWARD_TOPIC, message); - } - } - } - long count = actUserTaskService.count(Wrappers.lambdaQuery() - .eq(ActUserTask::getActivityCode, activityCode) - .eq(ActUserTask::getComponentCode, componentCode) - .eq(ActUserTask::getUid, uid)); - List actTaskRewards = actTaskRewardService.list(Wrappers.lambdaQuery() - .eq(ActTaskReward::getActivityCode, activityCode) - .eq(ActTaskReward::getComponentCode, componentCode) - .eq(ActTaskReward::getTaskCode, count > 7 ? parentTaskCode : taskCode)); - if (CollectionUtil.isEmpty(actTaskRewards)) { - return Collections.emptyList(); - } - List activityRewards = new ArrayList<>(); - for (ActTaskReward actTaskReward : actTaskRewards) { - String rewardType = actTaskReward.getRewardType(); - ActRewardContext context = new ActRewardContext(); - context.setUid(uid); - context.setReward(actTaskReward); - ActivityReward reward = ActRewardFactory.getReward(rewardType).getReward(context); - reward.setExpireDay(actTaskReward.getRewardNum()); - activityRewards.add(reward); - } - return activityRewards; - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/snooker/listener/SnookerRankMiniGameListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/snooker/listener/SnookerRankMiniGameListener.java deleted file mode 100644 index cf6c06591..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/snooker/listener/SnookerRankMiniGameListener.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.accompany.business.snooker.listener; - -import com.accompany.business.common.constant.RankRoundEnum; -import com.accompany.business.dto.miniGame.GameEndDto; -import com.accompany.business.dto.miniGame.PlayerResultDto; -import com.accompany.business.event.MiniGameSettlementEvent; -import com.accompany.business.model.miniGame.MiniGame; -import com.accompany.business.service.miniGame.MiniGameService; -import com.accompany.business.snooker.dto.SnookerActConfigDto; -import com.accompany.business.snooker.service.SnookerRankService; -import com.accompany.common.utils.DateTimeUtil; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; - -import java.time.LocalDateTime; -import java.util.Date; -import java.util.Optional; - -@Slf4j -//@Component -public class SnookerRankMiniGameListener implements ApplicationListener { - - @Autowired - private SnookerRankService service; - @Autowired - private MiniGameService miniGameService; - - private final long snookerGameId = 1582551621189419010L; - private final int winnerStatus = 2; - private final int escapedStatus = 1; - - @Override - @Async - public void onApplicationEvent(MiniGameSettlementEvent event) { - GameEndDto gameEndDto = (GameEndDto) event.getSource(); - Date gameEndTime = new Date((gameEndDto.getBattle_end_at().longValue() * 1000L)); - LocalDateTime gameEndLocalDateTime = DateTimeUtil.converDateToLocalDateTime(gameEndTime); - - SnookerActConfigDto config = service.getConfig(); - if (!config.inActTimeRange(gameEndLocalDateTime)){ - return; - } - - RankRoundEnum curRound = config.getCurRound(gameEndLocalDateTime); - if (!RankRoundEnum.FIRST.equals(curRound)){ - return; - } - - Long gameId = gameEndDto.getMg_id(); - MiniGame miniGame = miniGameService.queryMiniGameByMgId(gameId); - if (null == miniGame || !miniGame.getMgId().equals(snookerGameId)){ - return; - } - - Optional escaped = gameEndDto.getResults().stream() - .filter(playerResult-> escapedStatus == playerResult.getIs_escaped()).findAny(); - if (escaped.isPresent()){ - return; - } - - Integer duration = gameEndDto.getBattle_duration(); - if (null != config.getDurationCondition() - && config.getDurationCondition().compareTo(duration) > 0){ - return; - } - - Optional winner = gameEndDto.getResults().stream() - .filter(playerResult-> winnerStatus == playerResult.getIs_win()) - .findAny(); - if (!winner.isPresent()){ - return; - } - - // 送礼人Uid - Long winnerUid = Long.parseLong(winner.get().getUid()); - service.updateRank(winnerUid, curRound, duration); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/snooker/service/SnookerRankService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/snooker/service/SnookerRankService.java deleted file mode 100644 index a4f5b36d3..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/snooker/service/SnookerRankService.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.accompany.business.snooker.service; - -import com.accompany.business.base.rankobj.UsersRankObjectProvider; -import com.accompany.business.base.service.BaseRoundRankActService; -import com.accompany.business.common.constant.RankRoundEnum; -import com.accompany.business.common.dto.RoundRankActConfigDto; -import com.accompany.business.snooker.constant.SnookerActConstant; -import com.accompany.business.snooker.dto.SnookerActConfigDto; -import com.accompany.common.constant.AppEnum; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.service.SysConfService; -import com.alibaba.fastjson.JSON; -import lombok.extern.slf4j.Slf4j; -import org.redisson.api.RLock; -import org.redisson.api.RMap; -import org.redisson.api.RScoredSortedSet; -import org.redisson.api.RedissonClient; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; - -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.concurrent.TimeUnit; - -@Service -@Slf4j -public class SnookerRankService extends BaseRoundRankActService implements InitializingBean { - - @Autowired - private SysConfService sysConfService; - @Autowired - private RedissonClient redissonClient; - - private RMap userDurationMap; - - @Override - public String getActName() { - return SnookerActConstant.actName; - } - - @Override - public RoundRankActConfigDto getRankActConfig() { - return getConfig(); - } - - public SnookerActConfigDto getConfig(){ - String configStr = sysConfService.getSysConfValueById(SnookerActConstant.SysConfId.ACT_RANK_CONFIG); - if (!StringUtils.hasText(configStr)){ - throw new ServiceException(BusiStatus.ALREADY_NOTEXISTS_CONFIG); - } - return JSON.parseObject(configStr, SnookerActConfigDto.class); - } - - public void updateRank(Long uid, RankRoundEnum curRound, Integer duration) { - RScoredSortedSet rank = getRankByRound(curRound); - - boolean locked = false; - String lockKey = String.join("_", AppEnum.getCurApp().getValue(), SnookerActConstant.actName, "rank_lock"); - RLock lock = redissonClient.getLock(lockKey); - try { - locked = lock.tryLock(3, TimeUnit.SECONDS); - if (!locked){ - throw new ServiceException(BusiStatus.SERVERBUSY); - } - - Double score = rank.getScore(uid); - BigDecimal scoreD = null == score? BigDecimal.ZERO: BigDecimal.valueOf(score).setScale(0, RoundingMode.DOWN); - - int totalDuration = userDurationMap.addAndGet(uid, duration); - - BigDecimal totalDurationD = BigDecimal.ONE.subtract(BigDecimal.valueOf(totalDuration) - .divide(BigDecimal.valueOf(1000000), 11, RoundingMode.HALF_UP)); - - score = scoreD.add(BigDecimal.ONE).add(totalDurationD).doubleValue(); - rank.add(score, uid); - - log.info("[2024桌球争霸赛] {} 在第 {} 轮 增加后总分 {}", - uid, curRound, score); - - } catch (InterruptedException e) { - throw new RuntimeException(e); - } finally { - if (locked){ - lock.unlock(); - } - } - - } - - @Override - public void afterPropertiesSet() throws Exception { - String cacheKey = String.join("_", AppEnum.getCurApp().getValue(), SnookerActConstant.actName, "user_duration"); - userDurationMap = redissonClient.getMap(cacheKey); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/special/listener/SpecialGiftRankListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/special/listener/SpecialGiftRankListener.java deleted file mode 100644 index fe58a88f1..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/special/listener/SpecialGiftRankListener.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.accompany.business.special.listener; - -import com.accompany.business.base.listener.RankGiftListener; -import com.accompany.business.event.GiftMessageEvent; -import com.accompany.business.special.service.SpecialGiftRankService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.context.ApplicationListener; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; - -/** - * @author: liaozetao - * @date: 2024/2/1 14:35 - * @description: - */ -@Slf4j -//@Component -public class SpecialGiftRankListener extends RankGiftListener implements ApplicationListener { - - @Async - @Override - public void onApplicationEvent(GiftMessageEvent giftMessageEvent) { - handleEvent(giftMessageEvent); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/special/service/SpecialGiftRankService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/special/service/SpecialGiftRankService.java deleted file mode 100644 index 15231c47a..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/special/service/SpecialGiftRankService.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.accompany.business.special.service; - -import com.accompany.business.base.rankobj.UsersRankObjectProvider; -import com.accompany.business.base.service.BaseRankActService; -import com.accompany.business.common.dto.RankActConfigDto; -import com.accompany.common.constant.Constant; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.service.SysConfService; -import com.alibaba.fastjson.JSON; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; - -/** - * @author: liaozetao - * @date: 2024/2/1 16:05 - * @description: - */ -@Slf4j -@Service -public class SpecialGiftRankService extends BaseRankActService { - - @Autowired - private SysConfService sysConfService; - - @Override - protected String getActName() { - return RedisKey.special_gift.name(); - } - - @Override - public RankActConfigDto getRankActConfig() { - String configStr = sysConfService.getSysConfValueById(Constant.SysConfId.SPECIAL_GIFT_CONFIG); - if (!StringUtils.hasText(configStr)) { - throw new ServiceException(BusiStatus.ALREADY_NOTEXISTS_CONFIG); - } - return JSON.parseObject(configStr, RankActConfigDto.class); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/valentine/handler/ValentinesDayBoxHandler.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/valentine/handler/ValentinesDayBoxHandler.java deleted file mode 100644 index d8104aa20..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/valentine/handler/ValentinesDayBoxHandler.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.accompany.business.valentine.handler; - -import com.accompany.business.activity.handle.IGiftBoxTaskHandler; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * @author: liaozetao - * @date: 2024/2/5 10:48 - * @description: - */ -@Slf4j -@Component -public class ValentinesDayBoxHandler extends IGiftBoxTaskHandler { - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/valentine/handler/ValentinesDayHighGiftHandler.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/valentine/handler/ValentinesDayHighGiftHandler.java deleted file mode 100644 index cb4d2e052..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/valentine/handler/ValentinesDayHighGiftHandler.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.accompany.business.valentine.handler; - -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.StrUtil; -import com.accompany.business.activity.dto.ActTaskContext; -import com.accompany.business.activity.handle.IActTaskHandler; -import com.accompany.business.activity.model.ActTask; -import com.accompany.business.activity.model.ActTaskCondition; -import com.accompany.business.activity.model.ActUserTask; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.utils.DateTimeUtil; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -import java.util.Date; -import java.util.List; - -/** - * @author: liaozetao - * @date: 2024/2/5 11:45 - * @description: - */ -@Slf4j -@Component -public class ValentinesDayHighGiftHandler extends IActTaskHandler { - @Override - protected boolean ge(ActTaskCondition actTaskCondition, ActTaskContext context) { - Long uid = context.getSendUid(); - ActTask actTask = context.getActTask(); - String activityCode = actTask.getActivityCode(); - String componentCode = actTask.getComponentCode(); - String taskCode = actTask.getTaskCode(); - Date activityStartTime = context.getActivityStartTime(); - Date activityEndTime = context.getActivityEndTime(); - Date taskStartTime = context.getTaskStartTime(); - Date taskEndTime = context.getTaskEndTime(); - long activityValue = 0L; - String scoreStr = jedisService.hget(RedisKey.act_user_task_score_for_send.getKey(activityCode, DateTimeUtil.convertDate(activityStartTime, DateTimeUtil.ACTIVITY_DATE_HOUR_PATTERN), DateTimeUtil.convertDate(activityEndTime, DateTimeUtil.ACTIVITY_DATE_HOUR_PATTERN)), uid.toString()); - if (StrUtil.isNotEmpty(scoreStr)) { - activityValue = Long.parseLong(scoreStr); - } - String conditionCode = actTaskCondition.getConditionCode(); - ActUserTask actUserTask = new ActUserTask(); - actUserTask.setUid(uid); - actUserTask.setActivityCode(activityCode); - actUserTask.setComponentCode(componentCode); - actUserTask.setTaskCode(taskCode); - actUserTask.setConditionCode(conditionCode); - actUserTask.setActivityValue(activityValue); - actUserTask.setStartTime(taskStartTime); - actUserTask.setEndTime(taskEndTime); - List actUserTasks = actUserTaskService.list(Wrappers.lambdaQuery() - .eq(ActUserTask::getActivityCode, activityCode) - .eq(ActUserTask::getComponentCode, componentCode) - .eq(ActUserTask::getTaskCode, taskCode) - .eq(ActUserTask::getConditionCode, conditionCode) - .eq(ActUserTask::getUid, uid) - .between(ActUserTask::getCreateTime, taskStartTime, taskEndTime)); - if (CollectionUtil.isNotEmpty(actUserTasks)) { - actUserTask.setId(actUserTasks.get(0).getId()); - } - log.info("activityCode : {}, taskCode : {}, activityValue : {}", activityCode, taskCode, activityValue); - actUserTaskService.saveOrUpdate(actUserTask); - return true; - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/valentine/listener/ValentinesCpRankGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/valentine/listener/ValentinesCpRankGiftListener.java deleted file mode 100644 index c0d688488..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/valentine/listener/ValentinesCpRankGiftListener.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.accompany.business.valentine.listener; - -import com.accompany.business.common.dto.CpRankActConfigDto; -import com.accompany.business.event.GiftMessageEvent; -import com.accompany.business.message.GiftMessage; -import com.accompany.business.model.Hall; -import com.accompany.business.service.clan.ClanService; -import com.accompany.business.service.give.GiveUserService; -import com.accompany.business.service.hall.HallService; -import com.accompany.business.valentine.service.ValentinesCpRankService; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.model.Users; -import com.accompany.core.service.user.UsersBaseService; -import com.accompany.payment.service.RechargeUserService; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; - -import java.time.LocalDateTime; -import java.util.Date; -import java.util.List; - -/** - * @author: liaozetao - * @date: 2024/1/31 17:09 - * @description: - */ -@Slf4j -//@Component -public class ValentinesCpRankGiftListener implements ApplicationListener { - - @Autowired - protected ValentinesCpRankService service; - @Autowired - private HallService hallService; - @Autowired - private ClanService clanService; - - @Autowired - private RechargeUserService rechargeUserService; - - @Autowired - private GiveUserService giveUserService; - - @Autowired - private UsersBaseService usersBaseService; - - @Override - public void onApplicationEvent(GiftMessageEvent event) { - GiftMessage giftMessage = (GiftMessage) event.getSource(); - Date sendGiftTime = DateTimeUtil.convertMsToDate(giftMessage.getMessTime()); - LocalDateTime sendGiftLocalDateTime = DateTimeUtil.converDateToLocalDateTime(sendGiftTime); - CpRankActConfigDto config = service.getRankActConfig(); - if (!config.inActTimeRange(sendGiftLocalDateTime)) { - return; - } - Long senderUid = giftMessage.getSendUid(); - Long receiverUid = giftMessage.getRecvUid(); - Integer giftId = giftMessage.getGiftId(); - Integer giftNum = giftMessage.getGiftNum(); - Long totalGoldNum = giftMessage.getGoldNum(); - Hall senderHall = hallService.getValidHallByUid(senderUid); - if (null != senderHall){ - return; - } - Hall receiverHall = hallService.getValidHallByUid(receiverUid); - if (null != receiverHall){ - return; - } - Boolean isSenderRecharge = rechargeUserService.isRechargeUser(senderUid); - if (isSenderRecharge) { - return; - } - Boolean isReceiverRecharge = rechargeUserService.isRechargeUser(receiverUid); - if (isReceiverRecharge) { - return; - } - Users senderUser = usersBaseService.getUsersByUid(senderUid); - if (senderUser == null) { - return; - } - Users receiverUser = usersBaseService.getUsersByUid(receiverUid); - if (receiverUser == null) { - return; - } - List giveNameList = giveUserService.getGiveNameList(); - if (giveNameList.contains(senderUser.getErbanNo()) || giveNameList.contains(receiverUser.getErbanNo())) { - return; - } - String cpUid = service.addAndGetCpUid(config, senderUid, receiverUid, giftId, giftNum, totalGoldNum, sendGiftTime); - if (StringUtils.isBlank(cpUid)) { - return; - } - //收礼榜 - service.updateRank(cpUid, config, giftId, giftNum, totalGoldNum, sendGiftTime); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/valentine/service/ValentinesCpRankService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/valentine/service/ValentinesCpRankService.java deleted file mode 100644 index fa5e3194d..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/valentine/service/ValentinesCpRankService.java +++ /dev/null @@ -1,208 +0,0 @@ -package com.accompany.business.valentine.service; - -import com.accompany.business.base.service.BaseCpRankActService; -import com.accompany.business.common.constant.CpRankTypeEnum; -import com.accompany.business.common.constant.RewardTypeEnum; -import com.accompany.business.common.dto.CpRankActConfigDto; -import com.accompany.business.common.dto.CpRankActCpProp; -import com.accompany.business.common.dto.RewardDto; -import com.accompany.business.common.vo.ActivityCpRankVo; -import com.accompany.business.common.vo.ActivityStageTaskItemVo; -import com.accompany.business.common.vo.RewardVo; -import com.accompany.business.service.dress.UserChatBubbleService; -import com.accompany.business.service.headwear.HeadwearService; -import com.accompany.business.service.user.UsersService; -import com.accompany.business.util.RewardUtil; -import com.accompany.business.valentine.ValentinesCpDao; -import com.accompany.business.valentine.constant.ValentinesConstant; -import com.accompany.business.valentine.vo.ValentinesCpRankVo; -import com.accompany.common.constant.Constant; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.model.Users; -import com.accompany.core.service.SysConfService; -import com.alibaba.fastjson.JSON; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; -import org.springframework.util.StringUtils; - -import java.util.*; -import java.util.function.BiFunction; -import java.util.stream.Collectors; - -@Service -@Slf4j -public class ValentinesCpRankService extends BaseCpRankActService { - - @Autowired - private SysConfService sysConfService; - @Autowired - private ValentinesCpDao cpDao; - @Autowired - private RewardUtil rewardUtil; - @Autowired - private UsersService usersService; - @Autowired - private HeadwearService headwearService; - @Autowired - private UserChatBubbleService userChatBubbleService; - - private final String MODULE_NAME = "cp"; - - @Override - public String getActName() { - return ValentinesConstant.actName + "_" + MODULE_NAME; - } - - @Override - public String addAndGetCpUid(CpRankActConfigDto config, Long fromUid, Long toUid, Integer giftId, Integer giftNum, Long totalGoldNum, Date sendGiftTime) { - if (null == fromUid || null == toUid || fromUid.equals(toUid)) { - throw new ServiceException(BusiStatus.PARAMERROR); - } - String cpUid = cpDao.buildCpUid(fromUid, toUid); - CpRankActCpProp cpProp = cpDao.getCpPropByCpUid(cpUid); - if (null != cpProp) { - return cpUid; - } - //任何礼物都行 - if (!CollectionUtils.isEmpty(config.getCpGiftIds()) - && !config.getCpGiftIds().contains(giftId)) { - return null; - } - - cpProp = new CpRankActCpProp(); - cpProp.setCpUid(cpUid); - cpProp.setFromUid(fromUid); - cpProp.setToUid(toUid); - cpProp.setScore(0L); - cpProp.setCreateTime(sendGiftTime); - cpDao.saveCpProp(cpProp, config); - - log.info("[2024情人节活动]-cp榜 fromUid {} toUid {} 组成cp {}", fromUid, toUid, cpUid); - - return cpUid; - } - - @Override - public List takeApartCpUid(String cpUid) { - return cpDao.takeApartCpUid(cpUid); - } - - - @Override - protected void afterUpdateTotalRank(String cpUid, Double totalScore, CpRankActConfigDto config) { - Map> taskMap = cpDao.updateCpScore(cpUid, totalScore, config); - if (CollectionUtils.isEmpty(taskMap)) { - return; - } - - for (Map.Entry> entry : taskMap.entrySet()) { - Long uid = entry.getKey(); - List taskIds = entry.getValue(); - config.getCpScoreTasks().stream().filter(task -> taskIds.contains(task.getId())) - .forEach(task -> { - List rewardList = rewardUtil.sendRewardByUid(uid, task.getRewardList(), rewardSeletor, "[2024情人节活动]"); - log.info("[2024情人节活动] {} 达到 {} 分，完成 {} 任务，奖励 {}", uid, totalScore, task.getId(), JSON.toJSONString(rewardList)); - - RewardVo reward = rewardList.get(0); - if (null == reward) { - return; - } - String tip = String.format(ValentinesConstant.cp_tip, task.getScore(), reward.getName()); - if (RewardTypeEnum.HEADWEAR.getType().equals(reward.getType())) { - headwearService.sendHeadwearSecretaryMessage(uid, tip); - } else if (RewardTypeEnum.CHATBUBBLE.getType().equals(reward.getType())) { - userChatBubbleService.sendChatBubbleSecretaryMessage(uid, tip); - } - }); - } - } - - private BiFunction, List> rewardSeletor = (uid, rewardList) -> { - Users u = usersService.getUsersByUid(uid); - if (null == u || Constant.SexType.female.equals(u.getGender())) { - return Collections.singletonList(rewardList.get(0)); - } - return Collections.singletonList(rewardList.get(1)); - }; - - public ValentinesCpRankVo getRank(Long uid) { - List cpUserPropList = cpDao.listCpByUid(uid, 30L); - List cpUidList = !CollectionUtils.isEmpty(cpUserPropList) ? - cpUserPropList.stream() - .sorted(Comparator.comparing(CpRankActCpProp::getScore).reversed()) - .map(CpRankActCpProp::getCpUid) - .collect(Collectors.toList()) : - Collections.emptyList(); - ActivityCpRankVo rankVo = super.getRank(cpUidList, CpRankTypeEnum.TOTAL, null, 30); - - Long score = cpDao.getTheMaxScoreByUid(uid); - - List taskItemVos = getConfig().getCpScoreTasks().stream().map(task -> { - ActivityStageTaskItemVo vo = new ActivityStageTaskItemVo(); - vo.setTaskId(task.getId()); - vo.setScore(task.getScore()); - vo.setStatus(score.compareTo(task.getScore()) >= 0 ? - ValentinesConstant.BtnStatus.HAD : - ValentinesConstant.BtnStatus.NONE); - return vo; - }).collect(Collectors.toList()); - - ValentinesCpRankVo vo = new ValentinesCpRankVo(); - BeanUtils.copyProperties(rankVo, vo); - vo.setScore(score); - vo.setUid(uid); - vo.setCpTaskList(taskItemVos); - return vo; - } - - @Override - protected void logUpdateRank(String cpUid, Integer giftId, Integer giftNum, Long totalGoldNum, Double score) { - log.info("[2024情人节活动]-cp榜 {} 收礼 {} {} 个总价值 {} 钻石，增加值 {}", cpUid, giftId, giftNum, totalGoldNum, score); - } - - @Override - protected void logRankReward(CpRankTypeEnum rankType, String date, String rankKey, Integer rankIndex, Long uid, RewardVo reward) { - log.info("[2024情人节活动]-cp榜 {} 发奖励， 第 {} 名 {} 奖励 {}", rankKey, rankIndex, uid, JSON.toJSONString(reward)); - } - - @Override - public List listRewardConfig(Long uid, List rewards) { - Users u = usersService.getUsersByUid(uid); - if (u == null || Constant.SexType.female.equals(u.getGender())) { - return getOddOrEvenIndexList(rewards, false); - } else if (Constant.SexType.male.equals(u.getGender())) { - return getOddOrEvenIndexList(rewards, true); - } - return super.listRewardConfig(uid, rewards); - } - - public List getOddOrEvenIndexList(List list, boolean isOdd) { - List result = new ArrayList<>(); - for (int i = 0; i < list.size(); i++) { - if (isOdd && i % 2 != 0) { - result.add(list.get(i)); - } else if (!isOdd && i % 2 == 0) { - result.add(list.get(i)); - } - } - return result; - } - - @Override - public CpRankActConfigDto getRankActConfig() { - return getConfig(); - } - - public CpRankActConfigDto getConfig() { - String configStr = sysConfService.getSysConfValueById(ValentinesConstant.SysConfId.ACT_RANK_CONFIG); - if (!StringUtils.hasText(configStr)) { - throw new ServiceException(BusiStatus.ALREADY_NOTEXISTS_CONFIG); - } - return JSON.parseObject(configStr, CpRankActConfigDto.class); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/valentine/service/ValentinesCpUsersRankObjectProvider.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/valentine/service/ValentinesCpUsersRankObjectProvider.java deleted file mode 100644 index a25d576a2..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/valentine/service/ValentinesCpUsersRankObjectProvider.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.accompany.business.valentine.service; - -import com.accompany.business.base.rankobj.CpRankObject; -import com.accompany.business.base.rankobj.CpRankObjectProvider; -import com.accompany.business.common.dto.CpRankActCpProp; -import com.accompany.business.service.user.UsersService; -import com.accompany.business.valentine.ValentinesCpDao; -import com.accompany.core.model.Users; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.*; -import java.util.stream.Collectors; - -@Service -public class ValentinesCpUsersRankObjectProvider implements CpRankObjectProvider { - - @Autowired - private ValentinesCpDao cpDao; - @Autowired - private UsersService usersService; - - @Override - public Map mapRankObjectByUids(List cpUidList) { - Map map = new HashMap<>(); - - Map cpPropMap = cpDao.mapCpPropByCpUidSet(new HashSet<>(cpUidList)); - - List uidList = cpUidList.stream() - .map(cpUid->cpUid.split("_")) - .flatMap(Arrays::stream) - .map(Long::parseLong) - .distinct().collect(Collectors.toList()); - - Map userMap = usersService.getUsersMapByUids(uidList); - - for (String cpUid: cpUidList) { - CpRankObject obj = new CpRankObject(); - obj.setType(CpRankObject.CpRankObjectType.CP_USER); - obj.setCpUid(cpUid); - - String[] uidArray = cpUid.split("_"); - Long leftUid = Long.parseLong(uidArray[0]); - Long rightUid = Long.parseLong(uidArray[1]); - - CpRankActCpProp cpProp = cpPropMap.get(cpUid); - if (null != cpProp){ - leftUid = cpProp.getFromUid(); - rightUid = cpProp.getToUid(); - } - - obj.setLeftUid(leftUid); - - Users leftUser = userMap.get(leftUid); - if (null != leftUser){ - obj.setLeftErbanNo(leftUser.getErbanNo()); - obj.setLeftNick(leftUser.getNick()); - obj.setLeftAvatar(leftUser.getAvatar()); - } - - obj.setRightUid(rightUid); - - Users rightUser = userMap.get(rightUid); - if (null != rightUser){ - obj.setRightErbanNo(rightUser.getErbanNo()); - obj.setRightNick(rightUser.getNick()); - obj.setRightAvatar(rightUser.getAvatar()); - } - - map.put(cpUid, obj); - } - - return map; - } - - @Override - public CpRankObject getRankObjectByUid(String cpUid) { - if (StringUtils.isBlank(cpUid)){ - return null; - } - - List uidList = Arrays.stream(cpUid.split("_")) - .map(Long::parseLong) - .distinct().collect(Collectors.toList()); - - Map userMap = usersService.getUsersMapByUids(uidList); - - CpRankObject obj = new CpRankObject(); - obj.setType(CpRankObject.CpRankObjectType.CP_USER); - obj.setCpUid(cpUid); - - String[] uidArray = cpUid.split("_"); - Long leftUid = Long.parseLong(uidArray[0]); - obj.setLeftUid(leftUid); - - Users leftUser = userMap.get(leftUid); - if (null != leftUser){ - obj.setLeftErbanNo(leftUser.getErbanNo()); - obj.setLeftNick(leftUser.getNick()); - obj.setLeftAvatar(leftUser.getAvatar()); - } - - Long rightUid = Long.parseLong(uidArray[1]); - obj.setRightUid(rightUid); - - Users rightUser = userMap.get(rightUid); - if (null != rightUser){ - obj.setRightErbanNo(rightUser.getErbanNo()); - obj.setRightNick(rightUser.getNick()); - obj.setRightAvatar(rightUser.getAvatar()); - } - - return obj; - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/women/handler/WomenDayLimitGiftReceiveHandler.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/women/handler/WomenDayLimitGiftReceiveHandler.java deleted file mode 100644 index 764fd59ae..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/women/handler/WomenDayLimitGiftReceiveHandler.java +++ /dev/null @@ -1,152 +0,0 @@ -package com.accompany.business.women.handler; - -import cn.hutool.core.collection.CollectionUtil; -import com.accompany.business.activity.dto.ActTaskContext; -import com.accompany.business.activity.enums.ActTaskStatusEnum; -import com.accompany.business.activity.handle.IActTaskHandler; -import com.accompany.business.activity.model.ActTask; -import com.accompany.business.activity.model.ActTaskCondition; -import com.accompany.business.activity.model.ActUserTask; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -import java.util.Arrays; -import java.util.Date; -import java.util.List; - -/** - * @author: liaozetao - * @date: 2024/2/29 16:22 - * @description: - */ -@Slf4j -//@Component -public class WomenDayLimitGiftReceiveHandler extends IActTaskHandler { - - @Override - protected boolean eq(ActTaskCondition actTaskCondition, ActTaskContext context) { - Long conditionValue = actTaskCondition.getConditionValue(); - Long uid = context.getReceiveUid(); - Integer giftId = context.getGiftId(); - Date startTime = context.getTaskStartTime(); - Date endTime = context.getTaskEndTime(); - ActTask actTask = context.getActTask(); - log.info("gift limit receive conditionValue : {}, uid : {}, giftId : {}, startTime : {}, endTime : {}", conditionValue, uid, giftId, startTime, endTime); - if (giftId == null) { - return false; - } - if (conditionValue == null || !conditionValue.equals(giftId.longValue())) { - return false; - } - String conditionCode = actTaskCondition.getConditionCode(); - String activityCode = actTask.getActivityCode(); - String componentCode = actTask.getComponentCode(); - String taskCode = actTask.getTaskCode(); - ActUserTask actUserTask = new ActUserTask(); - actUserTask.setUid(uid); - actUserTask.setActivityCode(activityCode); - actUserTask.setComponentCode(componentCode); - actUserTask.setTaskCode(taskCode); - actUserTask.setConditionCode(conditionCode); - actUserTask.setStartTime(startTime); - actUserTask.setEndTime(endTime); - actUserTask.setActivityValue(giftId.longValue()); - actUserTask.setTaskStatus(ActTaskStatusEnum.COMPLETE.ordinal()); - actUserTaskService.saveOrUpdate(actUserTask); - log.info("gift limit receive conditionValue : {}, uid : {}, giftId : {}, startTime : {}, endTime : {} is complete.", conditionValue, uid, giftId, startTime, endTime); - return true; - } - - @Override - public void doHandle(ActTaskContext context) { - Long uid = context.getReceiveUid(); - Date startTime = context.getTaskStartTime(); - Date endTime = context.getTaskEndTime(); - ActTask actTask = context.getActTask(); - String activityCode = actTask.getActivityCode(); - String componentCode = actTask.getComponentCode(); - String parentCode = actTask.getTaskCode(); - log.info("doHandle uid : {}, parentCode : {}", uid, parentCode); - List actTasks = actTaskService.list(Wrappers.lambdaQuery() - .eq(ActTask::getActivityCode, activityCode) - .eq(ActTask::getComponentCode, componentCode) - .eq(ActTask::getParentCode, parentCode) - .orderByAsc(ActTask::getSeqNo)); - if (CollectionUtil.isEmpty(actTasks)) { - return; - } - List actTaskConditions = actTaskConditionService.list(Wrappers.lambdaQuery() - .eq(ActTaskCondition::getActivityCode, activityCode) - .eq(ActTaskCondition::getComponentCode, componentCode) - .eq(ActTaskCondition::getTaskCode, parentCode)); - if (CollectionUtil.isEmpty(actTaskConditions)) { - return; - } - ActTaskCondition actTaskCondition = actTaskConditions.get(0); - String conditionCode = actTaskCondition.getConditionCode(); - Long conditionValue = actTaskCondition.getConditionValue(); - ActUserTask actUserTask = new ActUserTask(); - actUserTask.setUid(uid); - actUserTask.setActivityCode(activityCode); - actUserTask.setComponentCode(componentCode); - actUserTask.setTaskCode(parentCode); - actUserTask.setConditionCode(conditionCode); - actUserTask.setActivityValue(0L); - actUserTask.setTaskStatus(ActTaskStatusEnum.PROCESS.ordinal()); - actUserTask.setStartTime(startTime); - actUserTask.setEndTime(endTime); - int length = actTasks.size(); - log.info("task execute length : {}", length); - Boolean[] completeArray = new Boolean[length]; - for (int i = 0; i < length; i++) { - completeArray[i] = false; - ActTask children = actTasks.get(i); - String taskCode = children.getTaskCode(); - long taskCount = actUserTaskService.count(Wrappers.lambdaQuery() - .eq(ActUserTask::getActivityCode, activityCode) - .eq(ActUserTask::getComponentCode, componentCode) - .eq(ActUserTask::getTaskCode, taskCode) - .eq(ActUserTask::getUid, uid) - .eq(ActUserTask::getTaskStatus, ActTaskStatusEnum.COMPLETE.ordinal())); - completeArray[i] = taskCount > 0L; - } - long count = Arrays.stream(completeArray).filter(v -> v).count(); - log.info("task taskCount : {}", count); - actUserTask.setActivityValue(count); - if (conditionValue != null && conditionValue.equals(count)) { - actUserTask.setTaskStatus(ActTaskStatusEnum.COMPLETE.ordinal()); - } - List actUserTasks = actUserTaskService.list(Wrappers.lambdaQuery() - .eq(ActUserTask::getActivityCode, activityCode) - .eq(ActUserTask::getComponentCode, componentCode) - .eq(ActUserTask::getTaskCode, parentCode) - .eq(ActUserTask::getUid, uid) - .eq(ActUserTask::getTaskStatus, ActTaskStatusEnum.PROCESS.ordinal())); - if (CollectionUtil.isEmpty(actUserTasks)) { - actUserTaskService.save(actUserTask); - } else { - ActUserTask task = actUserTasks.get(0); - actUserTask.setId(task.getId()); - actUserTaskService.updateById(actUserTask); - } - if (ActTaskStatusEnum.COMPLETE.ordinal() == actUserTask.getTaskStatus()) { - for (int i = 0; i < length; i++) { - ActTask children = actTasks.get(i); - String taskCode = children.getTaskCode(); - List childTasks = actUserTaskService.list(Wrappers.lambdaQuery() - .eq(ActUserTask::getActivityCode, activityCode) - .eq(ActUserTask::getComponentCode, componentCode) - .eq(ActUserTask::getTaskCode, taskCode) - .eq(ActUserTask::getUid, uid) - .eq(ActUserTask::getTaskStatus, ActTaskStatusEnum.COMPLETE.ordinal())); - if (CollectionUtil.isNotEmpty(childTasks)) { - ActUserTask task = childTasks.get(0); - task.setTaskStatus(ActTaskStatusEnum.GRANT.ordinal()); - actUserTaskService.updateById(task); - } - } - } - log.info("doHandle uid : {}, parentCode : {} is end.", uid, parentCode); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/women/handler/WomenDayLimitGiftSendHandler.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/women/handler/WomenDayLimitGiftSendHandler.java deleted file mode 100644 index 9ea959b31..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/women/handler/WomenDayLimitGiftSendHandler.java +++ /dev/null @@ -1,152 +0,0 @@ -package com.accompany.business.women.handler; - -import cn.hutool.core.collection.CollectionUtil; -import com.accompany.business.activity.dto.ActTaskContext; -import com.accompany.business.activity.enums.ActTaskStatusEnum; -import com.accompany.business.activity.handle.IActTaskHandler; -import com.accompany.business.activity.model.ActTask; -import com.accompany.business.activity.model.ActTaskCondition; -import com.accompany.business.activity.model.ActUserTask; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -import java.util.Arrays; -import java.util.Date; -import java.util.List; - -/** - * @author: liaozetao - * @date: 2024/2/29 16:22 - * @description: - */ -@Slf4j -//@Component -public class WomenDayLimitGiftSendHandler extends IActTaskHandler { - - @Override - protected boolean eq(ActTaskCondition actTaskCondition, ActTaskContext context) { - Long conditionValue = actTaskCondition.getConditionValue(); - Long uid = context.getSendUid(); - Integer giftId = context.getGiftId(); - Date startTime = context.getTaskStartTime(); - Date endTime = context.getTaskEndTime(); - ActTask actTask = context.getActTask(); - log.info("gift limit send conditionValue : {}, uid : {}, giftId : {}, startTime : {}, endTime : {}", conditionValue, uid, giftId, startTime, endTime); - if (giftId == null) { - return false; - } - if (conditionValue == null || !conditionValue.equals(giftId.longValue())) { - return false; - } - String conditionCode = actTaskCondition.getConditionCode(); - String activityCode = actTask.getActivityCode(); - String componentCode = actTask.getComponentCode(); - String taskCode = actTask.getTaskCode(); - ActUserTask actUserTask = new ActUserTask(); - actUserTask.setUid(uid); - actUserTask.setActivityCode(activityCode); - actUserTask.setComponentCode(componentCode); - actUserTask.setTaskCode(taskCode); - actUserTask.setConditionCode(conditionCode); - actUserTask.setStartTime(startTime); - actUserTask.setEndTime(endTime); - actUserTask.setActivityValue(giftId.longValue()); - actUserTask.setTaskStatus(ActTaskStatusEnum.COMPLETE.ordinal()); - actUserTaskService.saveOrUpdate(actUserTask); - log.info("gift limit send conditionValue : {}, uid : {}, giftId : {}, startTime : {}, endTime : {} is complete.", conditionValue, uid, giftId, startTime, endTime); - return true; - } - - @Override - public void doHandle(ActTaskContext context) { - Long uid = context.getSendUid(); - Date startTime = context.getTaskStartTime(); - Date endTime = context.getTaskEndTime(); - ActTask actTask = context.getActTask(); - String activityCode = actTask.getActivityCode(); - String componentCode = actTask.getComponentCode(); - String parentCode = actTask.getTaskCode(); - log.info("doHandle uid : {}, parentCode : {}", uid, parentCode); - List actTasks = actTaskService.list(Wrappers.lambdaQuery() - .eq(ActTask::getActivityCode, activityCode) - .eq(ActTask::getComponentCode, componentCode) - .eq(ActTask::getParentCode, parentCode) - .orderByAsc(ActTask::getSeqNo)); - if (CollectionUtil.isEmpty(actTasks)) { - return; - } - List actTaskConditions = actTaskConditionService.list(Wrappers.lambdaQuery() - .eq(ActTaskCondition::getActivityCode, activityCode) - .eq(ActTaskCondition::getComponentCode, componentCode) - .eq(ActTaskCondition::getTaskCode, parentCode)); - if (CollectionUtil.isEmpty(actTaskConditions)) { - return; - } - ActTaskCondition actTaskCondition = actTaskConditions.get(0); - String conditionCode = actTaskCondition.getConditionCode(); - Long conditionValue = actTaskCondition.getConditionValue(); - ActUserTask actUserTask = new ActUserTask(); - actUserTask.setUid(uid); - actUserTask.setActivityCode(activityCode); - actUserTask.setComponentCode(componentCode); - actUserTask.setTaskCode(parentCode); - actUserTask.setConditionCode(conditionCode); - actUserTask.setActivityValue(0L); - actUserTask.setTaskStatus(ActTaskStatusEnum.PROCESS.ordinal()); - actUserTask.setStartTime(startTime); - actUserTask.setEndTime(endTime); - int length = actTasks.size(); - log.info("task execute length : {}", length); - Boolean[] completeArray = new Boolean[length]; - for (int i = 0; i < length; i++) { - completeArray[i] = false; - ActTask children = actTasks.get(i); - String taskCode = children.getTaskCode(); - long taskCount = actUserTaskService.count(Wrappers.lambdaQuery() - .eq(ActUserTask::getActivityCode, activityCode) - .eq(ActUserTask::getComponentCode, componentCode) - .eq(ActUserTask::getTaskCode, taskCode) - .eq(ActUserTask::getUid, uid) - .eq(ActUserTask::getTaskStatus, ActTaskStatusEnum.COMPLETE.ordinal())); - completeArray[i] = taskCount > 0L; - } - long count = Arrays.stream(completeArray).filter(v -> v).count(); - log.info("task taskCount : {}", count); - actUserTask.setActivityValue(count); - if (conditionValue != null && conditionValue.equals(count)) { - actUserTask.setTaskStatus(ActTaskStatusEnum.COMPLETE.ordinal()); - } - List actUserTasks = actUserTaskService.list(Wrappers.lambdaQuery() - .eq(ActUserTask::getActivityCode, activityCode) - .eq(ActUserTask::getComponentCode, componentCode) - .eq(ActUserTask::getTaskCode, parentCode) - .eq(ActUserTask::getUid, uid) - .eq(ActUserTask::getTaskStatus, ActTaskStatusEnum.PROCESS.ordinal())); - if (CollectionUtil.isEmpty(actUserTasks)) { - actUserTaskService.save(actUserTask); - } else { - ActUserTask task = actUserTasks.get(0); - actUserTask.setId(task.getId()); - actUserTaskService.updateById(actUserTask); - } - if (ActTaskStatusEnum.COMPLETE.ordinal() == actUserTask.getTaskStatus()) { - for (int i = 0; i < length; i++) { - ActTask children = actTasks.get(i); - String taskCode = children.getTaskCode(); - List childTasks = actUserTaskService.list(Wrappers.lambdaQuery() - .eq(ActUserTask::getActivityCode, activityCode) - .eq(ActUserTask::getComponentCode, componentCode) - .eq(ActUserTask::getTaskCode, taskCode) - .eq(ActUserTask::getUid, uid) - .eq(ActUserTask::getTaskStatus, ActTaskStatusEnum.COMPLETE.ordinal())); - if (CollectionUtil.isNotEmpty(childTasks)) { - ActUserTask task = childTasks.get(0); - task.setTaskStatus(ActTaskStatusEnum.GRANT.ordinal()); - actUserTaskService.updateById(task); - } - } - } - log.info("doHandle uid : {}, parentCode : {} is end.", uid, parentCode); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/women/handler/WomenDayLoveWingReceiveHandler.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/women/handler/WomenDayLoveWingReceiveHandler.java deleted file mode 100644 index 7c924ebfa..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/women/handler/WomenDayLoveWingReceiveHandler.java +++ /dev/null @@ -1,153 +0,0 @@ -package com.accompany.business.women.handler; - -import cn.hutool.core.collection.CollectionUtil; -import com.accompany.business.activity.dto.ActTaskContext; -import com.accompany.business.activity.enums.ActConditionKindEnum; -import com.accompany.business.activity.enums.ActTaskStatusEnum; -import com.accompany.business.activity.handle.IActTaskHandler; -import com.accompany.business.activity.model.ActTask; -import com.accompany.business.activity.model.ActTaskCondition; -import com.accompany.business.activity.model.ActUserTask; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -import java.util.Date; -import java.util.List; - -/** - * @author: liaozetao - * @date: 2024/2/29 15:07 - * @description: - */ -@Slf4j -//@Component -public class WomenDayLoveWingReceiveHandler extends IActTaskHandler { - - @Override - protected boolean eq(ActTaskCondition actTaskCondition, ActTaskContext context) { - Long conditionValue = actTaskCondition.getConditionValue(); - Long uid = context.getReceiveUid(); - Integer giftId = context.getGiftId(); - Date startTime = context.getTaskStartTime(); - Date endTime = context.getTaskEndTime(); - ActTask actTask = context.getActTask(); - log.info("gift receive conditionValue : {}, uid : {}, giftId : {}, startTime : {}, endTime : {}", conditionValue, uid, giftId, startTime, endTime); - if (giftId == null) { - return false; - } - if (conditionValue == null || !conditionValue.equals(giftId.longValue())) { - return false; - } - String conditionCode = actTaskCondition.getConditionCode(); - String activityCode = actTask.getActivityCode(); - String componentCode = actTask.getComponentCode(); - String taskCode = actTask.getTaskCode(); - List conditions = actTaskConditionService.list(Wrappers.lambdaQuery() - .eq(ActTaskCondition::getActivityCode, activityCode) - .eq(ActTaskCondition::getComponentCode, componentCode) - .eq(ActTaskCondition::getTaskCode, taskCode) - .eq(ActTaskCondition::getConditionKind, ActConditionKindEnum.GE.name())); - if (CollectionUtil.isEmpty(conditions)) { - return false; - } - ActTaskCondition condition = conditions.get(0); - long completeCount = actUserTaskService.count(Wrappers.lambdaQuery() - .eq(ActUserTask::getActivityCode, activityCode) - .eq(ActUserTask::getComponentCode, componentCode) - .eq(ActUserTask::getTaskCode, taskCode) - .eq(ActUserTask::getConditionCode, condition.getConditionCode()) - .eq(ActUserTask::getUid, uid) - .in(ActUserTask::getTaskStatus, ActTaskStatusEnum.COMPLETE.ordinal(), ActTaskStatusEnum.GRANT.ordinal()) - .between(ActUserTask::getCreateTime, startTime, endTime) - .orderByAsc(ActUserTask::getCreateTime)); - if (completeCount > 0L) { - log.info("gift receive ge taskCode : {} is already complete.", taskCode); - return true; - } - ActUserTask actUserTask = new ActUserTask(); - actUserTask.setUid(uid); - actUserTask.setActivityCode(activityCode); - actUserTask.setComponentCode(componentCode); - actUserTask.setTaskCode(taskCode); - actUserTask.setConditionCode(conditionCode); - actUserTask.setStartTime(startTime); - actUserTask.setEndTime(endTime); - actUserTask.setActivityValue(giftId.longValue()); - actUserTask.setTaskStatus(ActTaskStatusEnum.COMPLETE.ordinal()); - actUserTaskService.saveOrUpdate(actUserTask); - log.info("gift receive conditionValue : {}, uid : {}, giftId : {}, startTime : {}, endTime : {} is complete.", conditionValue, uid, giftId, startTime, endTime); - return true; - } - - @Override - public void doHandle(ActTaskContext context) { - Long uid = context.getReceiveUid(); - Integer giftId = context.getGiftId(); - if (giftId == null) { - return; - } - Date startTime = context.getTaskStartTime(); - Date endTime = context.getTaskEndTime(); - ActTask actTask = context.getActTask(); - String activityCode = actTask.getActivityCode(); - String componentCode = actTask.getComponentCode(); - String taskCode = actTask.getTaskCode(); - List actTaskConditions = actTaskConditionService.list(Wrappers.lambdaQuery() - .eq(ActTaskCondition::getActivityCode, activityCode) - .eq(ActTaskCondition::getComponentCode, componentCode) - .eq(ActTaskCondition::getTaskCode, taskCode) - .eq(ActTaskCondition::getConditionKind, ActConditionKindEnum.GE.name())); - if (CollectionUtil.isEmpty(actTaskConditions)) { - return; - } - ActTaskCondition actTaskCondition = actTaskConditions.get(0); - String conditionCode = actTaskCondition.getConditionCode(); - Long conditionValue = actTaskCondition.getConditionValue(); - if (conditionValue == null) { - return; - } - ActUserTask actUserTask = new ActUserTask(); - actUserTask.setUid(uid); - actUserTask.setActivityCode(activityCode); - actUserTask.setComponentCode(componentCode); - actUserTask.setTaskCode(taskCode); - actUserTask.setConditionCode(conditionCode); - actUserTask.setActivityValue(0L); - actUserTask.setStartTime(startTime); - actUserTask.setEndTime(endTime); - List actUserTasks = actUserTaskService.list(Wrappers.lambdaQuery() - .eq(ActUserTask::getActivityCode, activityCode) - .eq(ActUserTask::getComponentCode, componentCode) - .eq(ActUserTask::getTaskCode, taskCode) - .eq(ActUserTask::getConditionCode, conditionCode) - .eq(ActUserTask::getUid, uid) - .between(ActUserTask::getCreateTime, startTime, endTime) - .orderByAsc(ActUserTask::getCreateTime)); - if (CollectionUtil.isNotEmpty(actUserTasks)) { - ActUserTask task = actUserTasks.get(0); - Integer taskStatus = task.getTaskStatus(); - if (ActTaskStatusEnum.COMPLETE.ordinal() == taskStatus || ActTaskStatusEnum.GRANT.ordinal() == taskStatus) { - log.info("gift receive ge taskCode : {} is already complete.", taskCode); - return; - } - actUserTask.setId(task.getId()); - } - long taskCount = actUserTaskService.count(Wrappers.lambdaQuery() - .eq(ActUserTask::getActivityCode, activityCode) - .eq(ActUserTask::getComponentCode, componentCode) - .eq(ActUserTask::getTaskCode, taskCode) - .eq(ActUserTask::getActivityValue, giftId) - .eq(ActUserTask::getUid, uid) - .eq(ActUserTask::getTaskStatus, ActTaskStatusEnum.COMPLETE.ordinal()) - .between(ActUserTask::getCreateTime, startTime, endTime)); - actUserTask.setActivityValue(taskCount); - int taskStatus = ActTaskStatusEnum.PROCESS.ordinal(); - if (conditionValue <= taskCount) { - taskStatus = ActTaskStatusEnum.COMPLETE.ordinal(); - } - actUserTask.setTaskStatus(taskStatus); - actUserTaskService.saveOrUpdate(actUserTask); - log.info("gift receive ge conditionValue : {}, uid : {}, giftId : {}, startTime : {}, endTime : {} is execute.", conditionValue, uid, giftId, startTime, endTime); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/women/handler/WomenDayLoveWingSendHandler.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/women/handler/WomenDayLoveWingSendHandler.java deleted file mode 100644 index 9e160ad16..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/women/handler/WomenDayLoveWingSendHandler.java +++ /dev/null @@ -1,154 +0,0 @@ -package com.accompany.business.women.handler; - -import cn.hutool.core.collection.CollectionUtil; -import com.accompany.business.activity.dto.ActTaskContext; -import com.accompany.business.activity.enums.ActConditionKindEnum; -import com.accompany.business.activity.enums.ActTaskStatusEnum; -import com.accompany.business.activity.handle.IActTaskHandler; -import com.accompany.business.activity.model.ActTask; -import com.accompany.business.activity.model.ActTaskCondition; -import com.accompany.business.activity.model.ActUserTask; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -import java.util.Date; -import java.util.List; - -/** - * @author: liaozetao - * @date: 2024/2/29 15:07 - * @description: - */ -@Slf4j -//@Component -public class WomenDayLoveWingSendHandler extends IActTaskHandler { - - @Override - protected boolean eq(ActTaskCondition actTaskCondition, ActTaskContext context) { - Long conditionValue = actTaskCondition.getConditionValue(); - Long uid = context.getSendUid(); - Integer giftId = context.getGiftId(); - Date startTime = context.getTaskStartTime(); - Date endTime = context.getTaskEndTime(); - ActTask actTask = context.getActTask(); - log.info("gift send conditionValue : {}, uid : {}, giftId : {}, startTime : {}, endTime : {}", conditionValue, uid, giftId, startTime, endTime); - if (giftId == null) { - return false; - } - if (conditionValue == null || !conditionValue.equals(giftId.longValue())) { - return false; - } - String conditionCode = actTaskCondition.getConditionCode(); - String activityCode = actTask.getActivityCode(); - String componentCode = actTask.getComponentCode(); - String taskCode = actTask.getTaskCode(); - List conditions = actTaskConditionService.list(Wrappers.lambdaQuery() - .eq(ActTaskCondition::getActivityCode, activityCode) - .eq(ActTaskCondition::getComponentCode, componentCode) - .eq(ActTaskCondition::getTaskCode, taskCode) - .eq(ActTaskCondition::getConditionKind, ActConditionKindEnum.GE.name())); - if (CollectionUtil.isEmpty(conditions)) { - return false; - } - ActTaskCondition condition = conditions.get(0); - long completeCount = actUserTaskService.count(Wrappers.lambdaQuery() - .eq(ActUserTask::getActivityCode, activityCode) - .eq(ActUserTask::getComponentCode, componentCode) - .eq(ActUserTask::getTaskCode, taskCode) - .eq(ActUserTask::getConditionCode, condition.getConditionCode()) - .eq(ActUserTask::getUid, uid) - .in(ActUserTask::getTaskStatus, ActTaskStatusEnum.COMPLETE.ordinal(), ActTaskStatusEnum.GRANT.ordinal()) - .between(ActUserTask::getCreateTime, startTime, endTime) - .orderByAsc(ActUserTask::getCreateTime)); - if (completeCount > 0L) { - log.info("gift send ge taskCode : {} is already complete.", taskCode); - return true; - } - ActUserTask actUserTask = new ActUserTask(); - actUserTask.setUid(uid); - actUserTask.setActivityCode(activityCode); - actUserTask.setComponentCode(componentCode); - actUserTask.setTaskCode(taskCode); - actUserTask.setConditionCode(conditionCode); - actUserTask.setStartTime(startTime); - actUserTask.setEndTime(endTime); - actUserTask.setActivityValue(giftId.longValue()); - actUserTask.setTaskStatus(ActTaskStatusEnum.COMPLETE.ordinal()); - actUserTaskService.saveOrUpdate(actUserTask); - log.info("gift send conditionValue : {}, uid : {}, giftId : {}, startTime : {}, endTime : {} is complete.", conditionValue, uid, giftId, startTime, endTime); - return true; - } - - @Override - public void doHandle(ActTaskContext context) { - Long uid = context.getSendUid(); - Integer giftId = context.getGiftId(); - if (giftId == null) { - return; - } - Date startTime = context.getTaskStartTime(); - Date endTime = context.getTaskEndTime(); - ActTask actTask = context.getActTask(); - String activityCode = actTask.getActivityCode(); - String componentCode = actTask.getComponentCode(); - String taskCode = actTask.getTaskCode(); - List actTaskConditions = actTaskConditionService.list(Wrappers.lambdaQuery() - .eq(ActTaskCondition::getActivityCode, activityCode) - .eq(ActTaskCondition::getComponentCode, componentCode) - .eq(ActTaskCondition::getTaskCode, taskCode) - .eq(ActTaskCondition::getConditionKind, ActConditionKindEnum.GE.name())); - if (CollectionUtil.isEmpty(actTaskConditions)) { - return; - } - ActTaskCondition actTaskCondition = actTaskConditions.get(0); - String conditionCode = actTaskCondition.getConditionCode(); - Long conditionValue = actTaskCondition.getConditionValue(); - if (conditionValue == null) { - return; - } - ActUserTask actUserTask = new ActUserTask(); - actUserTask.setUid(uid); - actUserTask.setActivityCode(activityCode); - actUserTask.setComponentCode(componentCode); - actUserTask.setTaskCode(taskCode); - actUserTask.setConditionCode(conditionCode); - actUserTask.setActivityValue(0L); - actUserTask.setStartTime(startTime); - actUserTask.setEndTime(endTime); - List actUserTasks = actUserTaskService.list(Wrappers.lambdaQuery() - .eq(ActUserTask::getActivityCode, activityCode) - .eq(ActUserTask::getComponentCode, componentCode) - .eq(ActUserTask::getTaskCode, taskCode) - .eq(ActUserTask::getConditionCode, conditionCode) - .eq(ActUserTask::getUid, uid) - .between(ActUserTask::getCreateTime, startTime, endTime) - .orderByAsc(ActUserTask::getCreateTime)); - if (CollectionUtil.isNotEmpty(actUserTasks)) { - ActUserTask task = actUserTasks.get(0); - Integer taskStatus = task.getTaskStatus(); - if (ActTaskStatusEnum.COMPLETE.ordinal() == taskStatus || ActTaskStatusEnum.GRANT.ordinal() == taskStatus) { - log.info("gift send ge taskCode : {} is already complete.", taskCode); - return; - } - actUserTask.setId(task.getId()); - } - long taskCount = actUserTaskService.count(Wrappers.lambdaQuery() - .eq(ActUserTask::getActivityCode, activityCode) - .eq(ActUserTask::getComponentCode, componentCode) - .eq(ActUserTask::getTaskCode, taskCode) - .eq(ActUserTask::getActivityValue, giftId) - .eq(ActUserTask::getUid, uid) - .eq(ActUserTask::getTaskStatus, ActTaskStatusEnum.COMPLETE.ordinal()) - .between(ActUserTask::getCreateTime, startTime, endTime)); - actUserTask.setActivityValue(taskCount); - int taskStatus = ActTaskStatusEnum.PROCESS.ordinal(); - if (conditionValue <= taskCount) { - taskStatus = ActTaskStatusEnum.COMPLETE.ordinal(); - } - actUserTask.setTaskStatus(taskStatus); - actUserTaskService.saveOrUpdate(actUserTask); - log.info("gift send ge conditionValue : {}, uid : {}, giftId : {}, startTime : {}, endTime : {} is execute.", conditionValue, uid, giftId, startTime, endTime); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/annual/AnnualCpRankController.java b/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/annual/AnnualCpRankController.java deleted file mode 100644 index fb5f72a90..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/annual/AnnualCpRankController.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.accompany.business.annual; - -import com.accompany.business.annual.service.AnnualCpRankService; -import com.accompany.business.common.vo.ActivityCpRankVo; -import com.accompany.common.annotation.Authorization; -import com.accompany.common.constant.ApplicationConstant; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.exception.ServiceException; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; -import java.time.LocalDateTime; -import java.util.Date; - -@Api(tags = "2023年度盛典活动",value = "2023年度盛典活动") -@RequestMapping("/act/2023Annual/cpRank") -@RestController -public class AnnualCpRankController { - - @Autowired - private AnnualCpRankService service; - - @ApiOperation("cp排行榜") - @GetMapping("/getRank") - @Authorization - public BusiResult getRank(HttpServletRequest request){ - String uidStr = request.getHeader(ApplicationConstant.PublicParameters.PUB_UID); - Long uid = Long.parseLong(uidStr); - ActivityCpRankVo rankVo = service.getRank(uid); - return new BusiResult<>(rankVo); - } - - @ApiOperation("结算") - @ApiImplicitParams({ - @ApiImplicitParam(name = "date", value = "结算日期", required = true) - }) - @PostMapping("/settlement") - public BusiResult settlement(String date, Boolean needFlag){ - if (!StringUtils.hasText(date)){ - throw new ServiceException(BusiStatus.PARAMERROR); - } - Date time = DateTimeUtil.convertStrToDate(date, DateTimeUtil.DEFAULT_DATE_PATTERN); - LocalDateTime dateTime = DateTimeUtil.converDateToLocalDateTime(time); - if (null == needFlag){ - needFlag = true; - } - service.settlement(dateTime, needFlag); - return new BusiResult<>(BusiStatus.SUCCESS); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/annual/AnnualGiftRankController.java b/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/annual/AnnualGiftRankController.java deleted file mode 100644 index d39fc1299..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/annual/AnnualGiftRankController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.accompany.business.annual; - -import com.accompany.business.annual.constant.AnnualGiftRankTypeEnum; -import com.accompany.business.annual.service.AnnualGiftRankService; -import com.accompany.business.common.vo.ActivityRankVo; -import com.accompany.common.annotation.Authorization; -import com.accompany.common.constant.ApplicationConstant; -import com.accompany.common.result.BusiResult; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; - -@Api(tags = "2023年度盛典活动",value = "2023年度盛典活动") -@RequestMapping("/act/2023Annual/gift") -@RestController -public class AnnualGiftRankController { - - @Autowired - private AnnualGiftRankService service; - - @ApiOperation("礼物排行榜") - @ApiImplicitParams({ - @ApiImplicitParam(name = "type", value = "礼物枚举，可null") - }) - @GetMapping("/getRank") - @Authorization - public BusiResult getRank(HttpServletRequest request, AnnualGiftRankTypeEnum type){ - String uidStr = request.getHeader(ApplicationConstant.PublicParameters.PUB_UID); - Long uid = Long.parseLong(uidStr); - ActivityRankVo rankVo = service.getRank(uid, type); - return new BusiResult<>(rankVo); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/annual/AnnualPopularRankController.java b/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/annual/AnnualPopularRankController.java deleted file mode 100644 index 80928583d..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/annual/AnnualPopularRankController.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.accompany.business.annual; - -import com.accompany.business.annual.service.AnnualPopularRankService; -import com.accompany.business.annual.vo.AnnualPopularHourRankVo; -import com.accompany.business.common.constant.RankRoundEnum; -import com.accompany.business.common.vo.RoundActivityRankVo; -import com.accompany.common.annotation.Authorization; -import com.accompany.common.constant.ApplicationConstant; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.exception.ServiceException; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; -import java.time.LocalDateTime; -import java.util.Date; - -@Api(tags = "2023年度盛典活动",value = "2023年度盛典活动") -@RequestMapping("/act/2023Annual/popular") -@RestController -public class AnnualPopularRankController { - - @Autowired - private AnnualPopularRankService service; - - @ApiOperation("人气排行榜") - @ApiImplicitParams({ - @ApiImplicitParam(name = "round", value = "轮次，可传null") - }) - @GetMapping("/getRank") - @Authorization - public BusiResult getRank(HttpServletRequest request, RankRoundEnum round){ - String uidStr = request.getHeader(ApplicationConstant.PublicParameters.PUB_UID); - Long uid = Long.parseLong(uidStr); - RoundActivityRankVo rankVo = service.getRank(uid, round); - return new BusiResult<>(rankVo); - } - - @ApiOperation("人气小时排行榜") - @GetMapping("/getHourRank") - @Authorization - public BusiResult getHourRank(){ - AnnualPopularHourRankVo rankVo = service.getHourRank(); - return new BusiResult<>(rankVo); - } - - @ApiOperation("结算") - @ApiImplicitParams({ - @ApiImplicitParam(name = "dateTime", value = "结算时间", required = true) - }) - @PostMapping("/settlement") - public BusiResult settlement(String dateTime, Boolean needFlag){ - if (!StringUtils.hasText(dateTime)){ - throw new ServiceException(BusiStatus.PARAMERROR); - } - Date time = DateTimeUtil.convertStrToDate(dateTime, DateTimeUtil.DEFAULT_DATETIME_PATTERN); - LocalDateTime now = DateTimeUtil.converDateToLocalDateTime(time); - if (null == needFlag){ - needFlag = true; - } - service.settlement(now, needFlag); - service.initRank(now); - return new BusiResult<>(BusiStatus.SUCCESS); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/annual/AnnualRoomRankController.java b/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/annual/AnnualRoomRankController.java deleted file mode 100644 index 7e6b2a892..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/annual/AnnualRoomRankController.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.accompany.business.annual; - -import com.accompany.business.annual.service.AnnualRoomRankService; -import com.accompany.business.annual.vo.AnnualRoomPkInfoVo; -import com.accompany.business.annual.vo.AnnualRoomRankVo; -import com.accompany.business.common.constant.RankRoundEnum; -import com.accompany.common.annotation.Authorization; -import com.accompany.common.constant.ApplicationConstant; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.exception.ServiceException; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Profile; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; -import java.time.LocalDateTime; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -@Api(tags = "2023年度盛典活动",value = "2023年度盛典活动") -@RequestMapping("/act/2023Annual/room") -@RestController -public class AnnualRoomRankController { - - @Autowired - private AnnualRoomRankService service; - - @ApiOperation("房间排行榜") - @ApiImplicitParams({ - @ApiImplicitParam(name = "round", value = "轮次，可传null") - }) - @GetMapping("/getRank") - @Authorization - public BusiResult getRank(HttpServletRequest request, RankRoundEnum round){ - String uidStr = request.getHeader(ApplicationConstant.PublicParameters.PUB_UID); - Long uid = Long.parseLong(uidStr); - AnnualRoomRankVo rankVo = service.getRank(uid, round); - return new BusiResult<>(rankVo); - } - - @ApiOperation("房间排行榜-pk") - @GetMapping("/getRoomPkInfo") - public BusiResult getRoomPkInfo(){ - AnnualRoomPkInfoVo pkInfoVo = service.getRoomPkInfo(); - return new BusiResult<>(pkInfoVo); - } - - @ApiOperation("房间排行榜-预约房间pk") - @PostMapping("/bookRoomPk") - @Profile({"dev", "native"}) - public BusiResult bookRoomPkInfo(RankRoundEnum round, String roomUidStr){ - if (null == round || !StringUtils.hasText(roomUidStr)){ - throw new ServiceException(BusiStatus.PARAMETERILLEGAL); - } - List roomUids = Arrays.stream(roomUidStr.split(",")).map(Long::new).collect(Collectors.toList()); - service.bookRoomPk(round, roomUids); - return new BusiResult<>(BusiStatus.SUCCESS); - } - - @ApiOperation("结算") - @ApiImplicitParams({ - @ApiImplicitParam(name = "dateTime", value = "结算时间", required = true) - }) - @PostMapping("/settlement") - public BusiResult settlement(String dateTime, Boolean needFlag){ - if (!StringUtils.hasText(dateTime)){ - throw new ServiceException(BusiStatus.PARAMERROR); - } - Date time = DateTimeUtil.convertStrToDate(dateTime, DateTimeUtil.DEFAULT_DATETIME_PATTERN); - LocalDateTime now = DateTimeUtil.converDateToLocalDateTime(time); - if (null == needFlag){ - needFlag = true; - } - service.settlement(now, needFlag); - service.initRank(now); - return new BusiResult<>(BusiStatus.SUCCESS); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/annual/AnnualTaskController.java b/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/annual/AnnualTaskController.java deleted file mode 100644 index d1c9ebc84..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/annual/AnnualTaskController.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.accompany.business.annual; - -import com.accompany.business.annual.service.AnnualTaskService; -import com.accompany.business.annual.vo.AnnualTaskVo; -import com.accompany.business.common.constant.RankTypeEnum; -import com.accompany.business.common.vo.RewardVo; -import com.accompany.common.annotation.Authorization; -import com.accompany.common.constant.ApplicationConstant; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.ServiceException; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; -import java.util.List; - -@Api(tags = "2023年度盛典活动",value = "2023年度盛典活动") -@RequestMapping("/act/2023Annual/task") -@RestController -public class AnnualTaskController { - - @Autowired - private AnnualTaskService service; - - @ApiOperation("任务") - @ApiImplicitParams({ - @ApiImplicitParam(name = "type", value = "类型（2=送榜，4=收榜）", required = true) - }) - @GetMapping("/getTask") - @Authorization - public BusiResult getTaskVo(HttpServletRequest request, RankTypeEnum type){ - if (!RankTypeEnum.SEND_TOTAL.equals(type) && !RankTypeEnum.RECEIVE_TOTAL.equals(type)){ - throw new ServiceException(BusiStatus.PARAMETERILLEGAL); - } - String uidStr = request.getHeader(ApplicationConstant.PublicParameters.PUB_UID); - Long uid = Long.parseLong(uidStr); - AnnualTaskVo taskVo = service.getTaskVo(uid, type); - return new BusiResult<>(taskVo); - } - - @ApiOperation("获取任务奖励") - @ApiImplicitParams({ - @ApiImplicitParam(name = "type", value = "类型（2=送榜，4=收榜）", required = true) - }) - @GetMapping("/getTaskReward") - @Authorization - public BusiResult> getTaskVo(HttpServletRequest request, RankTypeEnum type, Integer taskId){ - if (!RankTypeEnum.SEND_TOTAL.equals(type) && !RankTypeEnum.RECEIVE_TOTAL.equals(type)){ - throw new ServiceException(BusiStatus.PARAMETERILLEGAL); - } - if (null == taskId){ - throw new ServiceException(BusiStatus.PARAMETERILLEGAL); - } - String uidStr = request.getHeader(ApplicationConstant.PublicParameters.PUB_UID); - Long uid = Long.parseLong(uidStr); - List rewardVoList = service.getTaskReward(uid, type, taskId); - return new BusiResult<>(rewardVoList); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/annual/AnnualTyrantRankController.java b/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/annual/AnnualTyrantRankController.java deleted file mode 100644 index 596dadfbe..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/annual/AnnualTyrantRankController.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.accompany.business.annual; - -import com.accompany.business.annual.service.AnnualTyrantRankService; -import com.accompany.business.common.vo.ActivityRankVo; -import com.accompany.common.annotation.Authorization; -import com.accompany.common.constant.ApplicationConstant; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.exception.ServiceException; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; -import java.time.LocalDateTime; -import java.util.Date; - -@Api(tags = "2023年度盛典活动",value = "2023年度盛典活动") -@RequestMapping("/act/2023Annual/tyrant") -@RestController -public class AnnualTyrantRankController { - - @Autowired - private AnnualTyrantRankService service; - - @ApiOperation("神豪排行榜") - @GetMapping("/getRank") - @Authorization - public BusiResult getRank(HttpServletRequest request){ - String uidStr = request.getHeader(ApplicationConstant.PublicParameters.PUB_UID); - Long uid = Long.parseLong(uidStr); - ActivityRankVo rankVo = service.getRank(uid); - return new BusiResult<>(rankVo); - } - - @ApiOperation("结算") - @ApiImplicitParams({ - @ApiImplicitParam(name = "date", value = "结算日期", required = true) - }) - @PostMapping("/settlement") - public BusiResult settlement(String date, Boolean needFlag){ - if (!StringUtils.hasText(date)){ - throw new ServiceException(BusiStatus.PARAMERROR); - } - Date time = DateTimeUtil.convertStrToDate(date, DateTimeUtil.DEFAULT_DATE_PATTERN); - LocalDateTime dateTime = DateTimeUtil.converDateToLocalDateTime(time); - if (null == needFlag){ - needFlag = true; - } - service.settlement(dateTime, needFlag); - return new BusiResult<>(BusiStatus.SUCCESS); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/children/ChildrenDayController.java b/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/children/ChildrenDayController.java deleted file mode 100644 index 5bc0c547a..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/children/ChildrenDayController.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.accompany.business.children; - -import com.accompany.business.children.service.ChildrenDayGardenService; -import com.accompany.business.children.service.ChildrenDayTaskService; -import com.accompany.business.children.vo.ChildrenDayTaskVo; -import com.accompany.business.children.vo.ChildrenDrawRewardVo; -import com.accompany.common.result.BusiResult; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * @author: liaozetao - * @date: 2024/5/23 09:52 - * @description: - */ -@Api(tags = "2024重返童年", value = "2024重返童年") -@RequestMapping("/act/children") -@RestController -public class ChildrenDayController { - - @Autowired - private ChildrenDayTaskService childrenDayTaskService; - - @Autowired - private ChildrenDayGardenService childrenDayGardenService; - - /** - * 任务清单 - * @return - */ - @ApiOperation("任务清单") - @GetMapping("task") - public BusiResult task() { - return BusiResult.success(childrenDayTaskService.task()); - } - - /** - * 开始追捕 - * @return - */ - @ApiOperation("开始追捕") - @GetMapping("draw") - public BusiResult draw() { - return BusiResult.success(childrenDayGardenService.draw()); - } - - /** - * 随机主播 - * @return - */ - @ApiOperation("随机主播") - @GetMapping("randomAnchorUid") - public BusiResult randomAnchorUid() { - return BusiResult.success(childrenDayGardenService.randomAnchorUid()); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/christmas/ChristmasCpRankController.java b/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/christmas/ChristmasCpRankController.java deleted file mode 100644 index 30cf1f36f..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/christmas/ChristmasCpRankController.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.accompany.business.christmas; - -import com.accompany.business.christmas.service.ChristmasCpRankService; -import com.accompany.business.christmas.service.ChristmasCpService; -import com.accompany.business.christmas.vo.ChristmasCpVo; -import com.accompany.business.common.constant.CpRankTypeEnum; -import com.accompany.business.common.vo.ActivityCpRankVo; -import com.accompany.business.common.vo.RewardVo; -import com.accompany.common.annotation.Authorization; -import com.accompany.common.constant.ApplicationConstant; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.exception.ServiceException; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; -import java.time.LocalDateTime; -import java.util.Date; -import java.util.List; - -@Api(tags = "2023圣诞节活动",value = "2023圣诞节活动") -@RequestMapping("/act/2023Christmas/cpRank") -@RestController -public class ChristmasCpRankController { - - @Autowired - private ChristmasCpService cpService; - @Autowired - private ChristmasCpRankService service; - - @ApiOperation("获取自己的cp情况") - @GetMapping("/getCp") - @Authorization - public BusiResult getCp(HttpServletRequest request){ - String uidStr = request.getHeader(ApplicationConstant.PublicParameters.PUB_UID); - Long uid = Long.parseLong(uidStr); - ChristmasCpVo cpVo = cpService.getCpVo(uid); - return new BusiResult<>(cpVo); - } - - @ApiOperation("获取cp奖励") - @PostMapping("/getCpReward") - @Authorization - public BusiResult> getCpReward(HttpServletRequest request){ - String uidStr = request.getHeader(ApplicationConstant.PublicParameters.PUB_UID); - Long uid = Long.parseLong(uidStr); - List rewardVoList = cpService.getCpReward(uid); - return new BusiResult<>(rewardVoList); - } - - @ApiOperation("获取cp任务奖励") - @PostMapping("/getCpTaskReward") - @Authorization - public BusiResult> getCpReward(HttpServletRequest request, Long toUid, Integer taskId){ - String uidStr = request.getHeader(ApplicationConstant.PublicParameters.PUB_UID); - Long uid = Long.parseLong(uidStr); - List rewardVoList = cpService.getCpTaskReward(uid, toUid, taskId); - return new BusiResult<>(rewardVoList); - } - - @ApiOperation("cp排行榜") - @ApiImplicitParams({ - @ApiImplicitParam(name = "rankType", value = "排行榜类型（1=日榜，2=总榜）", required = true), - @ApiImplicitParam(name = "date", value = "日榜日期，总榜可不传", required = false) - }) - @GetMapping("/getRank") - @Authorization - public BusiResult getRank(HttpServletRequest request, CpRankTypeEnum rankType, String date){ - String uidStr = request.getHeader(ApplicationConstant.PublicParameters.PUB_UID); - Long uid = Long.parseLong(uidStr); - ActivityCpRankVo rankVo = service.getRank(uid, rankType, date); - return new BusiResult<>(rankVo); - } - - @ApiOperation("结算") - @ApiImplicitParams({ - @ApiImplicitParam(name = "date", value = "结算日期", required = true) - }) - @PostMapping("/settlement") - public BusiResult settlement(String date, Boolean needFlag){ - if (!StringUtils.hasText(date)){ - throw new ServiceException(BusiStatus.PARAMERROR); - } - Date time = DateTimeUtil.convertStrToDate(date, DateTimeUtil.DEFAULT_DATE_PATTERN); - LocalDateTime dateTime = DateTimeUtil.converDateToLocalDateTime(time); - if (null == needFlag){ - needFlag = true; - } - service.settlement(dateTime, needFlag); - return new BusiResult<>(BusiStatus.SUCCESS); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/christmas/ChristmasLetterController.java b/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/christmas/ChristmasLetterController.java deleted file mode 100644 index f3dfbde39..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/christmas/ChristmasLetterController.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.accompany.business.christmas; - -import com.accompany.business.christmas.constant.ChristmasConstant; -import com.accompany.business.christmas.service.ChristmasLetterService; -import com.accompany.business.christmas.vo.ChristmasLetterConfigVo; -import com.accompany.business.christmas.vo.ChristmasLetterVo; -import com.accompany.common.annotation.Authorization; -import com.accompany.common.constant.ApplicationConstant; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.ServiceException; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; -import java.util.List; - -@Api(tags = "2023圣诞节活动",value = "2023圣诞节活动") -@RequestMapping("/act/2023Christmas/letter") -@RestController -public class ChristmasLetterController { - - @Autowired - private ChristmasLetterService service; - - @ApiOperation("情书广场") - @Authorization - @GetMapping("/letterSquare") - public BusiResult> listLetterVo(){ - List listVo = service.listLetterVo(null, null); - return new BusiResult<>(listVo); - } - - @ApiOperation("我的情书") - @ApiImplicitParams({ - @ApiImplicitParam(name = "type", value = "1=我发出的，2=我收到的", required = true) - }) - @Authorization - @GetMapping("/listLetter") - public BusiResult> listLetterVo(HttpServletRequest request, - Byte type){ - String uidStr = request.getHeader(ApplicationConstant.PublicParameters.PUB_UID); - if (StringUtils.isBlank(uidStr)){ - throw new ServiceException(BusiStatus.PARAMETERILLEGAL); - } - Long uid = Long.parseLong(uidStr); - List listVo = service.listLetterVo(uid, type); - return new BusiResult<>(listVo); - } - - @ApiOperation("我要告白首页") - @Authorization - @GetMapping("/getConfig") - public BusiResult getConfigVo(HttpServletRequest request){ - String uidStr = request.getHeader(ApplicationConstant.PublicParameters.PUB_UID); - Long uid = Long.parseLong(uidStr); - ChristmasLetterConfigVo configVo = service.getConfigVo(uid); - return new BusiResult<>(configVo); - } - - @ApiOperation("告白") - @ApiImplicitParams({ - @ApiImplicitParam(name = "toUid", value = "cp Uid", required = true), - @ApiImplicitParam(name = "letterType", value = "情信id， 1，2，3， 4", required = true), - @ApiImplicitParam(name = "text", value = "内容", required = true) - }) - @Authorization - @PostMapping("/publishLetter") - public BusiResult publishLetter(HttpServletRequest request, - Long toUid, Integer letterType, String text){ - if (null == toUid - || (!ChristmasConstant.LetterTaskId.ORANGE.equals(letterType) - && !ChristmasConstant.LetterTaskId.BLUE.equals(letterType) - && !ChristmasConstant.LetterTaskId.PINK.equals(letterType) - && !ChristmasConstant.LetterTaskId.GOLD.equals(letterType)) - || StringUtils.isBlank(text)){ - throw new ServiceException(BusiStatus.PARAMERROR); - } - if (text.length() > 50){ - throw new ServiceException(BusiStatus.PARAMERROR, ChristmasConstant.BusiStatus.CHAR_LENGTH_LIMIT); - } - String uidStr = request.getHeader(ApplicationConstant.PublicParameters.PUB_UID); - Long uid = Long.parseLong(uidStr); - service.publishLetter(uid, toUid, letterType, text); - return BusiResult.success(); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/christmas/ChristmasRankController.java b/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/christmas/ChristmasRankController.java deleted file mode 100644 index 549761621..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/christmas/ChristmasRankController.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.accompany.business.christmas; - -import com.accompany.business.christmas.service.ChristmasRankService; -import com.accompany.business.common.constant.RankTypeEnum; -import com.accompany.business.common.vo.ActivityRankVo; -import com.accompany.common.annotation.Authorization; -import com.accompany.common.constant.ApplicationConstant; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.exception.ServiceException; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; -import java.time.LocalDateTime; -import java.util.Date; - -@Api(tags = "2023圣诞节活动",value = "2023圣诞节活动") -@RequestMapping("/act/2023Christmas/rank") -@RestController -public class ChristmasRankController { - - @Autowired - private ChristmasRankService service; - - @ApiOperation("排行榜") - @ApiImplicitParams({ - @ApiImplicitParam(name = "rankType", value = "排行榜类型（1=送礼日榜，2=送礼总榜，3=收礼日榜，4=收礼总榜）", required = true), - @ApiImplicitParam(name = "date", value = "日榜日期，总榜可不传", required = false) - }) - @GetMapping("/getRank") - @Authorization - public BusiResult getRank(HttpServletRequest request, RankTypeEnum rankType, String date){ - String uidStr = request.getHeader(ApplicationConstant.PublicParameters.PUB_UID); - Long uid = Long.parseLong(uidStr); - ActivityRankVo rankVo = service.getRank(uid, rankType, date); - return new BusiResult<>(rankVo); - } - - @ApiOperation("结算") - @ApiImplicitParams({ - @ApiImplicitParam(name = "date", value = "结算日期", required = true) - }) - @PostMapping("/settlement") - public BusiResult settlement(String date, Boolean needFlag){ - if (!StringUtils.hasText(date)){ - throw new ServiceException(BusiStatus.PARAMERROR); - } - Date time = DateTimeUtil.convertStrToDate(date, DateTimeUtil.DEFAULT_DATE_PATTERN); - LocalDateTime dateTime = DateTimeUtil.converDateToLocalDateTime(time); - if (null == needFlag){ - needFlag = true; - } - service.settlement(dateTime, needFlag); - return new BusiResult<>(BusiStatus.SUCCESS); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/crossroompk/SingleCrossRoomPkActController.java b/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/crossroompk/SingleCrossRoomPkActController.java deleted file mode 100644 index 60ea4574d..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/crossroompk/SingleCrossRoomPkActController.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.accompany.business.crossroompk; - -import com.accompany.business.crossroompk.service.SingleCrossRoomPkRankService; -import com.accompany.business.crossroompk.vo.CrossRoomPkRankVo; -import com.accompany.business.crossroompk.vo.CrossRoomPkRecordVo; -import com.accompany.common.result.BusiResult; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - * @author: liaozetao - * @date: 2024/6/12 10:03 - * @description: - */ -@Api(tags = "个播PK-擂台PK赛", value = "个播PK-擂台PK赛") -@Slf4j -@RestController -@RequestMapping("/act/singleCrossRoomPk") -public class SingleCrossRoomPkActController { - - @Autowired - private SingleCrossRoomPkRankService singleCrossRoomPkRankService; - - /** - * 排行榜 - * - * @param pageNum - * @param pageSize - * @return - */ - @ApiOperation("排行榜") - @GetMapping("getRank") - public BusiResult> getRank(Integer pageNum, Integer pageSize) { - return BusiResult.success(singleCrossRoomPkRankService.getRank(pageNum, pageSize)); - } - - /** - * PK场次记录 - * @param pageNum - * @param pageSize - * @return - */ - @ApiOperation("PK场次记录") - @GetMapping("getRecord") - public BusiResult> getRecord(Integer pageNum, Integer pageSize) { - return BusiResult.success(singleCrossRoomPkRankService.getRecord(pageNum, pageSize)); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/doubleeleven/DoubleElevenRankController.java b/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/doubleeleven/DoubleElevenRankController.java deleted file mode 100644 index 0e6b896ea..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/doubleeleven/DoubleElevenRankController.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.accompany.business.doubleeleven; - -import com.accompany.business.common.constant.RankTypeEnum; -import com.accompany.business.common.vo.ActivityRankVo; -import com.accompany.business.doubleeleven.service.DoubleElevenRankService; -import com.accompany.common.annotation.Authorization; -import com.accompany.common.constant.ApplicationConstant; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.exception.ServiceException; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; -import java.time.LocalDateTime; -import java.util.Date; - -@Api(tags = "2023双11活动",value = "2023双11活动") -@RequestMapping("/act/2023DoubleEleven/rank") -@RestController -public class DoubleElevenRankController { - - @Autowired - private DoubleElevenRankService service; - - @ApiOperation("排行榜") - @ApiImplicitParams({ - @ApiImplicitParam(name = "rankType", value = "排行榜类型（1=送礼日榜，2=送礼总榜，3=收礼日榜，4=收礼总榜）", required = true), - @ApiImplicitParam(name = "date", value = "日榜日期，总榜可不传", required = false) - }) - @GetMapping("/getRank") - @Authorization - public BusiResult getRank(HttpServletRequest request, RankTypeEnum rankType, String date){ - String uidStr = request.getHeader(ApplicationConstant.PublicParameters.PUB_UID); - Long uid = Long.parseLong(uidStr); - ActivityRankVo rankVo = service.getRank(uid, rankType, date); - return new BusiResult<>(rankVo); - } - - @ApiOperation("结算") - @ApiImplicitParams({ - @ApiImplicitParam(name = "date", value = "结算日期", required = true) - }) - @PostMapping("/settlement") - public BusiResult settlement(String date, Boolean needFlag){ - if (!StringUtils.hasText(date)){ - throw new ServiceException(BusiStatus.PARAMERROR); - } - Date time = DateTimeUtil.convertStrToDate(date, DateTimeUtil.DEFAULT_DATE_PATTERN); - LocalDateTime dateTime = DateTimeUtil.converDateToLocalDateTime(time); - if (null == needFlag){ - needFlag = true; - } - service.settlement(dateTime, needFlag); - return new BusiResult<>(BusiStatus.SUCCESS); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/doubleeleven/DoubleElevenTaskController.java b/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/doubleeleven/DoubleElevenTaskController.java deleted file mode 100644 index 19bb3e326..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/doubleeleven/DoubleElevenTaskController.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.accompany.business.doubleeleven; - -import com.accompany.business.doubleeleven.service.DoubleElevenTaskRecordService; -import com.accompany.business.doubleeleven.service.DoubleElevenTaskService; -import com.accompany.business.doubleeleven.vo.DoubleElevenTaskConfigVo; -import com.accompany.common.annotation.Authorization; -import com.accompany.common.constant.ApplicationConstant; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; - -@Api(tags = "2023双11活动",value = "2023双11活动") -@RequestMapping("/act/2023DoubleEleven/task") -@RestController -public class DoubleElevenTaskController { - - @Autowired - private DoubleElevenTaskService service; - @Autowired - private DoubleElevenTaskRecordService recordService; - - @ApiOperation("任务首页") - @Authorization - @GetMapping("/getConfig") - public BusiResult getConfigVo(HttpServletRequest request){ - String uidStr = request.getHeader(ApplicationConstant.PublicParameters.PUB_UID); - Long uid = Long.parseLong(uidStr); - DoubleElevenTaskConfigVo configVo = service.getConfigVo(uid); - return new BusiResult<>(configVo); - } - - @ApiOperation("导出") - @GetMapping("/write2Db") - public BusiResult write2Db(){ - recordService.writeDb(); - return new BusiResult<>(BusiStatus.SUCCESS); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/exp/ExpBattleActController.java b/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/exp/ExpBattleActController.java deleted file mode 100644 index 47ef91052..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/exp/ExpBattleActController.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.accompany.business.exp; - -import com.accompany.business.common.vo.ActivityRankVo; -import com.accompany.business.exp.service.ExpBattleActService; -import com.accompany.business.exp.vo.ExpBattleActVo; -import com.accompany.common.annotation.Authorization; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.base.UidContextHolder; -import com.accompany.core.exception.ServiceException; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.time.ZonedDateTime; -import java.util.Date; - -@Api(tags = "ExpBattle活动",value = "ExpBattle活动") -@RequestMapping("/act/expBattle") -@RestController -public class ExpBattleActController { - - @Autowired - private ExpBattleActService service; - - @ApiOperation("等级奖励列表") - @GetMapping("/getConfig") - @Authorization - public BusiResult getConfig(){ - Long uid = UidContextHolder.get(); - ExpBattleActVo configVo = service.getConfig(uid); - return new BusiResult<>(configVo); - } - - @ApiOperation("获取等级奖励") - @PostMapping("/getReward") - @Authorization - public BusiResult getReward(Integer level){ - if (null == level){ - throw new ServiceException(BusiStatus.PARAMERROR); - } - Long uid = UidContextHolder.get(); - service.getReward(uid, level); - return BusiResult.success(); - } - - @ApiOperation("排行榜") - @GetMapping("/getRank") - @Authorization - public BusiResult getRank(){ - Long uid = UidContextHolder.get(); - ActivityRankVo rankVo = service.getRank(uid); - return new BusiResult<>(rankVo); - } - - @ApiOperation("结算") - @ApiImplicitParams({ - @ApiImplicitParam(name = "date", value = "结算日期", required = true) - }) - @PostMapping("/settlement") - public BusiResult settlement(String date, Boolean needFlag){ - if (!StringUtils.hasText(date)){ - throw new ServiceException(BusiStatus.PARAMERROR); - } - Date time = DateTimeUtil.convertStrToDate(date, DateTimeUtil.DEFAULT_DATE_PATTERN); - LocalDateTime dateTime = DateTimeUtil.converDateToLocalDateTime(time); - ZonedDateTime zonedDateTime = dateTime.atZone(ZoneId.systemDefault()); - if (null == needFlag){ - needFlag = true; - } - - service.settlement(zonedDateTime, needFlag); - return new BusiResult<>(BusiStatus.SUCCESS); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/fools/AprilFoolsDayController.java b/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/fools/AprilFoolsDayController.java deleted file mode 100644 index cb44f9e8e..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/fools/AprilFoolsDayController.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.accompany.business.fools; - -import com.accompany.business.fools.service.AprilFoolsDayRoomService; -import com.accompany.business.fools.vo.AprilFoolsDayRoomVo; -import com.accompany.common.result.BusiResult; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.Date; -import java.util.List; - -/** - * @author: liaozetao - * @date: 2024/3/21 18:13 - * @description: - */ -@Api(tags = "2024愚人节活动", value = "2024愚人节活动") -@RequestMapping("/act/2024AprilFoolsDay") -@RestController -public class AprilFoolsDayController { - - @Autowired - private AprilFoolsDayRoomService aprilFoolsDayRoomService; - - /** - * 疯狂小丑 - * - * @param activityCode - * @param taskCode - * @return - */ - @ApiOperation("疯狂小丑") - @ApiImplicitParams({ - @ApiImplicitParam(name = "activityCode", value = "活动编码"), - @ApiImplicitParam(name = "taskCode", value = "房间类型 XIAO_CHOU_ROOM_1 牌照 XIAO_CHOU_ROOM_4 个播"), - }) - @GetMapping("/getRooms") - public BusiResult> getRooms(String activityCode, String taskCode) { - return BusiResult.success(aprilFoolsDayRoomService.getRooms(activityCode, taskCode)); - } - - /** - * 获取倒计时 - * - * @return - */ - @ApiOperation("获取倒计时") - @ApiImplicitParams({ - @ApiImplicitParam(name = "activityCode", value = "活动编码 ACT_2024_APRIL_FOOLS_DAY"), - @ApiImplicitParam(name = "taskCode", value = "任务编码 QI_HUAN_GIFT"), - }) - @GetMapping("/getTime") - public BusiResult getTime(String activityCode, String taskCode) { - return BusiResult.success(aprilFoolsDayRoomService.getTime(activityCode, taskCode)); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/halloween/HalloweenDrawController.java b/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/halloween/HalloweenDrawController.java deleted file mode 100644 index 5fe537190..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/halloween/HalloweenDrawController.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.accompany.business.halloween; - -import com.accompany.business.halloween.service.HalloweenDrawService; -import com.accompany.business.halloween.vo.HalloweenDrawConfigVo; -import com.accompany.business.halloween.vo.HalloweenDrawResultVo; -import com.accompany.business.halloween.vo.HalloweenDrawUserRecordVo; -import com.accompany.common.annotation.Authorization; -import com.accompany.common.constant.ApplicationConstant; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.ServiceException; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; -import java.util.List; - -@Api(tags = "2023万圣节活动",value = "2023万圣节活动") -@RequestMapping("/act/2023Halloween/draw") -@RestController -public class HalloweenDrawController { - - @Autowired - private HalloweenDrawService service; - - @ApiOperation("抽奖首页") - @Authorization - @GetMapping("/getConfig") - public BusiResult getConfigVo(HttpServletRequest request){ - String uidStr = request.getHeader(ApplicationConstant.PublicParameters.PUB_UID); - Long uid = Long.parseLong(uidStr); - HalloweenDrawConfigVo configVo = service.getConfigVo(uid); - return new BusiResult<>(configVo); - } - - @ApiOperation("抽") - @ApiImplicitParams({ - @ApiImplicitParam(name = "num", value = "次数， null=全部，1=1次", required = true), - @ApiImplicitParam(name = "pooType", value = "宝箱等级， 1=初级，2=中级，3=高级", required = true) - }) - @Authorization - @GetMapping("/draw") - public BusiResult draw(HttpServletRequest request, Integer num, Integer poolType){ - if (null != num && num != 1){ - throw new ServiceException(BusiStatus.PARAMERROR); - } - if (null == poolType || poolType < 1 || poolType > 3){ - throw new ServiceException(BusiStatus.PARAMERROR); - } - String uidStr = request.getHeader(ApplicationConstant.PublicParameters.PUB_UID); - Long uid = Long.parseLong(uidStr); - - HalloweenDrawResultVo resultVo = service.drawByBox(uid, num, poolType); - return new BusiResult<>(resultVo); - } - - @ApiOperation("记录") - @Authorization - @GetMapping("/pageRecord") - public BusiResult> pageRecord(HttpServletRequest request, - Integer page, - Integer size){ - if (null == page || null == size){ - throw new ServiceException(BusiStatus.PARAMERROR); - } - String uidStr = request.getHeader(ApplicationConstant.PublicParameters.PUB_UID); - Long uid = Long.parseLong(uidStr); - List recordVoList = service.pageRecord(uid, page, size); - return new BusiResult<>(recordVoList); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/halloween/HalloweenRankController.java b/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/halloween/HalloweenRankController.java deleted file mode 100644 index 678055f24..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/halloween/HalloweenRankController.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.accompany.business.halloween; - -import com.accompany.business.common.constant.RankTypeEnum; -import com.accompany.business.common.vo.ActivityRankVo; -import com.accompany.business.halloween.service.HalloweenRankService; -import com.accompany.common.annotation.Authorization; -import com.accompany.common.constant.ApplicationConstant; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.exception.ServiceException; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletRequest; -import java.time.LocalDateTime; -import java.util.Date; - -@Api(tags = "2023万圣节活动",value = "2023万圣节活动") -@RequestMapping("/act/2023Halloween/rank") -@RestController -public class HalloweenRankController { - - @Autowired - private HalloweenRankService service; - - @ApiOperation("排行榜") - @ApiImplicitParams({ - @ApiImplicitParam(name = "rankType", value = "排行榜类型（1=送礼日榜，2=送礼总榜，3=收礼日榜，4=收礼总榜）", required = true), - @ApiImplicitParam(name = "date", value = "日榜日期，总榜可不传", required = false), - @ApiImplicitParam(name = "pageSize", value = "数量"), - }) - @GetMapping("/getRank") - @Authorization - public BusiResult getRank(HttpServletRequest request, RankTypeEnum rankType, String date, @RequestParam(value = "pageSize", defaultValue = "15") Integer pageSize){ - String uidStr = request.getHeader(ApplicationConstant.PublicParameters.PUB_UID); - Long uid = Long.parseLong(uidStr); - ActivityRankVo rankVo = service.getRank(uid, rankType, date, pageSize); - return new BusiResult<>(rankVo); - } - - @ApiOperation("结算") - @ApiImplicitParams({ - @ApiImplicitParam(name = "date", value = "结算日期", required = true) - }) - @PostMapping("/settlement") - public BusiResult settlement(String date, Boolean needFlag){ - if (!StringUtils.hasText(date)){ - throw new ServiceException(BusiStatus.PARAMERROR); - } - Date time = DateTimeUtil.convertStrToDate(date, DateTimeUtil.DEFAULT_DATE_PATTERN); - LocalDateTime dateTime = DateTimeUtil.converDateToLocalDateTime(time); - if (null == needFlag){ - needFlag = true; - } - service.settlement(dateTime, needFlag); - return new BusiResult<>(BusiStatus.SUCCESS); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/halloween/HalloweenTaskController.java b/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/halloween/HalloweenTaskController.java deleted file mode 100644 index 610d249ec..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/halloween/HalloweenTaskController.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.accompany.business.halloween; - -import com.accompany.business.halloween.service.HalloweenTaskRecordService; -import com.accompany.business.halloween.service.HalloweenTaskService; -import com.accompany.business.halloween.vo.HalloweenTaskConfigVo; -import com.accompany.common.annotation.Authorization; -import com.accompany.common.constant.ApplicationConstant; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; - -@Api(tags = "2023万圣节活动",value = "2023万圣节活动") -@RequestMapping("/act/2023Halloween/task") -@RestController -public class HalloweenTaskController { - - @Autowired - private HalloweenTaskService service; - @Autowired - private HalloweenTaskRecordService recordService; - - @ApiOperation("任务首页") - @Authorization - @GetMapping("/getConfig") - public BusiResult getConfigVo(HttpServletRequest request){ - String uidStr = request.getHeader(ApplicationConstant.PublicParameters.PUB_UID); - Long uid = Long.parseLong(uidStr); - HalloweenTaskConfigVo configVo = service.getConfigVo(uid); - return new BusiResult<>(configVo); - } - - @ApiOperation("导出") - @GetMapping("/write2Db") - public BusiResult write2Db(){ - recordService.writeDb(); - return new BusiResult<>(BusiStatus.SUCCESS); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/hotlove/ActHotLoveController.java b/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/hotlove/ActHotLoveController.java deleted file mode 100644 index 370f242f8..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/hotlove/ActHotLoveController.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.accompany.business.hotlove; - -import com.accompany.business.activity.vo.ActTaskRewardVo; -import com.accompany.business.hotlove.service.ActHotLoveService; -import com.accompany.common.result.BusiResult; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * @author: liaozetao - * @date: 2024/5/10 14:40 - * @description: - */ -@Api(tags = "全城热恋", value = "全城热恋") -@RequestMapping("/act/hotLove") -@RestController -public class ActHotLoveController { - - @Autowired - private ActHotLoveService actHotLoveService; - - /** - * 兑换 - * @param activityCode - * @param taskCode - * @return - */ - @ApiOperation("兑换") - @PostMapping("exchange") - public BusiResult exchange(@RequestParam("activityCode") String activityCode, @RequestParam("taskCode") String taskCode, @RequestParam("conditionCode") String conditionCode) { - actHotLoveService.exchange(activityCode, taskCode, conditionCode); - return BusiResult.success(); - } - - /** - * 我的热恋币 - * @param redisKey - * @return - */ - @ApiOperation("我的热恋币") - @GetMapping("currency") - public BusiResult currency(@RequestParam("redisKey") String redisKey) { - return BusiResult.success(actHotLoveService.currency(redisKey)); - } - - - /** - * 奖品列表 - * @param activityCode - * @param componentCode - * @return - */ - @ApiOperation("奖品列表") - @GetMapping("rewardList") - public BusiResult> rewardList(@RequestParam("activityCode") String activityCode, @RequestParam("componentCode") String componentCode) { - return BusiResult.success(actHotLoveService.rewardList(activityCode, componentCode)); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/luckyprocessbar/LuckyProcessBarController.java b/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/luckyprocessbar/LuckyProcessBarController.java deleted file mode 100644 index 2cfe8e37e..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/luckyprocessbar/LuckyProcessBarController.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.accompany.business.luckyprocessbar; - -import com.accompany.business.luckyprocessbar.service.LuckyProcessBarService; -import com.accompany.business.luckyprocessbar.vo.LuckyProcessBarConfigVo; -import com.accompany.common.annotation.Authorization; -import com.accompany.common.constant.ApplicationConstant; -import com.accompany.common.result.BusiResult; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; - -@Api(tags = "2023时空幸运儿",value = "2023时空幸运儿") -@RequestMapping("/act/2023LuckyProcessBar/") -@RestController -public class LuckyProcessBarController { - - @Autowired - private LuckyProcessBarService service; - - @ApiOperation("首页") - @GetMapping("/getConfig") - @Authorization - public BusiResult getRank(HttpServletRequest request){ - String uidStr = request.getHeader(ApplicationConstant.PublicParameters.PUB_UID); - Long uid = Long.parseLong(uidStr); - LuckyProcessBarConfigVo configVo = service.getConfigVo(uid); - return new BusiResult<>(configVo); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/midautumn/MidAutumnDrawController.java b/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/midautumn/MidAutumnDrawController.java deleted file mode 100644 index 37a4e166d..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/midautumn/MidAutumnDrawController.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.accompany.business.midautumn; - -import com.accompany.business.common.vo.RewardVo; -import com.accompany.business.midautumn.service.MidAutumnDrawService; -import com.accompany.business.midautumn.vo.MidAutumnDrawConfigVo; -import com.accompany.business.midautumn.vo.MidAutumnDrawUserRecordVo; -import com.accompany.common.annotation.Authorization; -import com.accompany.common.constant.ApplicationConstant; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.ServiceException; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; -import java.util.List; - -@Api(tags = "2023中秋活动",value = "2023中秋活动") -@RequestMapping("/act/2023MidAutumn/draw") -@RestController -public class MidAutumnDrawController { - - @Autowired - private MidAutumnDrawService service; - - @ApiOperation("抽奖首页") - @Authorization - @GetMapping("/getConfig") - public BusiResult getConfigVo(HttpServletRequest request){ - String uidStr = request.getHeader(ApplicationConstant.PublicParameters.PUB_UID); - Long uid = Long.parseLong(uidStr); - MidAutumnDrawConfigVo configVo = service.getConfigVo(uid); - return new BusiResult<>(configVo); - } - - @ApiOperation("抽") - @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "红包id，可不传", required = true) - }) - @Authorization - @GetMapping("/draw") - public BusiResult> draw(HttpServletRequest request, Integer num){ - if (null != num && num != 1){ - throw new ServiceException(BusiStatus.PARAMERROR); - } - String uidStr = request.getHeader(ApplicationConstant.PublicParameters.PUB_UID); - Long uid = Long.parseLong(uidStr); - List rewardVoList = service.draw(uid, num); - return new BusiResult<>(rewardVoList); - } - - @ApiOperation("记录") - @Authorization - @GetMapping("/pageRecord") - public BusiResult> pageRecord(HttpServletRequest request, - Integer page, - Integer size){ - if (null == page || null == size){ - throw new ServiceException(BusiStatus.PARAMERROR); - } - String uidStr = request.getHeader(ApplicationConstant.PublicParameters.PUB_UID); - Long uid = Long.parseLong(uidStr); - List recordVoList = service.pageRecord(uid, page, size); - return new BusiResult<>(recordVoList); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/midautumn/MidAutumnJackpotController.java b/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/midautumn/MidAutumnJackpotController.java deleted file mode 100644 index 364527f20..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/midautumn/MidAutumnJackpotController.java +++ /dev/null @@ -1,124 +0,0 @@ -package com.accompany.business.midautumn; - -import com.accompany.business.midautumn.service.MidAutumnJackpotCalculateService; -import com.accompany.business.midautumn.service.MidAutumnJackpotCalculateTestService; -import com.accompany.business.midautumn.service.MidAutumnJackpotService; -import com.accompany.business.midautumn.vo.MidAutumnJackpotConfigVo; -import com.accompany.business.midautumn.vo.MidAutumnJackpotRecordVo; -import com.accompany.common.annotation.Authorization; -import com.accompany.common.constant.ApplicationConstant; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.ServiceException; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; -import java.time.LocalDate; -import java.util.List; - -@Api(tags = "2023中秋活动") -@RestController -@RequestMapping("/act/2023MidAutumn/jackpot") -public class MidAutumnJackpotController { - - @Autowired - private MidAutumnJackpotService service; - @Autowired - private MidAutumnJackpotCalculateService calculateService; - @Autowired - private MidAutumnJackpotCalculateTestService testService; - - @ApiOperation("获取奖池、瓜分状态、今日贡献") - @Authorization - @GetMapping("/getConfig") - public BusiResult getConfig(HttpServletRequest request){ - String uidStr = request.getHeader(ApplicationConstant.PublicParameters.PUB_UID); - Long uid = Long.parseLong(uidStr); - MidAutumnJackpotConfigVo configVo = service.getConfigVo(uid); - return new BusiResult<>(configVo); - } - - @ApiOperation("瓜分") - @Authorization - @GetMapping("/allotJackpot") - public BusiResult allotJackpot(HttpServletRequest request){ - String uidStr = request.getHeader(ApplicationConstant.PublicParameters.PUB_UID); - Long uid = Long.parseLong(uidStr); - Long diamond = service.allotJackpot(uid, null); - return new BusiResult<>(diamond); - } - - @ApiOperation("我的记录") - @Authorization - @GetMapping("/listRecord") - public BusiResult> listRecord(HttpServletRequest request){ - String uidStr = request.getHeader(ApplicationConstant.PublicParameters.PUB_UID); - Long uid = Long.parseLong(uidStr); - List recordVos = service.listRecord(uid); - return new BusiResult<>(recordVos); - } - - @ApiOperation("计算瓜分") - @ApiImplicitParams({ - @ApiImplicitParam(name = "date", value = "yyyy-MM-dd日期", required = true, dataType = "string", paramType = "query") - }) - @GetMapping("/calculateJackpot") - public BusiResult> calculateJackpot(String date){ - if (!StringUtils.hasText(date)){ - throw new ServiceException(BusiStatus.PARAMERROR); - } - LocalDate localDate = LocalDate.parse(date); - List result = testService.calculateJackpot(localDate); - return new BusiResult<>(result); - } - - @ApiOperation("结算") - @ApiImplicitParams({ - @ApiImplicitParam(name = "date", value = "yyyy-MM-dd日期", required = true, dataType = "string", paramType = "query") - }) - @GetMapping("/settlement") - public BusiResult> settlement(String date){ - if (!StringUtils.hasText(date)){ - throw new ServiceException(BusiStatus.PARAMERROR); - } - LocalDate localDate = LocalDate.parse(date); - calculateService.calculateJackpot(localDate); - return new BusiResult<>(BusiStatus.SUCCESS); - } - - @ApiOperation("导出") - @ApiImplicitParams({ - @ApiImplicitParam(name = "date", value = "yyyy-MM-dd日期", required = true, dataType = "string", paramType = "query") - }) - @GetMapping("/write2Db") - public BusiResult write2Db(String date){ - if (!StringUtils.hasText(date)){ - throw new ServiceException(BusiStatus.PARAMERROR); - } - LocalDate localDate = LocalDate.parse(date); - calculateService.writeDb(localDate); - return new BusiResult<>(BusiStatus.SUCCESS); - } - - @ApiOperation("帮助用户瓜分") - @ApiImplicitParams({ - @ApiImplicitParam(name = "date", value = "yyyy-MM-dd日期", required = true, dataType = "string", paramType = "query") - }) - @GetMapping("/helpUserAllot") - public BusiResult helpUserAllot(String date){ - if (!StringUtils.hasText(date)){ - throw new ServiceException(BusiStatus.PARAMERROR); - } - LocalDate localDate = LocalDate.parse(date); - calculateService.helpUserAllot(localDate); - return new BusiResult<>(BusiStatus.SUCCESS); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/midautumn/MidAutumnRankController.java b/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/midautumn/MidAutumnRankController.java deleted file mode 100644 index 956c95b9e..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/midautumn/MidAutumnRankController.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.accompany.business.midautumn; - -import com.accompany.business.common.constant.RankTypeEnum; -import com.accompany.business.common.vo.ActivityRankVo; -import com.accompany.business.midautumn.service.MidAutumnRankService; -import com.accompany.common.annotation.Authorization; -import com.accompany.common.constant.ApplicationConstant; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.exception.ServiceException; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; -import java.time.LocalDateTime; -import java.util.Date; - -@Api(tags = "2023中秋活动",value = "2023中秋活动") -@RequestMapping("/act/2023MidAutumn/rank") -@RestController -public class MidAutumnRankController { - - @Autowired - private MidAutumnRankService service; - - @ApiOperation("排行榜") - @ApiImplicitParams({ - @ApiImplicitParam(name = "rankType", value = "排行榜类型（1=送礼日榜，2=送礼总榜，3=收礼日榜，4=收礼总榜）", required = true), - @ApiImplicitParam(name = "date", value = "日榜日期，总榜可不传", required = false) - }) - @GetMapping("/getRank") - @Authorization - public BusiResult getRank(HttpServletRequest request, RankTypeEnum rankType, String date){ - String uidStr = request.getHeader(ApplicationConstant.PublicParameters.PUB_UID); - Long uid = Long.parseLong(uidStr); - ActivityRankVo rankVo = service.getRank(uid, rankType, date); - return new BusiResult<>(rankVo); - } - - @ApiOperation("结算") - @ApiImplicitParams({ - @ApiImplicitParam(name = "date", value = "结算日期", required = true) - }) - @PostMapping("/settlement") - public BusiResult settlement(String date, Boolean needFlag){ - if (!StringUtils.hasText(date)){ - throw new ServiceException(BusiStatus.PARAMERROR); - } - Date time = DateTimeUtil.convertStrToDate(date, DateTimeUtil.DEFAULT_DATE_PATTERN); - LocalDateTime dateTime = DateTimeUtil.converDateToLocalDateTime(time); - if (null == needFlag){ - needFlag = true; - } - service.settlement(dateTime, needFlag); - return new BusiResult<>(BusiStatus.SUCCESS); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/midautumn/MidAutumnTaskController.java b/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/midautumn/MidAutumnTaskController.java deleted file mode 100644 index b019d4286..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/midautumn/MidAutumnTaskController.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.accompany.business.midautumn; - -import com.accompany.business.midautumn.service.MidAutumnTaskRecordService; -import com.accompany.business.midautumn.service.MidAutumnTaskService; -import com.accompany.business.midautumn.vo.MidAutumnTaskConfigVo; -import com.accompany.common.annotation.Authorization; -import com.accompany.common.constant.ApplicationConstant; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; - -@Api(tags = "2023中秋活动",value = "2023中秋活动") -@RequestMapping("/act/2023MidAutumn/task") -@RestController -public class MidAutumnTaskController { - - @Autowired - private MidAutumnTaskService service; - @Autowired - private MidAutumnTaskRecordService recordService; - - @ApiOperation("任务首页") - @Authorization - @GetMapping("/getConfig") - public BusiResult getConfigVo(HttpServletRequest request){ - String uidStr = request.getHeader(ApplicationConstant.PublicParameters.PUB_UID); - Long uid = Long.parseLong(uidStr); - MidAutumnTaskConfigVo configVo = service.getConfigVo(uid); - return new BusiResult<>(configVo); - } - - @ApiOperation("导出") - @GetMapping("/write2Db") - public BusiResult write2Db(){ - recordService.writeDb(); - return new BusiResult<>(BusiStatus.SUCCESS); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/qixi/QixiRankController.java b/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/qixi/QixiRankController.java deleted file mode 100644 index 9c54801c3..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/qixi/QixiRankController.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.accompany.business.qixi; - -import com.accompany.business.common.vo.ActivityRankVo; -import com.accompany.business.qixi.service.QixiRankService; -import com.accompany.business.qixi.vo.QixiRankHourCpVo; -import com.accompany.common.annotation.Authorization; -import com.accompany.common.constant.ApplicationConstant; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.exception.ServiceException; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Profile; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; -import java.time.LocalDateTime; -import java.util.Date; - -@Api(tags = "2023七夕活动",value = "2023七夕活动") -@RequestMapping("/act/2023Qixi/rank") -@RestController -public class QixiRankController { - - @Autowired - private QixiRankService service; - - @ApiOperation("cp小时排行榜") - @GetMapping("/getCpRank") - public BusiResult getRank(){ - QixiRankHourCpVo rankVo = service.getHourCpRank(); - return new BusiResult<>(rankVo); - } - - @ApiOperation("排行榜") - @ApiImplicitParams({ - @ApiImplicitParam(name = "rankType", value = "排行榜类型（1=甜蜜日榜，2=甜蜜总榜，3=爱意日榜，4=爱意总榜）", required = true), - @ApiImplicitParam(name = "date", value = "日榜日期，总榜可不传", required = false) - }) - @GetMapping("/getRank") - @Authorization - public BusiResult getRank(HttpServletRequest request, Byte rankType, String date){ - String uidStr = request.getHeader(ApplicationConstant.PublicParameters.PUB_UID); - Long uid = Long.parseLong(uidStr); - ActivityRankVo rankVo = service.getRank(uid, rankType, date); - return new BusiResult<>(rankVo); - } - - @ApiOperation("生成小时榜") - @ApiImplicitParams({ - @ApiImplicitParam(name = "dateTimeStr", value = "生成时间", required = true) - }) - @PostMapping("/buildCpRank") - @Profile({"native","dev"}) - public BusiResult buildCpRank(String dateTimeStr){ - if (!StringUtils.hasText(dateTimeStr)){ - throw new ServiceException(BusiStatus.PARAMERROR); - } - Date time = DateTimeUtil.convertStrToDate(dateTimeStr); - LocalDateTime dateTime = DateTimeUtil.converDateToLocalDateTime(time); - service.buildCpHourRank(dateTime); - return new BusiResult<>(BusiStatus.SUCCESS); - } - - - @ApiOperation("结算") - @ApiImplicitParams({ - @ApiImplicitParam(name = "date", value = "结算日期", required = true) - }) - @PostMapping("/settlement") - @Profile({"native","dev"}) - public BusiResult settlement(String date){ - if (!StringUtils.hasText(date)){ - throw new ServiceException(BusiStatus.PARAMERROR); - } - Date time = DateTimeUtil.convertStrToDate(date, DateTimeUtil.DEFAULT_DATE_PATTERN); - LocalDateTime dateTime = DateTimeUtil.converDateToLocalDateTime(time); - service.settlement(dateTime, Boolean.FALSE); - return new BusiResult<>(BusiStatus.SUCCESS); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/qixi/QixiRedLineController.java b/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/qixi/QixiRedLineController.java deleted file mode 100644 index e9ad690bc..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/qixi/QixiRedLineController.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.accompany.business.qixi; - -import com.accompany.business.common.vo.RewardVo; -import com.accompany.business.qixi.service.QixiRedLineService; -import com.accompany.business.qixi.vo.QixiRedLineConfigVo; -import com.accompany.business.qixi.vo.QixiRedLineUserRecordVo; -import com.accompany.common.annotation.Authorization; -import com.accompany.common.constant.ApplicationConstant; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.ServiceException; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Profile; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -@Api(tags = "2023七夕活动",value = "2023七夕活动") -@RequestMapping("/act/2023Qixi/redLine") -@RestController -public class QixiRedLineController { - - @Autowired - private QixiRedLineService service; - - @ApiOperation("许愿首页") - @Authorization - @GetMapping("/getConfig") - public BusiResult getConfigVo(HttpServletRequest request){ - String uidStr = request.getHeader(ApplicationConstant.PublicParameters.PUB_UID); - Long uid = Long.parseLong(uidStr); - QixiRedLineConfigVo configVo = service.getConfigVo(uid); - return new BusiResult<>(configVo); - } - - @ApiOperation("抽红包") - @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "红包id，可不传", required = true) - }) - @Authorization - @GetMapping("/draw") - public BusiResult draw(HttpServletRequest request, Integer id){ - if (null != id && (id < 1 || id > 5)){ - throw new ServiceException(BusiStatus.PARAMERROR); - } - String uidStr = request.getHeader(ApplicationConstant.PublicParameters.PUB_UID); - Long uid = Long.parseLong(uidStr); - Integer redBagId = service.draw(uid, id); - return new BusiResult<>(redBagId); - } - - @ApiOperation("抽奖测试") - @Authorization - @ApiImplicitParams({ - @ApiImplicitParam(name = "num", value = "个数", required = true), - @ApiImplicitParam(name = "date", value = "日期") - }) - @GetMapping("/batchDraw") - @Profile({"native","dev"}) - public BusiResult> batchDraw(HttpServletRequest request, Integer num, String date){ - if (null == num || !StringUtils.hasText(date)){ - throw new ServiceException(BusiStatus.PARAMERROR); - } - String uidStr = request.getHeader(ApplicationConstant.PublicParameters.PUB_UID); - Long uid = Long.parseLong(uidStr); - List recordVoList = service.batchDraw(uid, num, date); - Map a = recordVoList.stream().collect(Collectors.groupingBy(RewardVo::getDesc, Collectors.counting())); - return new BusiResult<>(a); - } - - @ApiOperation("刷新红包") - @Authorization - @GetMapping("/fresh") - public BusiResult freshRedBag(HttpServletRequest request){ - String uidStr = request.getHeader(ApplicationConstant.PublicParameters.PUB_UID); - Long uid = Long.parseLong(uidStr); - service.freshRedBag(uid); - return new BusiResult<>(BusiStatus.SUCCESS); - } - - @ApiOperation("刷新红包") - @Authorization - @GetMapping("/pageRecord") - public BusiResult> pageRecord(HttpServletRequest request, Integer page, Integer size){ - if (null == page || null == size){ - throw new ServiceException(BusiStatus.PARAMERROR); - } - String uidStr = request.getHeader(ApplicationConstant.PublicParameters.PUB_UID); - Long uid = Long.parseLong(uidStr); - List recordVoList = service.pageRecord(uid, page, size); - return new BusiResult<>(recordVoList); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/qixi/QixiRoomRankController.java b/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/qixi/QixiRoomRankController.java deleted file mode 100644 index 5661c2fe6..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/qixi/QixiRoomRankController.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.accompany.business.qixi; - -import com.accompany.business.common.vo.ActivityRankVo; -import com.accompany.business.qixi.service.QixiRoomRankService; -import com.accompany.common.annotation.Authorization; -import com.accompany.common.constant.ApplicationConstant; -import com.accompany.common.result.BusiResult; -import io.swagger.annotations.Api; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; - -@Api(tags = "2023七夕活动",value = "2023七夕活动") -@RequestMapping("/act/2023Qixi/roomRank") -@RestController -public class QixiRoomRankController { - - @Autowired - private QixiRoomRankService service; - - @GetMapping("/getRank") - @Authorization - public BusiResult getRank(HttpServletRequest request){ - String uidStr = request.getHeader(ApplicationConstant.PublicParameters.PUB_UID); - Long uid = Long.parseLong(uidStr); - ActivityRankVo rankVo = service.getRank(uid); - return new BusiResult<>(rankVo); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/qixi/QixiXiqueController.java b/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/qixi/QixiXiqueController.java deleted file mode 100644 index adee1f5fb..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/qixi/QixiXiqueController.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.accompany.business.qixi; - -import com.accompany.business.qixi.service.QixiXiqueService; -import com.accompany.business.qixi.vo.QixiXiqueConfigVo; -import com.accompany.common.annotation.Authorization; -import com.accompany.common.constant.ApplicationConstant; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.ServiceException; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; - -@Api(tags = "2023七夕活动",value = "2023七夕活动") -@RequestMapping("/act/2023Qixi/xique") -@RestController -public class QixiXiqueController { - - @Autowired - private QixiXiqueService service; - - @ApiOperation("喜鹊首页") - @Authorization - @GetMapping("/getConfig") - public BusiResult getConfigVo(HttpServletRequest request){ - String uidStr = request.getHeader(ApplicationConstant.PublicParameters.PUB_UID); - Long uid = Long.parseLong(uidStr); - QixiXiqueConfigVo configVo = service.getConfigVo(uid); - return new BusiResult<>(configVo); - } - - @ApiOperation("投入喜鹊") - @ApiImplicitParams({ - @ApiImplicitParam(name = "num", value = "投入喜鹊的数量", required = true) - }) - @Authorization - @GetMapping("/devotedXique") - public BusiResult devotedXique(HttpServletRequest request, Integer num){ - if (1 != num && 10 != num){ - throw new ServiceException(BusiStatus.PARAMERROR); - } - String uidStr = request.getHeader(ApplicationConstant.PublicParameters.PUB_UID); - Long uid = Long.parseLong(uidStr); - service.devotedXique(uid, num); - return new BusiResult<>(BusiStatus.SUCCESS); - } - - @ApiOperation("领取全服喜鹊奖励") - @Authorization - @GetMapping("/getXiqueReward") - public BusiResult getXiqueReward(HttpServletRequest request){ - String uidStr = request.getHeader(ApplicationConstant.PublicParameters.PUB_UID); - Long uid = Long.parseLong(uidStr); - service.getXiqueReward(uid); - return new BusiResult<>(BusiStatus.SUCCESS); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/signin/ActSignInController.java b/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/signin/ActSignInController.java deleted file mode 100644 index d22be91d2..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/signin/ActSignInController.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.accompany.business.signin; - -import com.accompany.business.activity.vo.ActivityReward; -import com.accompany.business.signin.service.ActSignInService; -import com.accompany.common.result.BusiResult; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - * @author: liaozetao - * @date: 2024/4/25 10:24 - * @description: - */ -@Api(tags = "2024签到活动", value = "2024签到活动") -@RequestMapping("/act/signin") -@RestController -public class ActSignInController { - - @Autowired - private ActSignInService actSignInService; - - - @ApiOperation("一键签到") - @GetMapping("/click") - public BusiResult> click(@RequestParam("activityCode") String activityCode) { - return BusiResult.success(actSignInService.click(activityCode)); - } -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/snooker/SnookerActRankController.java b/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/snooker/SnookerActRankController.java deleted file mode 100644 index 2d35ce3b8..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/snooker/SnookerActRankController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.accompany.business.snooker; - -import com.accompany.business.common.constant.RankRoundEnum; -import com.accompany.business.common.vo.RoundActivityRankVo; -import com.accompany.business.snooker.service.SnookerRankService; -import com.accompany.common.annotation.Authorization; -import com.accompany.common.constant.ApplicationConstant; -import com.accompany.common.result.BusiResult; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; - -@Api(tags = "2024桌球争霸赛活动",value = "2024桌球争霸赛活动") -@RequestMapping("/act/2024Snooker/room") -@RestController -public class SnookerActRankController { - - @Autowired - private SnookerRankService service; - - @ApiOperation("排行榜") - @ApiImplicitParams({ - @ApiImplicitParam(name = "round", value = "轮次，可传null") - }) - @GetMapping("/getRank") - @Authorization - public BusiResult getRank(HttpServletRequest request, RankRoundEnum round){ - String uidStr = request.getHeader(ApplicationConstant.PublicParameters.PUB_UID); - Long uid = Long.parseLong(uidStr); - RoundActivityRankVo rankVo = service.getRank(uid, round, 20); - return new BusiResult<>(rankVo); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/special/SpecialGiftRankController.java b/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/special/SpecialGiftRankController.java deleted file mode 100644 index 7f4a8bb2e..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/special/SpecialGiftRankController.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.accompany.business.special; - -import com.accompany.business.common.constant.RankTypeEnum; -import com.accompany.business.common.vo.ActivityRankVo; -import com.accompany.business.special.service.SpecialGiftRankService; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.base.UidContextHolder; -import com.accompany.core.exception.ServiceException; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.time.LocalDateTime; -import java.util.Date; - -/** - * @author: liaozetao - * @date: 2024/2/1 15:51 - * @description: - */ -@Api(tags = "特殊礼物榜单", value = "特殊礼物榜单") -@RequestMapping("/act/special/gift") -@RestController -public class SpecialGiftRankController { - - @Autowired - private SpecialGiftRankService service; - - - /** - * 排行榜 - * @param rankType - * @param date - * @param pageSize - * @return - */ - @ApiOperation("排行榜") - @ApiImplicitParams({ - @ApiImplicitParam(name = "rankType", value = "排行榜类型（1=送礼日榜，2=送礼总榜，3=收礼日榜，4=收礼总榜）", required = true), - @ApiImplicitParam(name = "date", value = "日榜日期，总榜可不传"), - @ApiImplicitParam(name = "pageSize", value = "数量"), - }) - @GetMapping("/getRank") - public BusiResult rank(RankTypeEnum rankType, String date, Integer pageSize) { - return BusiResult.success(service.getRank(UidContextHolder.get(), rankType, date, pageSize)); - } - - @ApiOperation("结算") - @ApiImplicitParams({ - @ApiImplicitParam(name = "date", value = "结算日期", required = true) - }) - @PostMapping("/settlement") - public BusiResult settlement(String date, Boolean needFlag){ - if (!StringUtils.hasText(date)){ - throw new ServiceException(BusiStatus.PARAMERROR); - } - Date time = DateTimeUtil.convertStrToDate(date, DateTimeUtil.DEFAULT_DATE_PATTERN); - LocalDateTime dateTime = DateTimeUtil.converDateToLocalDateTime(time); - if (null == needFlag){ - needFlag = true; - } - service.settlement(dateTime, needFlag); - return new BusiResult<>(BusiStatus.SUCCESS); - } - -} diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/valentines/ValentinesCpRankController.java b/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/valentines/ValentinesCpRankController.java deleted file mode 100644 index 374b3a9ca..000000000 --- a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/valentines/ValentinesCpRankController.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.accompany.business.valentines; - -import com.accompany.business.valentine.service.ValentinesCpRankService; -import com.accompany.business.valentine.vo.ValentinesCpRankVo; -import com.accompany.common.annotation.Authorization; -import com.accompany.common.constant.ApplicationConstant; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.exception.ServiceException; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; -import java.time.LocalDateTime; -import java.util.Date; - -@Api(tags = "2024情人节活动", value = "2024情人节活动") -@RequestMapping("/act/2024Valentines/cpRank") -@RestController -public class ValentinesCpRankController { - - @Autowired - private ValentinesCpRankService service; - - @ApiOperation("cp排行榜") - @GetMapping("/getRank") - @Authorization - public BusiResult getRank(HttpServletRequest request) { - String uidStr = request.getHeader(ApplicationConstant.PublicParameters.PUB_UID); - Long uid = Long.parseLong(uidStr); - ValentinesCpRankVo rankVo = service.getRank(uid); - return new BusiResult<>(rankVo); - } - - @ApiOperation("结算") - @ApiImplicitParams({ - @ApiImplicitParam(name = "date", value = "结算日期", required = true) - }) - @PostMapping("/settlement") - public BusiResult settlement(String date, Boolean needFlag) { - if (!StringUtils.hasText(date)) { - throw new ServiceException(BusiStatus.PARAMERROR); - } - Date time = DateTimeUtil.convertStrToDate(date, DateTimeUtil.DEFAULT_DATE_PATTERN); - LocalDateTime dateTime = DateTimeUtil.converDateToLocalDateTime(time); - if (null == needFlag) { - needFlag = true; - } - service.settlement(dateTime, needFlag); - return new BusiResult<>(BusiStatus.SUCCESS); - } - -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/activities/ActivitesPackTypeEnum.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/activities/ActivitesPackTypeEnum.java index 12e84e5a9..f471f1b50 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/activities/ActivitesPackTypeEnum.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/activities/ActivitesPackTypeEnum.java @@ -13,9 +13,9 @@ public enum ActivitesPackTypeEnum { currency(0, true, "通用礼包"), park(1, true, "许愿池礼包"), weekStar(2, false, "周星榜礼包"), - LUCKY_SEA(3, true, "深海奇缘活动礼包"), + //LUCKY_SEA(3, true, "深海奇缘活动礼包"), LINEARLY_POOL(5, true, "拔萝卜"), - CALL_BATTLE(6, true, "守护星球"), + //CALL_BATTLE(6, true, "守护星球"), WISH_STAR_CUP(7, true, "许愿星杯礼包"), SHIP_ANTICS(10, true, "航海冒险"), LINEARLIY_PRIZE_POOL_COIN(11, false, "航海冒险元宝货币"), diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/withdraw/WithdrawAccountTypeConstant.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/withdraw/WithdrawAccountTypeConstant.java deleted file mode 100644 index 386d75cab..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/withdraw/WithdrawAccountTypeConstant.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.accompany.business.constant.withdraw; - -/** - * @author: liaozetao - * @date: 2023/7/7 15:38 - * @description: - */ -public interface WithdrawAccountTypeConstant { - - int ORDER_ACCOUNT = 0b1; - - int CHINA_UNION_PAY = 0b10; - - int MAY_BANK = 0b100; - - int BANK_OF_SINGAPORE = 0b1000; - - int TAI_WAN_BANK = 0b10000; - -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/withdraw/WithdrawUserLimitConstant.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/withdraw/WithdrawUserLimitConstant.java deleted file mode 100644 index e7aa32ef7..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/withdraw/WithdrawUserLimitConstant.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.accompany.business.constant.withdraw; - -/** - * @author: liaozetao - * @date: 2023/7/10 18:19 - * @description: - */ -public interface WithdrawUserLimitConstant { - - int LIMIT_TYPE_OF_CASH = 0b1; - - int LIMIT_TYPE_OF_DIAMOND = 0b10; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/activity/callbattle/ActCallBattleConfig.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/activity/callbattle/ActCallBattleConfig.java deleted file mode 100644 index 082ce410a..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/activity/callbattle/ActCallBattleConfig.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * 文 件 名: LuckySeaActConfig - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/5 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.dto.activity.callbattle; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *
类描述: 召唤战斗活动配置 - *
功能详细描述: - * - * @author H1 - * @date [2021/1/5] - */ -@Data -@ApiModel -public class ActCallBattleConfig { - /** - * 选择阶段设置时长 - */ - @ApiModelProperty("选择阶段设置时长") - private Integer chooseStageTime; - /** - * 等待出奖阶段设置时长 - */ - @ApiModelProperty("等待出奖阶段设置时长") - private Integer WaitingDrawStageTime; - /** - * 确认出奖结果阶段设置时长 - */ - @ApiModelProperty("确认出奖结果阶段设置时长") - private Integer DrawOverStageTime; - - @ApiModelProperty("玩法模式") - private Integer modeType; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/activity/callbattle/ActCallBattleRoomTipConfig.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/activity/callbattle/ActCallBattleRoomTipConfig.java deleted file mode 100644 index 7594d9837..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/activity/callbattle/ActCallBattleRoomTipConfig.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.accompany.business.dto.activity.callbattle; - -import lombok.Data; - -@Data -public class ActCallBattleRoomTipConfig { - - private Long singleRoomGoldNum; - private Long allRoomGoldNum; - - public boolean isClose() { - return null == singleRoomGoldNum || null == allRoomGoldNum; - } - - public boolean needTip(long goldNum) { - return needAllRoomTip(goldNum) || needSingleRoomTip(goldNum); - } - - public boolean needSingleRoomTip(long goldNum) { - return null != singleRoomGoldNum && goldNum >= singleRoomGoldNum; - } - - public boolean needAllRoomTip(long goldNum) { - return null != allRoomGoldNum && goldNum >= allRoomGoldNum; - } - -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/activity/luckysea/LuckySeaActUserRoundStatDTO.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/activity/luckysea/LuckySeaActUserRoundStatDTO.java deleted file mode 100644 index 951a86582..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/activity/luckysea/LuckySeaActUserRoundStatDTO.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * 文 件 名: LuckySeaActUserRoundStatDTO - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/14 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.dto.activity.luckysea; - -import lombok.Data; - -/** - *
类描述: 用户单轮碎片投入情况统计dto - *
功能详细描述: - * - * @author H1 - * @date [2021/1/14] - */ -@Data -public class LuckySeaActUserRoundStatDTO { - private Long uid; - private Long costPieceNum; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/activity/luckysea/LuckySeaTicketConfigDto.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/activity/luckysea/LuckySeaTicketConfigDto.java deleted file mode 100644 index e6aed5581..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/activity/luckysea/LuckySeaTicketConfigDto.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.accompany.business.dto.activity.luckysea; - -import lombok.Data; - -import java.math.BigDecimal; - -@Data -public class LuckySeaTicketConfigDto { - private BigDecimal dayTicketMax; - private BigDecimal stockBenchmark; //库存基准点 - private BigDecimal smallTicketRate; - private BigDecimal bigTicketRate; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/activity/luckysea/LuckySeaUserDrawResultDto.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/activity/luckysea/LuckySeaUserDrawResultDto.java deleted file mode 100644 index 939b83d23..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/activity/luckysea/LuckySeaUserDrawResultDto.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 文 件 名: LuckySeaUserDrawResultDto - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/5 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.dto.activity.luckysea; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *
类描述: - *
功能详细描述: - * - * @author H1 - * @date [2021/1/5] - */ -@Data -@ApiModel -public class LuckySeaUserDrawResultDto { - @ApiModelProperty("配置id") - private Long itemId; - @ApiModelProperty("投入碎片数") - private Long costNum; - @ApiModelProperty("倍数") - private Integer multiple; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/callbattle/ActCallBattleBroadCastDTO.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/callbattle/ActCallBattleBroadCastDTO.java deleted file mode 100644 index 456126eac..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/callbattle/ActCallBattleBroadCastDTO.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 文 件 名: LuckySeaBroadDTO - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/9/23 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.dto.callbattle; - -import lombok.Data; - -/** - *
类描述: - *
功能详细描述: - * - * @author H1 - * @date [2021/9/23] - */ -@Data -public class ActCallBattleBroadCastDTO { - private Integer goldIn; - private Integer goldOut; - private Integer roundNum; - private Integer peopleNum; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/callbattle/ActCallBattleGoldPreWarningDTO.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/callbattle/ActCallBattleGoldPreWarningDTO.java deleted file mode 100644 index 3f3701295..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/callbattle/ActCallBattleGoldPreWarningDTO.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * 文 件 名: LuckySeaGoldPreWarningDTO - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/9/22 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.dto.callbattle; - -import lombok.Data; - -/** - *
类描述: - *
功能详细描述: - * - * @author H1 - * @date [2021/9/22] - */ -@Data -public class ActCallBattleGoldPreWarningDTO { - private Integer goldIn; - private Integer goldOut; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/callbattle/ActCallBattlePreWarningConfig.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/callbattle/ActCallBattlePreWarningConfig.java deleted file mode 100644 index 23bb76d51..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/callbattle/ActCallBattlePreWarningConfig.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * 文 件 名: LuckySeaPreWarningConfig - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/9/22 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.dto.callbattle; - -import lombok.Data; - -import java.util.List; - -/** - *
类描述: 召唤战斗类活动预警配置 - *
功能详细描述: - * - * @author H1 - * @date [2021/9/22] - */ -@Data -public class ActCallBattlePreWarningConfig { - /** - * 应用名称 - */ - private String appName; - /** - * 活动名称 - */ - private String actName; - /** - * 金币预警 - */ - private GoldPreWarning goldPreWarning; - /** - * 定时轮播 - */ - private Broadcast broadcast; - - /** - * 金币预警 - */ - @Data - public static class GoldPreWarning { - /** - * 开关 - */ - private Boolean open; - /** - * 监测列表 - */ - private List itemList; - } - - /** - * 监测内容 - */ - @Data - public static class GoldPreWarningItem { - /** - * 监测轮数 - */ - private Integer roundNum; - /** - * 预警比例 = out/in - */ - private Double warnRate; - } - - /** - * 定时轮播 - */ - @Data - public static class Broadcast { - /** - * 开关 - */ - private Boolean open; - /** - * 广播开启时间段 - */ - private String openTime; - } -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/callbattle/ActCallBattleTicketConfig.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/callbattle/ActCallBattleTicketConfig.java deleted file mode 100644 index 59963ec35..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/callbattle/ActCallBattleTicketConfig.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.accompany.business.dto.callbattle; - -import lombok.Data; - -import java.math.BigDecimal; - -@Data -public class ActCallBattleTicketConfig { - private BigDecimal dayTicketMax; - private BigDecimal stockBenchmark; //库存基准点 - private BigDecimal smallTicketRate; - private BigDecimal bigTicketRate; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/callbattle/ActCallBattleUserDrawResultDto.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/callbattle/ActCallBattleUserDrawResultDto.java deleted file mode 100644 index 4de3cb2a9..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/callbattle/ActCallBattleUserDrawResultDto.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 文 件 名: LuckySeaUserDrawResultDto - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/5 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.dto.callbattle; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *
类描述: - *
功能详细描述: - * - * @author H1 - * @date [2021/1/5] - */ -@Data -@ApiModel -public class ActCallBattleUserDrawResultDto { - @ApiModelProperty("配置id") - private Long itemId; - @ApiModelProperty("投入碎片数") - private Long costNum; - @ApiModelProperty("倍数") - private Integer multiple; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/callbattle/ActCallBattleUserRoundStatDTO.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/callbattle/ActCallBattleUserRoundStatDTO.java deleted file mode 100644 index d60ad55de..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/callbattle/ActCallBattleUserRoundStatDTO.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * 文 件 名: LuckySeaActUserRoundStatDTO - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/14 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.dto.callbattle; - -import lombok.Data; - -/** - *
类描述: 用户单轮碎片投入情况统计dto - *
功能详细描述: - * - * @author H1 - * @date [2021/1/14] - */ -@Data -public class ActCallBattleUserRoundStatDTO { - private Long uid; - private Long costPieceNum; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/certification/CertifyInfo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/certification/CertifyInfo.java deleted file mode 100644 index 1665c281a..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/certification/CertifyInfo.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.accompany.business.dto.certification; - -import lombok.AllArgsConstructor; -import lombok.Data; - -import java.io.Serializable; - -@Data -@AllArgsConstructor -public class CertifyInfo implements Serializable { - - /** - * 认证URL - */ - private String certifyUrl; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/certification/FinancialResult.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/certification/FinancialResult.java deleted file mode 100644 index 7431e411b..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/certification/FinancialResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.accompany.business.dto.certification; - -import lombok.Data; - -@Data -public class FinancialResult { - - /** - * @Desc 是否为攻击：攻击为T，非攻击为F。 - */ - private String faceAttack; - - /** - * @Desc 是否有脸部遮挡：有脸部遮挡为T，否则为F。 - */ - private String faceOcclusion; - - /** - * @Desc 认证的照片信息 - */ - private FacialPictureFront facialPictureFront; -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/exchange/WithdrawConfigDto.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/exchange/WithdrawConfigDto.java deleted file mode 100644 index ceb014581..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/exchange/WithdrawConfigDto.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.accompany.business.dto.exchange; - -import cn.hutool.core.util.StrUtil; -import com.accompany.business.model.withdraw.WithdrawAccountDtl; -import com.alibaba.fastjson.JSONArray; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Collections; -import java.util.List; - -@Data -@ApiModel -public class WithdrawConfigDto { - - private Double fee; - - private Double min; - - private Double max; - - private Integer times;//周提现次数 - - private String cron; - - private String timeTips; - - /** - * 主键 - */ - @ApiModelProperty("主键") - private Long id; - - /** - * 最小提现金币 - */ - @ApiModelProperty("最小提现金币") - private Long minValue; - - /** - * 周提现上限 - */ - @ApiModelProperty("周提现上限") - private Long weekMaxValue; - - /** - * 周提现次数 - */ - @ApiModelProperty("周提现次数") - private Integer weekLimitCount; - - /** - * 提现手续费率 - */ - @ApiModelProperty("提现手续费率") - private BigDecimal chargeRate; - - /** - * 账户 - */ - @ApiModelProperty("账户") - private String accounts; - - - public List getAccounts() { - if (StrUtil.isNotEmpty(accounts)) { - return JSONArray.parseArray(accounts, WithdrawAccountDtl.class); - } - return Collections.emptyList(); - } -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/gamepartner/GameOrderAmountDto.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/gamepartner/GameOrderAmountDto.java deleted file mode 100644 index 3a5466079..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/gamepartner/GameOrderAmountDto.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.accompany.business.dto.gamepartner; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.math.BigDecimal; - -/** - * @author: liaozetao - * @date: 2023/8/23 16:16 - * @description: - */ -@Data -public class GameOrderAmountDto { - - /** - * 家族ID - */ - @ApiModelProperty("家族ID") - private Long clanId; - - /** - * 公会ID - */ - @ApiModelProperty("公会ID") - private Long hallId; - - /** - * 用户UID - */ - @ApiModelProperty("用户UID") - private Long uid; - - /** - * 金额 - */ - @ApiModelProperty("金额") - private BigDecimal amount; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/luckysea/LuckySeaActConfig.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/luckysea/LuckySeaActConfig.java deleted file mode 100644 index 5a77e56d3..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/luckysea/LuckySeaActConfig.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * 文 件 名: LuckySeaActConfig - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/5 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.dto.luckysea; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *
类描述: 深海奇缘活动配置 - *
功能详细描述: - * - * @author H1 - * @date [2021/1/5] - */ -@Data -@ApiModel -public class LuckySeaActConfig { - /** - * 选择阶段设置时长 - */ - @ApiModelProperty("选择阶段设置时长") - private Integer chooseStageTime; - /** - * 等待出奖阶段设置时长 - */ - @ApiModelProperty("等待出奖阶段设置时长") - private Integer WaitingDrawStageTime; - /** - * 确认出奖结果阶段设置时长 - */ - @ApiModelProperty("确认出奖结果阶段设置时长") - private Integer DrawOverStageTime; - - @ApiModelProperty("玩法模式") - private Integer modelType; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/luckysea/LuckySeaBroadCastDTO.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/luckysea/LuckySeaBroadCastDTO.java deleted file mode 100644 index 2d94dcc45..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/luckysea/LuckySeaBroadCastDTO.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 文 件 名: LuckySeaBroadDTO - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/9/23 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.dto.luckysea; - -import lombok.Data; - -/** - *
类描述: - *
功能详细描述: - * - * @author H1 - * @date [2021/9/23] - */ -@Data -public class LuckySeaBroadCastDTO { - private Integer goldIn; - private Integer goldOut; - private Integer roundNum; - private Integer peopleNum; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/luckysea/LuckySeaGoldPreWarningDTO.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/luckysea/LuckySeaGoldPreWarningDTO.java deleted file mode 100644 index 24d056021..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/luckysea/LuckySeaGoldPreWarningDTO.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * 文 件 名: LuckySeaGoldPreWarningDTO - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/9/22 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.dto.luckysea; - -import lombok.Data; - -/** - *
类描述: - *
功能详细描述: - * - * @author H1 - * @date [2021/9/22] - */ -@Data -public class LuckySeaGoldPreWarningDTO { - private Integer goldIn; - private Integer goldOut; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/luckysea/LuckySeaPreWarningConfig.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/luckysea/LuckySeaPreWarningConfig.java deleted file mode 100644 index 555a54c39..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/luckysea/LuckySeaPreWarningConfig.java +++ /dev/null @@ -1,106 +0,0 @@ -/* - * 文 件 名: LuckySeaPreWarningConfig - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/9/22 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.dto.luckysea; - -import lombok.Data; - -import java.util.List; - -/** - *
类描述: 深海奇缘类活动预警配置 - *
功能详细描述: - * - * @author H1 - * @date [2021/9/22] - */ -@Data -public class LuckySeaPreWarningConfig { - /** - * 应用名称 - */ - private String appName; - /** - * 活动名称 - */ - private String actName; - /** - * 定时轮播 - */ - private Broadcast broadcast; - /** - * 金币预警 - */ - private InputOutputPreWarning inputOutputPreWarning; - /** - * 金币预警 - */ - private GoldPreWarning goldPreWarning; - - /** - * 定时轮播 - */ - @Data - public static class Broadcast { - /** - * 开关 - */ - private Boolean open; - /** - * 广播开启时间段 - */ - private String openTime; - } - - /** - * 金币预警 - */ - @Data - public static class InputOutputPreWarning { - /** - * 开关 - */ - private Boolean open; - - private Long input; - private Long output; - } - - /** - * 金币预警 - */ - @Data - public static class GoldPreWarning { - /** - * 开关 - */ - private Boolean open; - /** - * 监测列表 - */ - private List itemList; - } - - /** - * 监测内容 - */ - @Data - public static class GoldPreWarningItem { - /** - * 监测轮数 - */ - private Integer roundNum; - /** - * 预警比例 = out/in - */ - private Double warnRate; - private Long warnStock; - } -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/withdraw/WithdrawAmountHolder.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/withdraw/WithdrawAmountHolder.java deleted file mode 100644 index 91761e34b..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/withdraw/WithdrawAmountHolder.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.accompany.business.dto.withdraw; - -import lombok.Data; - -import java.math.BigDecimal; - -@Data -public class WithdrawAmountHolder { - - /** - * 账户名称 - */ - String accountName; - - /** - * 汇率 - */ - BigDecimal exchangeRate = BigDecimal.ZERO; - - /** - * 提现手续费 - */ - BigDecimal handlingRate = BigDecimal.ZERO; - - /** - * 扣除手续费后的金币 - */ - BigDecimal afterGoldNum = BigDecimal.ZERO; - - /** - * 美元 - */ - BigDecimal cashAmount = BigDecimal.ZERO; - - /** - * 币种类型 - */ - String currency; - - /** - * 本地化金额 - */ - BigDecimal currencyAmount = BigDecimal.ZERO; - -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/enums/certification/CertTypeEnum.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/enums/certification/CertTypeEnum.java deleted file mode 100644 index 3a9848a8b..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/enums/certification/CertTypeEnum.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.accompany.business.enums.certification; - -/** - * @author: liaozetao - * @date: 2024/1/10 18:51 - * @description: - */ -public enum CertTypeEnum { - - WITHDRAW; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/enums/withdraw/RecordStatusEnum.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/enums/withdraw/RecordStatusEnum.java deleted file mode 100644 index a15a32c2d..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/enums/withdraw/RecordStatusEnum.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.accompany.business.enums.withdraw; - -/** - * @author: liaozetao - * @date: 2023/7/10 17:17 - * @description: - */ -public enum RecordStatusEnum { - - WAIT, - - PASS, - - REJECT; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/event/LuckySeaDrawMessageEvent.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/event/LuckySeaDrawMessageEvent.java deleted file mode 100644 index 44721fdce..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/event/LuckySeaDrawMessageEvent.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.accompany.business.event; - -import org.springframework.context.ApplicationEvent; - -public class LuckySeaDrawMessageEvent extends ApplicationEvent { - - public LuckySeaDrawMessageEvent(Object source) { - super(source); - } -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/event/gamepartner/GamePartnerFinishEvent.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/event/gamepartner/GamePartnerFinishEvent.java deleted file mode 100644 index d68cc7300..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/event/gamepartner/GamePartnerFinishEvent.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.accompany.business.event.gamepartner; - -import org.springframework.context.ApplicationEvent; - -/** - * @author: liaozetao - * @date: 2023/8/22 14:33 - * @description: - */ -public class GamePartnerFinishEvent extends ApplicationEvent { - - public GamePartnerFinishEvent(Object source) { - super(source); - } -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/event/gamepartner/GamePartnerInviteEvent.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/event/gamepartner/GamePartnerInviteEvent.java deleted file mode 100644 index 52b48a072..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/event/gamepartner/GamePartnerInviteEvent.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.accompany.business.event.gamepartner; - -import org.springframework.context.ApplicationEvent; - -/** - * @author: liaozetao - * @date: 2023/8/23 11:01 - * @description: - */ -public class GamePartnerInviteEvent extends ApplicationEvent { - - public GamePartnerInviteEvent(Object source) { - super(source); - } -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/message/LuckySeaDrawMessage.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/message/LuckySeaDrawMessage.java deleted file mode 100644 index 994d94df0..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/message/LuckySeaDrawMessage.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.accompany.business.message; - -import lombok.AllArgsConstructor; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - * 福袋消息 - */ -@AllArgsConstructor -@Data -public class LuckySeaDrawMessage implements Serializable { - - private Long uid; // 赠送人uid - private Long roomUid; // 房主uid - private String roundId; - private Long itemId; - private Long num; - private Date createTime; // 创建时间 - -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/ActivityConfig.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/ActivityConfig.java deleted file mode 100644 index ebcdaa1a1..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/ActivityConfig.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.accompany.business.model; - -public class ActivityConfig { - private String akey; - - private String aval; - - private String description; - - private Byte status; - - public String getAkey() { - return akey; - } - - public void setAkey(String akey) { - this.akey = akey == null ? null : akey.trim(); - } - - public String getAval() { - return aval; - } - - public void setAval(String aval) { - this.aval = aval == null ? null : aval.trim(); - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description == null ? null : description.trim(); - } - - public Byte getStatus() { - return status; - } - - public void setStatus(Byte status) { - this.status = status; - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/ActivityConfigExample.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/ActivityConfigExample.java deleted file mode 100644 index 412eea78c..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/ActivityConfigExample.java +++ /dev/null @@ -1,490 +0,0 @@ -package com.accompany.business.model; - -import java.util.ArrayList; -import java.util.List; - -public class ActivityConfigExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - private Integer limit; - - private Integer offset; - - public ActivityConfigExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - public void setLimit(Integer limit) { - this.limit = limit; - } - - public Integer getLimit() { - return limit; - } - - public void setOffset(Integer offset) { - this.offset = offset; - } - - public Integer getOffset() { - return offset; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andAkeyIsNull() { - addCriterion("akey is null"); - return (Criteria) this; - } - - public Criteria andAkeyIsNotNull() { - addCriterion("akey is not null"); - return (Criteria) this; - } - - public Criteria andAkeyEqualTo(String value) { - addCriterion("akey =", value, "akey"); - return (Criteria) this; - } - - public Criteria andAkeyNotEqualTo(String value) { - addCriterion("akey <>", value, "akey"); - return (Criteria) this; - } - - public Criteria andAkeyGreaterThan(String value) { - addCriterion("akey >", value, "akey"); - return (Criteria) this; - } - - public Criteria andAkeyGreaterThanOrEqualTo(String value) { - addCriterion("akey >=", value, "akey"); - return (Criteria) this; - } - - public Criteria andAkeyLessThan(String value) { - addCriterion("akey <", value, "akey"); - return (Criteria) this; - } - - public Criteria andAkeyLessThanOrEqualTo(String value) { - addCriterion("akey <=", value, "akey"); - return (Criteria) this; - } - - public Criteria andAkeyLike(String value) { - addCriterion("akey like", value, "akey"); - return (Criteria) this; - } - - public Criteria andAkeyNotLike(String value) { - addCriterion("akey not like", value, "akey"); - return (Criteria) this; - } - - public Criteria andAkeyIn(List values) { - addCriterion("akey in", values, "akey"); - return (Criteria) this; - } - - public Criteria andAkeyNotIn(List values) { - addCriterion("akey not in", values, "akey"); - return (Criteria) this; - } - - public Criteria andAkeyBetween(String value1, String value2) { - addCriterion("akey between", value1, value2, "akey"); - return (Criteria) this; - } - - public Criteria andAkeyNotBetween(String value1, String value2) { - addCriterion("akey not between", value1, value2, "akey"); - return (Criteria) this; - } - - public Criteria andAvalIsNull() { - addCriterion("aval is null"); - return (Criteria) this; - } - - public Criteria andAvalIsNotNull() { - addCriterion("aval is not null"); - return (Criteria) this; - } - - public Criteria andAvalEqualTo(String value) { - addCriterion("aval =", value, "aval"); - return (Criteria) this; - } - - public Criteria andAvalNotEqualTo(String value) { - addCriterion("aval <>", value, "aval"); - return (Criteria) this; - } - - public Criteria andAvalGreaterThan(String value) { - addCriterion("aval >", value, "aval"); - return (Criteria) this; - } - - public Criteria andAvalGreaterThanOrEqualTo(String value) { - addCriterion("aval >=", value, "aval"); - return (Criteria) this; - } - - public Criteria andAvalLessThan(String value) { - addCriterion("aval <", value, "aval"); - return (Criteria) this; - } - - public Criteria andAvalLessThanOrEqualTo(String value) { - addCriterion("aval <=", value, "aval"); - return (Criteria) this; - } - - public Criteria andAvalLike(String value) { - addCriterion("aval like", value, "aval"); - return (Criteria) this; - } - - public Criteria andAvalNotLike(String value) { - addCriterion("aval not like", value, "aval"); - return (Criteria) this; - } - - public Criteria andAvalIn(List values) { - addCriterion("aval in", values, "aval"); - return (Criteria) this; - } - - public Criteria andAvalNotIn(List values) { - addCriterion("aval not in", values, "aval"); - return (Criteria) this; - } - - public Criteria andAvalBetween(String value1, String value2) { - addCriterion("aval between", value1, value2, "aval"); - return (Criteria) this; - } - - public Criteria andAvalNotBetween(String value1, String value2) { - addCriterion("aval not between", value1, value2, "aval"); - return (Criteria) this; - } - - public Criteria andDescriptionIsNull() { - addCriterion("description is null"); - return (Criteria) this; - } - - public Criteria andDescriptionIsNotNull() { - addCriterion("description is not null"); - return (Criteria) this; - } - - public Criteria andDescriptionEqualTo(String value) { - addCriterion("description =", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionNotEqualTo(String value) { - addCriterion("description <>", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionGreaterThan(String value) { - addCriterion("description >", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionGreaterThanOrEqualTo(String value) { - addCriterion("description >=", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionLessThan(String value) { - addCriterion("description <", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionLessThanOrEqualTo(String value) { - addCriterion("description <=", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionLike(String value) { - addCriterion("description like", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionNotLike(String value) { - addCriterion("description not like", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionIn(List values) { - addCriterion("description in", values, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionNotIn(List values) { - addCriterion("description not in", values, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionBetween(String value1, String value2) { - addCriterion("description between", value1, value2, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionNotBetween(String value1, String value2) { - addCriterion("description not between", value1, value2, "description"); - return (Criteria) this; - } - - public Criteria andStatusIsNull() { - addCriterion("status is null"); - return (Criteria) this; - } - - public Criteria andStatusIsNotNull() { - addCriterion("status is not null"); - return (Criteria) this; - } - - public Criteria andStatusEqualTo(Byte value) { - addCriterion("status =", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotEqualTo(Byte value) { - addCriterion("status <>", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusGreaterThan(Byte value) { - addCriterion("status >", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusGreaterThanOrEqualTo(Byte value) { - addCriterion("status >=", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLessThan(Byte value) { - addCriterion("status <", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLessThanOrEqualTo(Byte value) { - addCriterion("status <=", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusIn(List values) { - addCriterion("status in", values, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotIn(List values) { - addCriterion("status not in", values, "status"); - return (Criteria) this; - } - - public Criteria andStatusBetween(Byte value1, Byte value2) { - addCriterion("status between", value1, value2, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotBetween(Byte value1, Byte value2) { - addCriterion("status not between", value1, value2, "status"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/AdminPicture.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/AdminPicture.java deleted file mode 100644 index 42b2f1f0b..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/AdminPicture.java +++ /dev/null @@ -1,224 +0,0 @@ -package com.accompany.business.model; - -import java.io.Serializable; -import java.util.Date; - -/** - * mybatis generate - * @author Administrator - * 表名 admin_picture - */ -public class AdminPicture implements Serializable { - /** - * - */ - private Integer picId; - - /** - * 图片地址 - */ - private String imgUrl; - - /** - * 游戏结果类型 1-胜利 2-失败 3-平局 - */ - private Integer gameResultType; - - /** - * 图片类型 1-游戏分享,2签到分享,3.世界分享 - */ - private Integer type; - - /** - * 图片状态 1-启用 2-弃用 - */ - private Integer state; - - /** - * 应用id tutu-轻寻 qingxun-轻寻 - */ - private String appId; - - /** - * 备注 - */ - private String remark; - - /** - * 创建时间 - */ - private Date createTime; - - /** - * 修改时间 - */ - private Date updateTime; - - /** - * admin_picture - */ - private static final long serialVersionUID = 1L; - - /** - * - * @return pic_id - */ - public Integer getPicId() { - return picId; - } - - /** - * - * @param picId - */ - public void setPicId(Integer picId) { - this.picId = picId; - } - - /** - * 图片地址 - * @return img_url 图片地址 - */ - public String getImgUrl() { - return imgUrl; - } - - /** - * 图片地址 - * @param imgUrl 图片地址 - */ - public void setImgUrl(String imgUrl) { - this.imgUrl = imgUrl; - } - - /** - * 游戏结果类型 1-胜利 2-失败 3-平局 - * @return game_result_type 游戏结果类型 1-胜利 2-失败 3-平局 - */ - public Integer getGameResultType() { - return gameResultType; - } - - /** - * 游戏结果类型 1-胜利 2-失败 3-平局 - * @param gameResultType 游戏结果类型 1-胜利 2-失败 3-平局 - */ - public void setGameResultType(Integer gameResultType) { - this.gameResultType = gameResultType; - } - - /** - * 图片类型 1-游戏分享,2签到分享,3.世界分享 - * @return type 图片类型 1-游戏分享,2签到分享,3.世界分享 - */ - public Integer getType() { - return type; - } - - /** - * 图片类型 1-游戏分享,2签到分享,3.世界分享 - * @param type 图片类型 1-游戏分享,2签到分享,3.世界分享 - */ - public void setType(Integer type) { - this.type = type; - } - - /** - * 图片状态 1-启用 2-弃用 - * @return state 图片状态 1-启用 2-弃用 - */ - public Integer getState() { - return state; - } - - /** - * 图片状态 1-启用 2-弃用 - * @param state 图片状态 1-启用 2-弃用 - */ - public void setState(Integer state) { - this.state = state; - } - - /** - * 应用id tutu-轻寻 qingxun-轻寻 - * @return app_id 应用id tutu-轻寻 qingxun-轻寻 - */ - public String getAppId() { - return appId; - } - - /** - * 应用id tutu-轻寻 qingxun-轻寻 - * @param appId 应用id tutu-轻寻 qingxun-轻寻 - */ - public void setAppId(String appId) { - this.appId = appId; - } - - /** - * 备注 - * @return remark 备注 - */ - public String getRemark() { - return remark; - } - - /** - * 备注 - * @param remark 备注 - */ - public void setRemark(String remark) { - this.remark = remark; - } - - /** - * 创建时间 - * @return create_time 创建时间 - */ - public Date getCreateTime() { - return createTime; - } - - /** - * 创建时间 - * @param createTime 创建时间 - */ - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - /** - * 修改时间 - * @return update_time 修改时间 - */ - public Date getUpdateTime() { - return updateTime; - } - - /** - * 修改时间 - * @param updateTime 修改时间 - */ - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", picId=").append(picId); - sb.append(", imgUrl=").append(imgUrl); - sb.append(", gameResultType=").append(gameResultType); - sb.append(", type=").append(type); - sb.append(", state=").append(state); - sb.append(", appId=").append(appId); - sb.append(", remark=").append(remark); - sb.append(", createTime=").append(createTime); - sb.append(", updateTime=").append(updateTime); - sb.append("]"); - return sb.toString(); - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/AdminPictureExample.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/AdminPictureExample.java deleted file mode 100644 index c5abf1174..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/AdminPictureExample.java +++ /dev/null @@ -1,1136 +0,0 @@ -package com.accompany.business.model; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -/** - * mybatis generate - * @author Administrator - * 表名 admin_picture - */ -public class AdminPictureExample { - /** - * admin_picture - */ - protected String orderByClause; - - /** - * admin_picture - */ - protected boolean distinct; - - /** - * admin_picture - */ - protected List oredCriteria; - - public AdminPictureExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - /** - * admin_picture - */ - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - /** - * - */ - public Criteria andPicIdIsNull() { - addCriterion("pic_id is null"); - return (Criteria) this; - } - - /** - * - */ - public Criteria andPicIdIsNotNull() { - addCriterion("pic_id is not null"); - return (Criteria) this; - } - - /** - * - */ - public Criteria andPicIdEqualTo(Integer value) { - addCriterion("pic_id =", value, "picId"); - return (Criteria) this; - } - - /** - * - */ - public Criteria andPicIdNotEqualTo(Integer value) { - addCriterion("pic_id <>", value, "picId"); - return (Criteria) this; - } - - /** - * - */ - public Criteria andPicIdGreaterThan(Integer value) { - addCriterion("pic_id >", value, "picId"); - return (Criteria) this; - } - - /** - * - */ - public Criteria andPicIdGreaterThanOrEqualTo(Integer value) { - addCriterion("pic_id >=", value, "picId"); - return (Criteria) this; - } - - /** - * - */ - public Criteria andPicIdLessThan(Integer value) { - addCriterion("pic_id <", value, "picId"); - return (Criteria) this; - } - - /** - * - */ - public Criteria andPicIdLessThanOrEqualTo(Integer value) { - addCriterion("pic_id <=", value, "picId"); - return (Criteria) this; - } - - /** - * - */ - public Criteria andPicIdIn(List values) { - addCriterion("pic_id in", values, "picId"); - return (Criteria) this; - } - - /** - * - */ - public Criteria andPicIdNotIn(List values) { - addCriterion("pic_id not in", values, "picId"); - return (Criteria) this; - } - - /** - * - */ - public Criteria andPicIdBetween(Integer value1, Integer value2) { - addCriterion("pic_id between", value1, value2, "picId"); - return (Criteria) this; - } - - /** - * - */ - public Criteria andPicIdNotBetween(Integer value1, Integer value2) { - addCriterion("pic_id not between", value1, value2, "picId"); - return (Criteria) this; - } - - /** - * 图片地址 - */ - public Criteria andImgUrlIsNull() { - addCriterion("img_url is null"); - return (Criteria) this; - } - - /** - * 图片地址 - */ - public Criteria andImgUrlIsNotNull() { - addCriterion("img_url is not null"); - return (Criteria) this; - } - - /** - * 图片地址 - */ - public Criteria andImgUrlEqualTo(String value) { - addCriterion("img_url =", value, "imgUrl"); - return (Criteria) this; - } - - /** - * 图片地址 - */ - public Criteria andImgUrlNotEqualTo(String value) { - addCriterion("img_url <>", value, "imgUrl"); - return (Criteria) this; - } - - /** - * 图片地址 - */ - public Criteria andImgUrlGreaterThan(String value) { - addCriterion("img_url >", value, "imgUrl"); - return (Criteria) this; - } - - /** - * 图片地址 - */ - public Criteria andImgUrlGreaterThanOrEqualTo(String value) { - addCriterion("img_url >=", value, "imgUrl"); - return (Criteria) this; - } - - /** - * 图片地址 - */ - public Criteria andImgUrlLessThan(String value) { - addCriterion("img_url <", value, "imgUrl"); - return (Criteria) this; - } - - /** - * 图片地址 - */ - public Criteria andImgUrlLessThanOrEqualTo(String value) { - addCriterion("img_url <=", value, "imgUrl"); - return (Criteria) this; - } - - /** - * 图片地址 - */ - public Criteria andImgUrlLike(String value) { - addCriterion("img_url like", value, "imgUrl"); - return (Criteria) this; - } - - /** - * 图片地址 - */ - public Criteria andImgUrlNotLike(String value) { - addCriterion("img_url not like", value, "imgUrl"); - return (Criteria) this; - } - - /** - * 图片地址 - */ - public Criteria andImgUrlIn(List values) { - addCriterion("img_url in", values, "imgUrl"); - return (Criteria) this; - } - - /** - * 图片地址 - */ - public Criteria andImgUrlNotIn(List values) { - addCriterion("img_url not in", values, "imgUrl"); - return (Criteria) this; - } - - /** - * 图片地址 - */ - public Criteria andImgUrlBetween(String value1, String value2) { - addCriterion("img_url between", value1, value2, "imgUrl"); - return (Criteria) this; - } - - /** - * 图片地址 - */ - public Criteria andImgUrlNotBetween(String value1, String value2) { - addCriterion("img_url not between", value1, value2, "imgUrl"); - return (Criteria) this; - } - - /** - * 游戏结果类型 1-胜利 2-失败 3-平局 - */ - public Criteria andGameResultTypeIsNull() { - addCriterion("game_result_type is null"); - return (Criteria) this; - } - - /** - * 游戏结果类型 1-胜利 2-失败 3-平局 - */ - public Criteria andGameResultTypeIsNotNull() { - addCriterion("game_result_type is not null"); - return (Criteria) this; - } - - /** - * 游戏结果类型 1-胜利 2-失败 3-平局 - */ - public Criteria andGameResultTypeEqualTo(Integer value) { - addCriterion("game_result_type =", value, "gameResultType"); - return (Criteria) this; - } - - /** - * 游戏结果类型 1-胜利 2-失败 3-平局 - */ - public Criteria andGameResultTypeNotEqualTo(Integer value) { - addCriterion("game_result_type <>", value, "gameResultType"); - return (Criteria) this; - } - - /** - * 游戏结果类型 1-胜利 2-失败 3-平局 - */ - public Criteria andGameResultTypeGreaterThan(Integer value) { - addCriterion("game_result_type >", value, "gameResultType"); - return (Criteria) this; - } - - /** - * 游戏结果类型 1-胜利 2-失败 3-平局 - */ - public Criteria andGameResultTypeGreaterThanOrEqualTo(Integer value) { - addCriterion("game_result_type >=", value, "gameResultType"); - return (Criteria) this; - } - - /** - * 游戏结果类型 1-胜利 2-失败 3-平局 - */ - public Criteria andGameResultTypeLessThan(Integer value) { - addCriterion("game_result_type <", value, "gameResultType"); - return (Criteria) this; - } - - /** - * 游戏结果类型 1-胜利 2-失败 3-平局 - */ - public Criteria andGameResultTypeLessThanOrEqualTo(Integer value) { - addCriterion("game_result_type <=", value, "gameResultType"); - return (Criteria) this; - } - - /** - * 游戏结果类型 1-胜利 2-失败 3-平局 - */ - public Criteria andGameResultTypeIn(List values) { - addCriterion("game_result_type in", values, "gameResultType"); - return (Criteria) this; - } - - /** - * 游戏结果类型 1-胜利 2-失败 3-平局 - */ - public Criteria andGameResultTypeNotIn(List values) { - addCriterion("game_result_type not in", values, "gameResultType"); - return (Criteria) this; - } - - /** - * 游戏结果类型 1-胜利 2-失败 3-平局 - */ - public Criteria andGameResultTypeBetween(Integer value1, Integer value2) { - addCriterion("game_result_type between", value1, value2, "gameResultType"); - return (Criteria) this; - } - - /** - * 游戏结果类型 1-胜利 2-失败 3-平局 - */ - public Criteria andGameResultTypeNotBetween(Integer value1, Integer value2) { - addCriterion("game_result_type not between", value1, value2, "gameResultType"); - return (Criteria) this; - } - - /** - * 图片类型 1-游戏分享,2签到分享,3.世界分享 - */ - public Criteria andTypeIsNull() { - addCriterion("type is null"); - return (Criteria) this; - } - - /** - * 图片类型 1-游戏分享,2签到分享,3.世界分享 - */ - public Criteria andTypeIsNotNull() { - addCriterion("type is not null"); - return (Criteria) this; - } - - /** - * 图片类型 1-游戏分享,2签到分享,3.世界分享 - */ - public Criteria andTypeEqualTo(Integer value) { - addCriterion("type =", value, "type"); - return (Criteria) this; - } - - /** - * 图片类型 1-游戏分享,2签到分享,3.世界分享 - */ - public Criteria andTypeNotEqualTo(Integer value) { - addCriterion("type <>", value, "type"); - return (Criteria) this; - } - - /** - * 图片类型 1-游戏分享,2签到分享,3.世界分享 - */ - public Criteria andTypeGreaterThan(Integer value) { - addCriterion("type >", value, "type"); - return (Criteria) this; - } - - /** - * 图片类型 1-游戏分享,2签到分享,3.世界分享 - */ - public Criteria andTypeGreaterThanOrEqualTo(Integer value) { - addCriterion("type >=", value, "type"); - return (Criteria) this; - } - - /** - * 图片类型 1-游戏分享,2签到分享,3.世界分享 - */ - public Criteria andTypeLessThan(Integer value) { - addCriterion("type <", value, "type"); - return (Criteria) this; - } - - /** - * 图片类型 1-游戏分享,2签到分享,3.世界分享 - */ - public Criteria andTypeLessThanOrEqualTo(Integer value) { - addCriterion("type <=", value, "type"); - return (Criteria) this; - } - - /** - * 图片类型 1-游戏分享,2签到分享,3.世界分享 - */ - public Criteria andTypeIn(List values) { - addCriterion("type in", values, "type"); - return (Criteria) this; - } - - /** - * 图片类型 1-游戏分享,2签到分享,3.世界分享 - */ - public Criteria andTypeNotIn(List values) { - addCriterion("type not in", values, "type"); - return (Criteria) this; - } - - /** - * 图片类型 1-游戏分享,2签到分享,3.世界分享 - */ - public Criteria andTypeBetween(Integer value1, Integer value2) { - addCriterion("type between", value1, value2, "type"); - return (Criteria) this; - } - - /** - * 图片类型 1-游戏分享,2签到分享,3.世界分享 - */ - public Criteria andTypeNotBetween(Integer value1, Integer value2) { - addCriterion("type not between", value1, value2, "type"); - return (Criteria) this; - } - - /** - * 图片状态 1-启用 2-弃用 - */ - public Criteria andStateIsNull() { - addCriterion("state is null"); - return (Criteria) this; - } - - /** - * 图片状态 1-启用 2-弃用 - */ - public Criteria andStateIsNotNull() { - addCriterion("state is not null"); - return (Criteria) this; - } - - /** - * 图片状态 1-启用 2-弃用 - */ - public Criteria andStateEqualTo(Integer value) { - addCriterion("state =", value, "state"); - return (Criteria) this; - } - - /** - * 图片状态 1-启用 2-弃用 - */ - public Criteria andStateNotEqualTo(Integer value) { - addCriterion("state <>", value, "state"); - return (Criteria) this; - } - - /** - * 图片状态 1-启用 2-弃用 - */ - public Criteria andStateGreaterThan(Integer value) { - addCriterion("state >", value, "state"); - return (Criteria) this; - } - - /** - * 图片状态 1-启用 2-弃用 - */ - public Criteria andStateGreaterThanOrEqualTo(Integer value) { - addCriterion("state >=", value, "state"); - return (Criteria) this; - } - - /** - * 图片状态 1-启用 2-弃用 - */ - public Criteria andStateLessThan(Integer value) { - addCriterion("state <", value, "state"); - return (Criteria) this; - } - - /** - * 图片状态 1-启用 2-弃用 - */ - public Criteria andStateLessThanOrEqualTo(Integer value) { - addCriterion("state <=", value, "state"); - return (Criteria) this; - } - - /** - * 图片状态 1-启用 2-弃用 - */ - public Criteria andStateIn(List values) { - addCriterion("state in", values, "state"); - return (Criteria) this; - } - - /** - * 图片状态 1-启用 2-弃用 - */ - public Criteria andStateNotIn(List values) { - addCriterion("state not in", values, "state"); - return (Criteria) this; - } - - /** - * 图片状态 1-启用 2-弃用 - */ - public Criteria andStateBetween(Integer value1, Integer value2) { - addCriterion("state between", value1, value2, "state"); - return (Criteria) this; - } - - /** - * 图片状态 1-启用 2-弃用 - */ - public Criteria andStateNotBetween(Integer value1, Integer value2) { - addCriterion("state not between", value1, value2, "state"); - return (Criteria) this; - } - - /** - * 应用id tutu-轻寻 qingxun-轻寻 - */ - public Criteria andAppIdIsNull() { - addCriterion("app_id is null"); - return (Criteria) this; - } - - /** - * 应用id tutu-轻寻 qingxun-轻寻 - */ - public Criteria andAppIdIsNotNull() { - addCriterion("app_id is not null"); - return (Criteria) this; - } - - /** - * 应用id tutu-轻寻 qingxun-轻寻 - */ - public Criteria andAppIdEqualTo(String value) { - addCriterion("app_id =", value, "appId"); - return (Criteria) this; - } - - /** - * 应用id tutu-轻寻 qingxun-轻寻 - */ - public Criteria andAppIdNotEqualTo(String value) { - addCriterion("app_id <>", value, "appId"); - return (Criteria) this; - } - - /** - * 应用id tutu-轻寻 qingxun-轻寻 - */ - public Criteria andAppIdGreaterThan(String value) { - addCriterion("app_id >", value, "appId"); - return (Criteria) this; - } - - /** - * 应用id tutu-轻寻 qingxun-轻寻 - */ - public Criteria andAppIdGreaterThanOrEqualTo(String value) { - addCriterion("app_id >=", value, "appId"); - return (Criteria) this; - } - - /** - * 应用id tutu-轻寻 qingxun-轻寻 - */ - public Criteria andAppIdLessThan(String value) { - addCriterion("app_id <", value, "appId"); - return (Criteria) this; - } - - /** - * 应用id tutu-轻寻 qingxun-轻寻 - */ - public Criteria andAppIdLessThanOrEqualTo(String value) { - addCriterion("app_id <=", value, "appId"); - return (Criteria) this; - } - - /** - * 应用id tutu-轻寻 qingxun-轻寻 - */ - public Criteria andAppIdLike(String value) { - addCriterion("app_id like", value, "appId"); - return (Criteria) this; - } - - /** - * 应用id tutu-轻寻 qingxun-轻寻 - */ - public Criteria andAppIdNotLike(String value) { - addCriterion("app_id not like", value, "appId"); - return (Criteria) this; - } - - /** - * 应用id tutu-轻寻 qingxun-轻寻 - */ - public Criteria andAppIdIn(List values) { - addCriterion("app_id in", values, "appId"); - return (Criteria) this; - } - - /** - * 应用id tutu-轻寻 qingxun-轻寻 - */ - public Criteria andAppIdNotIn(List values) { - addCriterion("app_id not in", values, "appId"); - return (Criteria) this; - } - - /** - * 应用id tutu-轻寻 qingxun-轻寻 - */ - public Criteria andAppIdBetween(String value1, String value2) { - addCriterion("app_id between", value1, value2, "appId"); - return (Criteria) this; - } - - /** - * 应用id tutu-轻寻 qingxun-轻寻 - */ - public Criteria andAppIdNotBetween(String value1, String value2) { - addCriterion("app_id not between", value1, value2, "appId"); - return (Criteria) this; - } - - /** - * 备注 - */ - public Criteria andRemarkIsNull() { - addCriterion("remark is null"); - return (Criteria) this; - } - - /** - * 备注 - */ - public Criteria andRemarkIsNotNull() { - addCriterion("remark is not null"); - return (Criteria) this; - } - - /** - * 备注 - */ - public Criteria andRemarkEqualTo(String value) { - addCriterion("remark =", value, "remark"); - return (Criteria) this; - } - - /** - * 备注 - */ - public Criteria andRemarkNotEqualTo(String value) { - addCriterion("remark <>", value, "remark"); - return (Criteria) this; - } - - /** - * 备注 - */ - public Criteria andRemarkGreaterThan(String value) { - addCriterion("remark >", value, "remark"); - return (Criteria) this; - } - - /** - * 备注 - */ - public Criteria andRemarkGreaterThanOrEqualTo(String value) { - addCriterion("remark >=", value, "remark"); - return (Criteria) this; - } - - /** - * 备注 - */ - public Criteria andRemarkLessThan(String value) { - addCriterion("remark <", value, "remark"); - return (Criteria) this; - } - - /** - * 备注 - */ - public Criteria andRemarkLessThanOrEqualTo(String value) { - addCriterion("remark <=", value, "remark"); - return (Criteria) this; - } - - /** - * 备注 - */ - public Criteria andRemarkLike(String value) { - addCriterion("remark like", value, "remark"); - return (Criteria) this; - } - - /** - * 备注 - */ - public Criteria andRemarkNotLike(String value) { - addCriterion("remark not like", value, "remark"); - return (Criteria) this; - } - - /** - * 备注 - */ - public Criteria andRemarkIn(List values) { - addCriterion("remark in", values, "remark"); - return (Criteria) this; - } - - /** - * 备注 - */ - public Criteria andRemarkNotIn(List values) { - addCriterion("remark not in", values, "remark"); - return (Criteria) this; - } - - /** - * 备注 - */ - public Criteria andRemarkBetween(String value1, String value2) { - addCriterion("remark between", value1, value2, "remark"); - return (Criteria) this; - } - - /** - * 备注 - */ - public Criteria andRemarkNotBetween(String value1, String value2) { - addCriterion("remark not between", value1, value2, "remark"); - return (Criteria) this; - } - - /** - * 创建时间 - */ - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - /** - * 创建时间 - */ - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - /** - * 创建时间 - */ - public Criteria andCreateTimeEqualTo(Date value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - /** - * 创建时间 - */ - public Criteria andCreateTimeNotEqualTo(Date value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - /** - * 创建时间 - */ - public Criteria andCreateTimeGreaterThan(Date value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - /** - * 创建时间 - */ - public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - /** - * 创建时间 - */ - public Criteria andCreateTimeLessThan(Date value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - /** - * 创建时间 - */ - public Criteria andCreateTimeLessThanOrEqualTo(Date value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - /** - * 创建时间 - */ - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - /** - * 创建时间 - */ - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - /** - * 创建时间 - */ - public Criteria andCreateTimeBetween(Date value1, Date value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - /** - * 创建时间 - */ - public Criteria andCreateTimeNotBetween(Date value1, Date value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - - /** - * 修改时间 - */ - public Criteria andUpdateTimeIsNull() { - addCriterion("update_time is null"); - return (Criteria) this; - } - - /** - * 修改时间 - */ - public Criteria andUpdateTimeIsNotNull() { - addCriterion("update_time is not null"); - return (Criteria) this; - } - - /** - * 修改时间 - */ - public Criteria andUpdateTimeEqualTo(Date value) { - addCriterion("update_time =", value, "updateTime"); - return (Criteria) this; - } - - /** - * 修改时间 - */ - public Criteria andUpdateTimeNotEqualTo(Date value) { - addCriterion("update_time <>", value, "updateTime"); - return (Criteria) this; - } - - /** - * 修改时间 - */ - public Criteria andUpdateTimeGreaterThan(Date value) { - addCriterion("update_time >", value, "updateTime"); - return (Criteria) this; - } - - /** - * 修改时间 - */ - public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("update_time >=", value, "updateTime"); - return (Criteria) this; - } - - /** - * 修改时间 - */ - public Criteria andUpdateTimeLessThan(Date value) { - addCriterion("update_time <", value, "updateTime"); - return (Criteria) this; - } - - /** - * 修改时间 - */ - public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { - addCriterion("update_time <=", value, "updateTime"); - return (Criteria) this; - } - - /** - * 修改时间 - */ - public Criteria andUpdateTimeIn(List values) { - addCriterion("update_time in", values, "updateTime"); - return (Criteria) this; - } - - /** - * 修改时间 - */ - public Criteria andUpdateTimeNotIn(List values) { - addCriterion("update_time not in", values, "updateTime"); - return (Criteria) this; - } - - /** - * 修改时间 - */ - public Criteria andUpdateTimeBetween(Date value1, Date value2) { - addCriterion("update_time between", value1, value2, "updateTime"); - return (Criteria) this; - } - - /** - * 修改时间 - */ - public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { - addCriterion("update_time not between", value1, value2, "updateTime"); - return (Criteria) this; - } - } - - /** - * admin_picture - */ - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - /** - * admin_picture - */ - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/ChannelDistribute.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/ChannelDistribute.java deleted file mode 100644 index f2058c973..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/ChannelDistribute.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.accompany.business.model; - -import java.util.Date; - -public class ChannelDistribute { - private Long id; - - private String appId; - - private String channel; - - private Integer routeType; - - private String routeValue; - - private Date createTime; - - private Date updateTime; - - private String operator; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getAppId() { - return appId; - } - - public void setAppId(String appId) { - this.appId = appId == null ? null : appId.trim(); - } - - public String getChannel() { - return channel; - } - - public void setChannel(String channel) { - this.channel = channel == null ? null : channel.trim(); - } - - public Integer getRouteType() { - return routeType; - } - - public void setRouteType(Integer routeType) { - this.routeType = routeType; - } - - public String getRouteValue() { - return routeValue; - } - - public void setRouteValue(String routeValue) { - this.routeValue = routeValue == null ? null : routeValue.trim(); - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Date getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } - - public String getOperator() { - return operator; - } - - public void setOperator(String operator) { - this.operator = operator == null ? null : operator.trim(); - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/ChannelDistributeExample.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/ChannelDistributeExample.java deleted file mode 100644 index 01256ef79..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/ChannelDistributeExample.java +++ /dev/null @@ -1,741 +0,0 @@ -package com.accompany.business.model; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class ChannelDistributeExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - private Integer limit; - - private Integer offset; - - public ChannelDistributeExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - public void setLimit(Integer limit) { - this.limit = limit; - } - - public Integer getLimit() { - return limit; - } - - public void setOffset(Integer offset) { - this.offset = offset; - } - - public Integer getOffset() { - return offset; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(Long value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(Long value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(Long value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(Long value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(Long value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(Long value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(Long value1, Long value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(Long value1, Long value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andAppIdIsNull() { - addCriterion("app_id is null"); - return (Criteria) this; - } - - public Criteria andAppIdIsNotNull() { - addCriterion("app_id is not null"); - return (Criteria) this; - } - - public Criteria andAppIdEqualTo(String value) { - addCriterion("app_id =", value, "appId"); - return (Criteria) this; - } - - public Criteria andAppIdNotEqualTo(String value) { - addCriterion("app_id <>", value, "appId"); - return (Criteria) this; - } - - public Criteria andAppIdGreaterThan(String value) { - addCriterion("app_id >", value, "appId"); - return (Criteria) this; - } - - public Criteria andAppIdGreaterThanOrEqualTo(String value) { - addCriterion("app_id >=", value, "appId"); - return (Criteria) this; - } - - public Criteria andAppIdLessThan(String value) { - addCriterion("app_id <", value, "appId"); - return (Criteria) this; - } - - public Criteria andAppIdLessThanOrEqualTo(String value) { - addCriterion("app_id <=", value, "appId"); - return (Criteria) this; - } - - public Criteria andAppIdLike(String value) { - addCriterion("app_id like", value, "appId"); - return (Criteria) this; - } - - public Criteria andAppIdNotLike(String value) { - addCriterion("app_id not like", value, "appId"); - return (Criteria) this; - } - - public Criteria andAppIdIn(List values) { - addCriterion("app_id in", values, "appId"); - return (Criteria) this; - } - - public Criteria andAppIdNotIn(List values) { - addCriterion("app_id not in", values, "appId"); - return (Criteria) this; - } - - public Criteria andAppIdBetween(String value1, String value2) { - addCriterion("app_id between", value1, value2, "appId"); - return (Criteria) this; - } - - public Criteria andAppIdNotBetween(String value1, String value2) { - addCriterion("app_id not between", value1, value2, "appId"); - return (Criteria) this; - } - - public Criteria andChannelIsNull() { - addCriterion("channel is null"); - return (Criteria) this; - } - - public Criteria andChannelIsNotNull() { - addCriterion("channel is not null"); - return (Criteria) this; - } - - public Criteria andChannelEqualTo(String value) { - addCriterion("channel =", value, "channel"); - return (Criteria) this; - } - - public Criteria andChannelNotEqualTo(String value) { - addCriterion("channel <>", value, "channel"); - return (Criteria) this; - } - - public Criteria andChannelGreaterThan(String value) { - addCriterion("channel >", value, "channel"); - return (Criteria) this; - } - - public Criteria andChannelGreaterThanOrEqualTo(String value) { - addCriterion("channel >=", value, "channel"); - return (Criteria) this; - } - - public Criteria andChannelLessThan(String value) { - addCriterion("channel <", value, "channel"); - return (Criteria) this; - } - - public Criteria andChannelLessThanOrEqualTo(String value) { - addCriterion("channel <=", value, "channel"); - return (Criteria) this; - } - - public Criteria andChannelLike(String value) { - addCriterion("channel like", value, "channel"); - return (Criteria) this; - } - - public Criteria andChannelNotLike(String value) { - addCriterion("channel not like", value, "channel"); - return (Criteria) this; - } - - public Criteria andChannelIn(List values) { - addCriterion("channel in", values, "channel"); - return (Criteria) this; - } - - public Criteria andChannelNotIn(List values) { - addCriterion("channel not in", values, "channel"); - return (Criteria) this; - } - - public Criteria andChannelBetween(String value1, String value2) { - addCriterion("channel between", value1, value2, "channel"); - return (Criteria) this; - } - - public Criteria andChannelNotBetween(String value1, String value2) { - addCriterion("channel not between", value1, value2, "channel"); - return (Criteria) this; - } - - public Criteria andRouteTypeIsNull() { - addCriterion("route_type is null"); - return (Criteria) this; - } - - public Criteria andRouteTypeIsNotNull() { - addCriterion("route_type is not null"); - return (Criteria) this; - } - - public Criteria andRouteTypeEqualTo(Integer value) { - addCriterion("route_type =", value, "routeType"); - return (Criteria) this; - } - - public Criteria andRouteTypeNotEqualTo(Integer value) { - addCriterion("route_type <>", value, "routeType"); - return (Criteria) this; - } - - public Criteria andRouteTypeGreaterThan(Integer value) { - addCriterion("route_type >", value, "routeType"); - return (Criteria) this; - } - - public Criteria andRouteTypeGreaterThanOrEqualTo(Integer value) { - addCriterion("route_type >=", value, "routeType"); - return (Criteria) this; - } - - public Criteria andRouteTypeLessThan(Integer value) { - addCriterion("route_type <", value, "routeType"); - return (Criteria) this; - } - - public Criteria andRouteTypeLessThanOrEqualTo(Integer value) { - addCriterion("route_type <=", value, "routeType"); - return (Criteria) this; - } - - public Criteria andRouteTypeIn(List values) { - addCriterion("route_type in", values, "routeType"); - return (Criteria) this; - } - - public Criteria andRouteTypeNotIn(List values) { - addCriterion("route_type not in", values, "routeType"); - return (Criteria) this; - } - - public Criteria andRouteTypeBetween(Integer value1, Integer value2) { - addCriterion("route_type between", value1, value2, "routeType"); - return (Criteria) this; - } - - public Criteria andRouteTypeNotBetween(Integer value1, Integer value2) { - addCriterion("route_type not between", value1, value2, "routeType"); - return (Criteria) this; - } - - public Criteria andRouteValueIsNull() { - addCriterion("route_value is null"); - return (Criteria) this; - } - - public Criteria andRouteValueIsNotNull() { - addCriterion("route_value is not null"); - return (Criteria) this; - } - - public Criteria andRouteValueEqualTo(String value) { - addCriterion("route_value =", value, "routeValue"); - return (Criteria) this; - } - - public Criteria andRouteValueNotEqualTo(String value) { - addCriterion("route_value <>", value, "routeValue"); - return (Criteria) this; - } - - public Criteria andRouteValueGreaterThan(String value) { - addCriterion("route_value >", value, "routeValue"); - return (Criteria) this; - } - - public Criteria andRouteValueGreaterThanOrEqualTo(String value) { - addCriterion("route_value >=", value, "routeValue"); - return (Criteria) this; - } - - public Criteria andRouteValueLessThan(String value) { - addCriterion("route_value <", value, "routeValue"); - return (Criteria) this; - } - - public Criteria andRouteValueLessThanOrEqualTo(String value) { - addCriterion("route_value <=", value, "routeValue"); - return (Criteria) this; - } - - public Criteria andRouteValueLike(String value) { - addCriterion("route_value like", value, "routeValue"); - return (Criteria) this; - } - - public Criteria andRouteValueNotLike(String value) { - addCriterion("route_value not like", value, "routeValue"); - return (Criteria) this; - } - - public Criteria andRouteValueIn(List values) { - addCriterion("route_value in", values, "routeValue"); - return (Criteria) this; - } - - public Criteria andRouteValueNotIn(List values) { - addCriterion("route_value not in", values, "routeValue"); - return (Criteria) this; - } - - public Criteria andRouteValueBetween(String value1, String value2) { - addCriterion("route_value between", value1, value2, "routeValue"); - return (Criteria) this; - } - - public Criteria andRouteValueNotBetween(String value1, String value2) { - addCriterion("route_value not between", value1, value2, "routeValue"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(Date value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(Date value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(Date value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(Date value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(Date value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(Date value1, Date value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(Date value1, Date value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNull() { - addCriterion("update_time is null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNotNull() { - addCriterion("update_time is not null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeEqualTo(Date value) { - addCriterion("update_time =", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotEqualTo(Date value) { - addCriterion("update_time <>", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThan(Date value) { - addCriterion("update_time >", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("update_time >=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThan(Date value) { - addCriterion("update_time <", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { - addCriterion("update_time <=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIn(List values) { - addCriterion("update_time in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotIn(List values) { - addCriterion("update_time not in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeBetween(Date value1, Date value2) { - addCriterion("update_time between", value1, value2, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { - addCriterion("update_time not between", value1, value2, "updateTime"); - return (Criteria) this; - } - - public Criteria andOperatorIsNull() { - addCriterion("`operator` is null"); - return (Criteria) this; - } - - public Criteria andOperatorIsNotNull() { - addCriterion("`operator` is not null"); - return (Criteria) this; - } - - public Criteria andOperatorEqualTo(String value) { - addCriterion("`operator` =", value, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorNotEqualTo(String value) { - addCriterion("`operator` <>", value, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorGreaterThan(String value) { - addCriterion("`operator` >", value, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorGreaterThanOrEqualTo(String value) { - addCriterion("`operator` >=", value, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorLessThan(String value) { - addCriterion("`operator` <", value, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorLessThanOrEqualTo(String value) { - addCriterion("`operator` <=", value, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorLike(String value) { - addCriterion("`operator` like", value, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorNotLike(String value) { - addCriterion("`operator` not like", value, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorIn(List values) { - addCriterion("`operator` in", values, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorNotIn(List values) { - addCriterion("`operator` not in", values, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorBetween(String value1, String value2) { - addCriterion("`operator` between", value1, value2, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorNotBetween(String value1, String value2) { - addCriterion("`operator` not between", value1, value2, "operator"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/ChargeActivityVisitLog.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/ChargeActivityVisitLog.java deleted file mode 100644 index 9d79fa255..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/ChargeActivityVisitLog.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.accompany.business.model; - -import java.util.Date; - -public class ChargeActivityVisitLog { - private Long id; - - private Long uid; - - private Integer actId; - - private String deviceId; - - private Byte platform; - - private Byte type; - - private String ip; - - private Date createTime; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Long getUid() { - return uid; - } - - public void setUid(Long uid) { - this.uid = uid; - } - - public Integer getActId() { - return actId; - } - - public void setActId(Integer actId) { - this.actId = actId; - } - - public String getDeviceId() { - return deviceId; - } - - public void setDeviceId(String deviceId) { - this.deviceId = deviceId == null ? null : deviceId.trim(); - } - - public Byte getPlatform() { - return platform; - } - - public void setPlatform(Byte platform) { - this.platform = platform; - } - - public Byte getType() { - return type; - } - - public void setType(Byte type) { - this.type = type; - } - - public String getIp() { - return ip; - } - - public void setIp(String ip) { - this.ip = ip == null ? null : ip.trim(); - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/ChargeActivityVisitLogExample.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/ChargeActivityVisitLogExample.java deleted file mode 100644 index af8b74048..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/ChargeActivityVisitLogExample.java +++ /dev/null @@ -1,701 +0,0 @@ -package com.accompany.business.model; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class ChargeActivityVisitLogExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public ChargeActivityVisitLogExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(Long value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(Long value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(Long value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(Long value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(Long value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(Long value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(Long value1, Long value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(Long value1, Long value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andUidIsNull() { - addCriterion("uid is null"); - return (Criteria) this; - } - - public Criteria andUidIsNotNull() { - addCriterion("uid is not null"); - return (Criteria) this; - } - - public Criteria andUidEqualTo(Long value) { - addCriterion("uid =", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotEqualTo(Long value) { - addCriterion("uid <>", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidGreaterThan(Long value) { - addCriterion("uid >", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidGreaterThanOrEqualTo(Long value) { - addCriterion("uid >=", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidLessThan(Long value) { - addCriterion("uid <", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidLessThanOrEqualTo(Long value) { - addCriterion("uid <=", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidIn(List values) { - addCriterion("uid in", values, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotIn(List values) { - addCriterion("uid not in", values, "uid"); - return (Criteria) this; - } - - public Criteria andUidBetween(Long value1, Long value2) { - addCriterion("uid between", value1, value2, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotBetween(Long value1, Long value2) { - addCriterion("uid not between", value1, value2, "uid"); - return (Criteria) this; - } - - public Criteria andActIdIsNull() { - addCriterion("act_id is null"); - return (Criteria) this; - } - - public Criteria andActIdIsNotNull() { - addCriterion("act_id is not null"); - return (Criteria) this; - } - - public Criteria andActIdEqualTo(Integer value) { - addCriterion("act_id =", value, "actId"); - return (Criteria) this; - } - - public Criteria andActIdNotEqualTo(Integer value) { - addCriterion("act_id <>", value, "actId"); - return (Criteria) this; - } - - public Criteria andActIdGreaterThan(Integer value) { - addCriterion("act_id >", value, "actId"); - return (Criteria) this; - } - - public Criteria andActIdGreaterThanOrEqualTo(Integer value) { - addCriterion("act_id >=", value, "actId"); - return (Criteria) this; - } - - public Criteria andActIdLessThan(Integer value) { - addCriterion("act_id <", value, "actId"); - return (Criteria) this; - } - - public Criteria andActIdLessThanOrEqualTo(Integer value) { - addCriterion("act_id <=", value, "actId"); - return (Criteria) this; - } - - public Criteria andActIdIn(List values) { - addCriterion("act_id in", values, "actId"); - return (Criteria) this; - } - - public Criteria andActIdNotIn(List values) { - addCriterion("act_id not in", values, "actId"); - return (Criteria) this; - } - - public Criteria andActIdBetween(Integer value1, Integer value2) { - addCriterion("act_id between", value1, value2, "actId"); - return (Criteria) this; - } - - public Criteria andActIdNotBetween(Integer value1, Integer value2) { - addCriterion("act_id not between", value1, value2, "actId"); - return (Criteria) this; - } - - public Criteria andDeviceIdIsNull() { - addCriterion("device_id is null"); - return (Criteria) this; - } - - public Criteria andDeviceIdIsNotNull() { - addCriterion("device_id is not null"); - return (Criteria) this; - } - - public Criteria andDeviceIdEqualTo(String value) { - addCriterion("device_id =", value, "deviceId"); - return (Criteria) this; - } - - public Criteria andDeviceIdNotEqualTo(String value) { - addCriterion("device_id <>", value, "deviceId"); - return (Criteria) this; - } - - public Criteria andDeviceIdGreaterThan(String value) { - addCriterion("device_id >", value, "deviceId"); - return (Criteria) this; - } - - public Criteria andDeviceIdGreaterThanOrEqualTo(String value) { - addCriterion("device_id >=", value, "deviceId"); - return (Criteria) this; - } - - public Criteria andDeviceIdLessThan(String value) { - addCriterion("device_id <", value, "deviceId"); - return (Criteria) this; - } - - public Criteria andDeviceIdLessThanOrEqualTo(String value) { - addCriterion("device_id <=", value, "deviceId"); - return (Criteria) this; - } - - public Criteria andDeviceIdLike(String value) { - addCriterion("device_id like", value, "deviceId"); - return (Criteria) this; - } - - public Criteria andDeviceIdNotLike(String value) { - addCriterion("device_id not like", value, "deviceId"); - return (Criteria) this; - } - - public Criteria andDeviceIdIn(List values) { - addCriterion("device_id in", values, "deviceId"); - return (Criteria) this; - } - - public Criteria andDeviceIdNotIn(List values) { - addCriterion("device_id not in", values, "deviceId"); - return (Criteria) this; - } - - public Criteria andDeviceIdBetween(String value1, String value2) { - addCriterion("device_id between", value1, value2, "deviceId"); - return (Criteria) this; - } - - public Criteria andDeviceIdNotBetween(String value1, String value2) { - addCriterion("device_id not between", value1, value2, "deviceId"); - return (Criteria) this; - } - - public Criteria andPlatformIsNull() { - addCriterion("platform is null"); - return (Criteria) this; - } - - public Criteria andPlatformIsNotNull() { - addCriterion("platform is not null"); - return (Criteria) this; - } - - public Criteria andPlatformEqualTo(Byte value) { - addCriterion("platform =", value, "platform"); - return (Criteria) this; - } - - public Criteria andPlatformNotEqualTo(Byte value) { - addCriterion("platform <>", value, "platform"); - return (Criteria) this; - } - - public Criteria andPlatformGreaterThan(Byte value) { - addCriterion("platform >", value, "platform"); - return (Criteria) this; - } - - public Criteria andPlatformGreaterThanOrEqualTo(Byte value) { - addCriterion("platform >=", value, "platform"); - return (Criteria) this; - } - - public Criteria andPlatformLessThan(Byte value) { - addCriterion("platform <", value, "platform"); - return (Criteria) this; - } - - public Criteria andPlatformLessThanOrEqualTo(Byte value) { - addCriterion("platform <=", value, "platform"); - return (Criteria) this; - } - - public Criteria andPlatformIn(List values) { - addCriterion("platform in", values, "platform"); - return (Criteria) this; - } - - public Criteria andPlatformNotIn(List values) { - addCriterion("platform not in", values, "platform"); - return (Criteria) this; - } - - public Criteria andPlatformBetween(Byte value1, Byte value2) { - addCriterion("platform between", value1, value2, "platform"); - return (Criteria) this; - } - - public Criteria andPlatformNotBetween(Byte value1, Byte value2) { - addCriterion("platform not between", value1, value2, "platform"); - return (Criteria) this; - } - - public Criteria andTypeIsNull() { - addCriterion("type is null"); - return (Criteria) this; - } - - public Criteria andTypeIsNotNull() { - addCriterion("type is not null"); - return (Criteria) this; - } - - public Criteria andTypeEqualTo(Byte value) { - addCriterion("type =", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotEqualTo(Byte value) { - addCriterion("type <>", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeGreaterThan(Byte value) { - addCriterion("type >", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeGreaterThanOrEqualTo(Byte value) { - addCriterion("type >=", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLessThan(Byte value) { - addCriterion("type <", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLessThanOrEqualTo(Byte value) { - addCriterion("type <=", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeIn(List values) { - addCriterion("type in", values, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotIn(List values) { - addCriterion("type not in", values, "type"); - return (Criteria) this; - } - - public Criteria andTypeBetween(Byte value1, Byte value2) { - addCriterion("type between", value1, value2, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotBetween(Byte value1, Byte value2) { - addCriterion("type not between", value1, value2, "type"); - return (Criteria) this; - } - - public Criteria andIpIsNull() { - addCriterion("ip is null"); - return (Criteria) this; - } - - public Criteria andIpIsNotNull() { - addCriterion("ip is not null"); - return (Criteria) this; - } - - public Criteria andIpEqualTo(String value) { - addCriterion("ip =", value, "ip"); - return (Criteria) this; - } - - public Criteria andIpNotEqualTo(String value) { - addCriterion("ip <>", value, "ip"); - return (Criteria) this; - } - - public Criteria andIpGreaterThan(String value) { - addCriterion("ip >", value, "ip"); - return (Criteria) this; - } - - public Criteria andIpGreaterThanOrEqualTo(String value) { - addCriterion("ip >=", value, "ip"); - return (Criteria) this; - } - - public Criteria andIpLessThan(String value) { - addCriterion("ip <", value, "ip"); - return (Criteria) this; - } - - public Criteria andIpLessThanOrEqualTo(String value) { - addCriterion("ip <=", value, "ip"); - return (Criteria) this; - } - - public Criteria andIpLike(String value) { - addCriterion("ip like", value, "ip"); - return (Criteria) this; - } - - public Criteria andIpNotLike(String value) { - addCriterion("ip not like", value, "ip"); - return (Criteria) this; - } - - public Criteria andIpIn(List values) { - addCriterion("ip in", values, "ip"); - return (Criteria) this; - } - - public Criteria andIpNotIn(List values) { - addCriterion("ip not in", values, "ip"); - return (Criteria) this; - } - - public Criteria andIpBetween(String value1, String value2) { - addCriterion("ip between", value1, value2, "ip"); - return (Criteria) this; - } - - public Criteria andIpNotBetween(String value1, String value2) { - addCriterion("ip not between", value1, value2, "ip"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(Date value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(Date value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(Date value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(Date value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(Date value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(Date value1, Date value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(Date value1, Date value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/FinanceGoldDiamond.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/FinanceGoldDiamond.java deleted file mode 100644 index d918b559e..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/FinanceGoldDiamond.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.accompany.business.model; - -import java.util.Date; - -public class FinanceGoldDiamond { - private Long id; - - private Double chargeGoldNum; - - private Double nobleGoldNum; - - private Double goldNum; - - private Double diamondNum; - - private Double totalNum; - - private Double goldIncreaseNum; - - private Double goldDecreaseNum; - - private Double diamondIncreaseNum; - - private Double diamondDecreaseNum; - - private Date createTime; - - private Date billTime; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Double getChargeGoldNum() { - return chargeGoldNum; - } - - public void setChargeGoldNum(Double chargeGoldNum) { - this.chargeGoldNum = chargeGoldNum; - } - - public Double getNobleGoldNum() { - return nobleGoldNum; - } - - public void setNobleGoldNum(Double nobleGoldNum) { - this.nobleGoldNum = nobleGoldNum; - } - - public Double getGoldNum() { - return goldNum; - } - - public void setGoldNum(Double goldNum) { - this.goldNum = goldNum; - } - - public Double getDiamondNum() { - return diamondNum; - } - - public void setDiamondNum(Double diamondNum) { - this.diamondNum = diamondNum; - } - - public Double getTotalNum() { - return totalNum; - } - - public void setTotalNum(Double totalNum) { - this.totalNum = totalNum; - } - - public Double getGoldIncreaseNum() { - return goldIncreaseNum; - } - - public void setGoldIncreaseNum(Double goldIncreaseNum) { - this.goldIncreaseNum = goldIncreaseNum; - } - - public Double getGoldDecreaseNum() { - return goldDecreaseNum; - } - - public void setGoldDecreaseNum(Double goldDecreaseNum) { - this.goldDecreaseNum = goldDecreaseNum; - } - - public Double getDiamondIncreaseNum() { - return diamondIncreaseNum; - } - - public void setDiamondIncreaseNum(Double diamondIncreaseNum) { - this.diamondIncreaseNum = diamondIncreaseNum; - } - - public Double getDiamondDecreaseNum() { - return diamondDecreaseNum; - } - - public void setDiamondDecreaseNum(Double diamondDecreaseNum) { - this.diamondDecreaseNum = diamondDecreaseNum; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Date getBillTime() { - return billTime; - } - - public void setBillTime(Date billTime) { - this.billTime = billTime; - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/FinanceGoldDiamondDetail.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/FinanceGoldDiamondDetail.java deleted file mode 100644 index 96f2baa63..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/FinanceGoldDiamondDetail.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.accompany.business.model; - -import java.util.Date; - -public class FinanceGoldDiamondDetail { - private Long id; - - private Byte bigObjType; - - private String bigObjTypeName; - - private Byte objType; - - private String objTypeName; - - private Double num; - - private Date createTime; - - private Date billTime; - - private Long relavanceId; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Byte getBigObjType() { - return bigObjType; - } - - public void setBigObjType(Byte bigObjType) { - this.bigObjType = bigObjType; - } - - public String getBigObjTypeName() { - return bigObjTypeName; - } - - public void setBigObjTypeName(String bigObjTypeName) { - this.bigObjTypeName = bigObjTypeName == null ? null : bigObjTypeName.trim(); - } - - public Byte getObjType() { - return objType; - } - - public void setObjType(Byte objType) { - this.objType = objType; - } - - public String getObjTypeName() { - return objTypeName; - } - - public void setObjTypeName(String objTypeName) { - this.objTypeName = objTypeName == null ? null : objTypeName.trim(); - } - - public Double getNum() { - return num; - } - - public void setNum(Double num) { - this.num = num; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Date getBillTime() { - return billTime; - } - - public void setBillTime(Date billTime) { - this.billTime = billTime; - } - - public Long getRelavanceId() { - return relavanceId; - } - - public void setRelavanceId(Long relavanceId) { - this.relavanceId = relavanceId; - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/FinanceGoldDiamondDetailExample.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/FinanceGoldDiamondDetailExample.java deleted file mode 100644 index b9121cbd4..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/FinanceGoldDiamondDetailExample.java +++ /dev/null @@ -1,781 +0,0 @@ -package com.accompany.business.model; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class FinanceGoldDiamondDetailExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - private Integer limit; - - private Integer offset; - - public FinanceGoldDiamondDetailExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - public void setLimit(Integer limit) { - this.limit = limit; - } - - public Integer getLimit() { - return limit; - } - - public void setOffset(Integer offset) { - this.offset = offset; - } - - public Integer getOffset() { - return offset; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(Long value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(Long value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(Long value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(Long value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(Long value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(Long value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(Long value1, Long value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(Long value1, Long value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andBigObjTypeIsNull() { - addCriterion("big_obj_type is null"); - return (Criteria) this; - } - - public Criteria andBigObjTypeIsNotNull() { - addCriterion("big_obj_type is not null"); - return (Criteria) this; - } - - public Criteria andBigObjTypeEqualTo(Byte value) { - addCriterion("big_obj_type =", value, "bigObjType"); - return (Criteria) this; - } - - public Criteria andBigObjTypeNotEqualTo(Byte value) { - addCriterion("big_obj_type <>", value, "bigObjType"); - return (Criteria) this; - } - - public Criteria andBigObjTypeGreaterThan(Byte value) { - addCriterion("big_obj_type >", value, "bigObjType"); - return (Criteria) this; - } - - public Criteria andBigObjTypeGreaterThanOrEqualTo(Byte value) { - addCriterion("big_obj_type >=", value, "bigObjType"); - return (Criteria) this; - } - - public Criteria andBigObjTypeLessThan(Byte value) { - addCriterion("big_obj_type <", value, "bigObjType"); - return (Criteria) this; - } - - public Criteria andBigObjTypeLessThanOrEqualTo(Byte value) { - addCriterion("big_obj_type <=", value, "bigObjType"); - return (Criteria) this; - } - - public Criteria andBigObjTypeIn(List values) { - addCriterion("big_obj_type in", values, "bigObjType"); - return (Criteria) this; - } - - public Criteria andBigObjTypeNotIn(List values) { - addCriterion("big_obj_type not in", values, "bigObjType"); - return (Criteria) this; - } - - public Criteria andBigObjTypeBetween(Byte value1, Byte value2) { - addCriterion("big_obj_type between", value1, value2, "bigObjType"); - return (Criteria) this; - } - - public Criteria andBigObjTypeNotBetween(Byte value1, Byte value2) { - addCriterion("big_obj_type not between", value1, value2, "bigObjType"); - return (Criteria) this; - } - - public Criteria andBigObjTypeNameIsNull() { - addCriterion("big_obj_type_name is null"); - return (Criteria) this; - } - - public Criteria andBigObjTypeNameIsNotNull() { - addCriterion("big_obj_type_name is not null"); - return (Criteria) this; - } - - public Criteria andBigObjTypeNameEqualTo(String value) { - addCriterion("big_obj_type_name =", value, "bigObjTypeName"); - return (Criteria) this; - } - - public Criteria andBigObjTypeNameNotEqualTo(String value) { - addCriterion("big_obj_type_name <>", value, "bigObjTypeName"); - return (Criteria) this; - } - - public Criteria andBigObjTypeNameGreaterThan(String value) { - addCriterion("big_obj_type_name >", value, "bigObjTypeName"); - return (Criteria) this; - } - - public Criteria andBigObjTypeNameGreaterThanOrEqualTo(String value) { - addCriterion("big_obj_type_name >=", value, "bigObjTypeName"); - return (Criteria) this; - } - - public Criteria andBigObjTypeNameLessThan(String value) { - addCriterion("big_obj_type_name <", value, "bigObjTypeName"); - return (Criteria) this; - } - - public Criteria andBigObjTypeNameLessThanOrEqualTo(String value) { - addCriterion("big_obj_type_name <=", value, "bigObjTypeName"); - return (Criteria) this; - } - - public Criteria andBigObjTypeNameLike(String value) { - addCriterion("big_obj_type_name like", value, "bigObjTypeName"); - return (Criteria) this; - } - - public Criteria andBigObjTypeNameNotLike(String value) { - addCriterion("big_obj_type_name not like", value, "bigObjTypeName"); - return (Criteria) this; - } - - public Criteria andBigObjTypeNameIn(List values) { - addCriterion("big_obj_type_name in", values, "bigObjTypeName"); - return (Criteria) this; - } - - public Criteria andBigObjTypeNameNotIn(List values) { - addCriterion("big_obj_type_name not in", values, "bigObjTypeName"); - return (Criteria) this; - } - - public Criteria andBigObjTypeNameBetween(String value1, String value2) { - addCriterion("big_obj_type_name between", value1, value2, "bigObjTypeName"); - return (Criteria) this; - } - - public Criteria andBigObjTypeNameNotBetween(String value1, String value2) { - addCriterion("big_obj_type_name not between", value1, value2, "bigObjTypeName"); - return (Criteria) this; - } - - public Criteria andObjTypeIsNull() { - addCriterion("obj_type is null"); - return (Criteria) this; - } - - public Criteria andObjTypeIsNotNull() { - addCriterion("obj_type is not null"); - return (Criteria) this; - } - - public Criteria andObjTypeEqualTo(Byte value) { - addCriterion("obj_type =", value, "objType"); - return (Criteria) this; - } - - public Criteria andObjTypeNotEqualTo(Byte value) { - addCriterion("obj_type <>", value, "objType"); - return (Criteria) this; - } - - public Criteria andObjTypeGreaterThan(Byte value) { - addCriterion("obj_type >", value, "objType"); - return (Criteria) this; - } - - public Criteria andObjTypeGreaterThanOrEqualTo(Byte value) { - addCriterion("obj_type >=", value, "objType"); - return (Criteria) this; - } - - public Criteria andObjTypeLessThan(Byte value) { - addCriterion("obj_type <", value, "objType"); - return (Criteria) this; - } - - public Criteria andObjTypeLessThanOrEqualTo(Byte value) { - addCriterion("obj_type <=", value, "objType"); - return (Criteria) this; - } - - public Criteria andObjTypeIn(List values) { - addCriterion("obj_type in", values, "objType"); - return (Criteria) this; - } - - public Criteria andObjTypeNotIn(List values) { - addCriterion("obj_type not in", values, "objType"); - return (Criteria) this; - } - - public Criteria andObjTypeBetween(Byte value1, Byte value2) { - addCriterion("obj_type between", value1, value2, "objType"); - return (Criteria) this; - } - - public Criteria andObjTypeNotBetween(Byte value1, Byte value2) { - addCriterion("obj_type not between", value1, value2, "objType"); - return (Criteria) this; - } - - public Criteria andObjTypeNameIsNull() { - addCriterion("obj_type_name is null"); - return (Criteria) this; - } - - public Criteria andObjTypeNameIsNotNull() { - addCriterion("obj_type_name is not null"); - return (Criteria) this; - } - - public Criteria andObjTypeNameEqualTo(String value) { - addCriterion("obj_type_name =", value, "objTypeName"); - return (Criteria) this; - } - - public Criteria andObjTypeNameNotEqualTo(String value) { - addCriterion("obj_type_name <>", value, "objTypeName"); - return (Criteria) this; - } - - public Criteria andObjTypeNameGreaterThan(String value) { - addCriterion("obj_type_name >", value, "objTypeName"); - return (Criteria) this; - } - - public Criteria andObjTypeNameGreaterThanOrEqualTo(String value) { - addCriterion("obj_type_name >=", value, "objTypeName"); - return (Criteria) this; - } - - public Criteria andObjTypeNameLessThan(String value) { - addCriterion("obj_type_name <", value, "objTypeName"); - return (Criteria) this; - } - - public Criteria andObjTypeNameLessThanOrEqualTo(String value) { - addCriterion("obj_type_name <=", value, "objTypeName"); - return (Criteria) this; - } - - public Criteria andObjTypeNameLike(String value) { - addCriterion("obj_type_name like", value, "objTypeName"); - return (Criteria) this; - } - - public Criteria andObjTypeNameNotLike(String value) { - addCriterion("obj_type_name not like", value, "objTypeName"); - return (Criteria) this; - } - - public Criteria andObjTypeNameIn(List values) { - addCriterion("obj_type_name in", values, "objTypeName"); - return (Criteria) this; - } - - public Criteria andObjTypeNameNotIn(List values) { - addCriterion("obj_type_name not in", values, "objTypeName"); - return (Criteria) this; - } - - public Criteria andObjTypeNameBetween(String value1, String value2) { - addCriterion("obj_type_name between", value1, value2, "objTypeName"); - return (Criteria) this; - } - - public Criteria andObjTypeNameNotBetween(String value1, String value2) { - addCriterion("obj_type_name not between", value1, value2, "objTypeName"); - return (Criteria) this; - } - - public Criteria andNumIsNull() { - addCriterion("num is null"); - return (Criteria) this; - } - - public Criteria andNumIsNotNull() { - addCriterion("num is not null"); - return (Criteria) this; - } - - public Criteria andNumEqualTo(Double value) { - addCriterion("num =", value, "num"); - return (Criteria) this; - } - - public Criteria andNumNotEqualTo(Double value) { - addCriterion("num <>", value, "num"); - return (Criteria) this; - } - - public Criteria andNumGreaterThan(Double value) { - addCriterion("num >", value, "num"); - return (Criteria) this; - } - - public Criteria andNumGreaterThanOrEqualTo(Double value) { - addCriterion("num >=", value, "num"); - return (Criteria) this; - } - - public Criteria andNumLessThan(Double value) { - addCriterion("num <", value, "num"); - return (Criteria) this; - } - - public Criteria andNumLessThanOrEqualTo(Double value) { - addCriterion("num <=", value, "num"); - return (Criteria) this; - } - - public Criteria andNumIn(List values) { - addCriterion("num in", values, "num"); - return (Criteria) this; - } - - public Criteria andNumNotIn(List values) { - addCriterion("num not in", values, "num"); - return (Criteria) this; - } - - public Criteria andNumBetween(Double value1, Double value2) { - addCriterion("num between", value1, value2, "num"); - return (Criteria) this; - } - - public Criteria andNumNotBetween(Double value1, Double value2) { - addCriterion("num not between", value1, value2, "num"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(Date value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(Date value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(Date value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(Date value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(Date value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(Date value1, Date value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(Date value1, Date value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andBillTimeIsNull() { - addCriterion("bill_time is null"); - return (Criteria) this; - } - - public Criteria andBillTimeIsNotNull() { - addCriterion("bill_time is not null"); - return (Criteria) this; - } - - public Criteria andBillTimeEqualTo(Date value) { - addCriterion("bill_time =", value, "billTime"); - return (Criteria) this; - } - - public Criteria andBillTimeNotEqualTo(Date value) { - addCriterion("bill_time <>", value, "billTime"); - return (Criteria) this; - } - - public Criteria andBillTimeGreaterThan(Date value) { - addCriterion("bill_time >", value, "billTime"); - return (Criteria) this; - } - - public Criteria andBillTimeGreaterThanOrEqualTo(Date value) { - addCriterion("bill_time >=", value, "billTime"); - return (Criteria) this; - } - - public Criteria andBillTimeLessThan(Date value) { - addCriterion("bill_time <", value, "billTime"); - return (Criteria) this; - } - - public Criteria andBillTimeLessThanOrEqualTo(Date value) { - addCriterion("bill_time <=", value, "billTime"); - return (Criteria) this; - } - - public Criteria andBillTimeIn(List values) { - addCriterion("bill_time in", values, "billTime"); - return (Criteria) this; - } - - public Criteria andBillTimeNotIn(List values) { - addCriterion("bill_time not in", values, "billTime"); - return (Criteria) this; - } - - public Criteria andBillTimeBetween(Date value1, Date value2) { - addCriterion("bill_time between", value1, value2, "billTime"); - return (Criteria) this; - } - - public Criteria andBillTimeNotBetween(Date value1, Date value2) { - addCriterion("bill_time not between", value1, value2, "billTime"); - return (Criteria) this; - } - - public Criteria andRelavanceIdIsNull() { - addCriterion("relavance_id is null"); - return (Criteria) this; - } - - public Criteria andRelavanceIdIsNotNull() { - addCriterion("relavance_id is not null"); - return (Criteria) this; - } - - public Criteria andRelavanceIdEqualTo(Long value) { - addCriterion("relavance_id =", value, "relavanceId"); - return (Criteria) this; - } - - public Criteria andRelavanceIdNotEqualTo(Long value) { - addCriterion("relavance_id <>", value, "relavanceId"); - return (Criteria) this; - } - - public Criteria andRelavanceIdGreaterThan(Long value) { - addCriterion("relavance_id >", value, "relavanceId"); - return (Criteria) this; - } - - public Criteria andRelavanceIdGreaterThanOrEqualTo(Long value) { - addCriterion("relavance_id >=", value, "relavanceId"); - return (Criteria) this; - } - - public Criteria andRelavanceIdLessThan(Long value) { - addCriterion("relavance_id <", value, "relavanceId"); - return (Criteria) this; - } - - public Criteria andRelavanceIdLessThanOrEqualTo(Long value) { - addCriterion("relavance_id <=", value, "relavanceId"); - return (Criteria) this; - } - - public Criteria andRelavanceIdIn(List values) { - addCriterion("relavance_id in", values, "relavanceId"); - return (Criteria) this; - } - - public Criteria andRelavanceIdNotIn(List values) { - addCriterion("relavance_id not in", values, "relavanceId"); - return (Criteria) this; - } - - public Criteria andRelavanceIdBetween(Long value1, Long value2) { - addCriterion("relavance_id between", value1, value2, "relavanceId"); - return (Criteria) this; - } - - public Criteria andRelavanceIdNotBetween(Long value1, Long value2) { - addCriterion("relavance_id not between", value1, value2, "relavanceId"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/FinanceGoldDiamondExample.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/FinanceGoldDiamondExample.java deleted file mode 100644 index 7fdff8d07..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/FinanceGoldDiamondExample.java +++ /dev/null @@ -1,941 +0,0 @@ -package com.accompany.business.model; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class FinanceGoldDiamondExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - private Integer limit; - - private Integer offset; - - public FinanceGoldDiamondExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - public void setLimit(Integer limit) { - this.limit = limit; - } - - public Integer getLimit() { - return limit; - } - - public void setOffset(Integer offset) { - this.offset = offset; - } - - public Integer getOffset() { - return offset; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(Long value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(Long value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(Long value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(Long value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(Long value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(Long value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(Long value1, Long value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(Long value1, Long value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andChargeGoldNumIsNull() { - addCriterion("charge_gold_num is null"); - return (Criteria) this; - } - - public Criteria andChargeGoldNumIsNotNull() { - addCriterion("charge_gold_num is not null"); - return (Criteria) this; - } - - public Criteria andChargeGoldNumEqualTo(Double value) { - addCriterion("charge_gold_num =", value, "chargeGoldNum"); - return (Criteria) this; - } - - public Criteria andChargeGoldNumNotEqualTo(Double value) { - addCriterion("charge_gold_num <>", value, "chargeGoldNum"); - return (Criteria) this; - } - - public Criteria andChargeGoldNumGreaterThan(Double value) { - addCriterion("charge_gold_num >", value, "chargeGoldNum"); - return (Criteria) this; - } - - public Criteria andChargeGoldNumGreaterThanOrEqualTo(Double value) { - addCriterion("charge_gold_num >=", value, "chargeGoldNum"); - return (Criteria) this; - } - - public Criteria andChargeGoldNumLessThan(Double value) { - addCriterion("charge_gold_num <", value, "chargeGoldNum"); - return (Criteria) this; - } - - public Criteria andChargeGoldNumLessThanOrEqualTo(Double value) { - addCriterion("charge_gold_num <=", value, "chargeGoldNum"); - return (Criteria) this; - } - - public Criteria andChargeGoldNumIn(List values) { - addCriterion("charge_gold_num in", values, "chargeGoldNum"); - return (Criteria) this; - } - - public Criteria andChargeGoldNumNotIn(List values) { - addCriterion("charge_gold_num not in", values, "chargeGoldNum"); - return (Criteria) this; - } - - public Criteria andChargeGoldNumBetween(Double value1, Double value2) { - addCriterion("charge_gold_num between", value1, value2, "chargeGoldNum"); - return (Criteria) this; - } - - public Criteria andChargeGoldNumNotBetween(Double value1, Double value2) { - addCriterion("charge_gold_num not between", value1, value2, "chargeGoldNum"); - return (Criteria) this; - } - - public Criteria andNobleGoldNumIsNull() { - addCriterion("noble_gold_num is null"); - return (Criteria) this; - } - - public Criteria andNobleGoldNumIsNotNull() { - addCriterion("noble_gold_num is not null"); - return (Criteria) this; - } - - public Criteria andNobleGoldNumEqualTo(Double value) { - addCriterion("noble_gold_num =", value, "nobleGoldNum"); - return (Criteria) this; - } - - public Criteria andNobleGoldNumNotEqualTo(Double value) { - addCriterion("noble_gold_num <>", value, "nobleGoldNum"); - return (Criteria) this; - } - - public Criteria andNobleGoldNumGreaterThan(Double value) { - addCriterion("noble_gold_num >", value, "nobleGoldNum"); - return (Criteria) this; - } - - public Criteria andNobleGoldNumGreaterThanOrEqualTo(Double value) { - addCriterion("noble_gold_num >=", value, "nobleGoldNum"); - return (Criteria) this; - } - - public Criteria andNobleGoldNumLessThan(Double value) { - addCriterion("noble_gold_num <", value, "nobleGoldNum"); - return (Criteria) this; - } - - public Criteria andNobleGoldNumLessThanOrEqualTo(Double value) { - addCriterion("noble_gold_num <=", value, "nobleGoldNum"); - return (Criteria) this; - } - - public Criteria andNobleGoldNumIn(List values) { - addCriterion("noble_gold_num in", values, "nobleGoldNum"); - return (Criteria) this; - } - - public Criteria andNobleGoldNumNotIn(List values) { - addCriterion("noble_gold_num not in", values, "nobleGoldNum"); - return (Criteria) this; - } - - public Criteria andNobleGoldNumBetween(Double value1, Double value2) { - addCriterion("noble_gold_num between", value1, value2, "nobleGoldNum"); - return (Criteria) this; - } - - public Criteria andNobleGoldNumNotBetween(Double value1, Double value2) { - addCriterion("noble_gold_num not between", value1, value2, "nobleGoldNum"); - return (Criteria) this; - } - - public Criteria andGoldNumIsNull() { - addCriterion("gold_num is null"); - return (Criteria) this; - } - - public Criteria andGoldNumIsNotNull() { - addCriterion("gold_num is not null"); - return (Criteria) this; - } - - public Criteria andGoldNumEqualTo(Double value) { - addCriterion("gold_num =", value, "goldNum"); - return (Criteria) this; - } - - public Criteria andGoldNumNotEqualTo(Double value) { - addCriterion("gold_num <>", value, "goldNum"); - return (Criteria) this; - } - - public Criteria andGoldNumGreaterThan(Double value) { - addCriterion("gold_num >", value, "goldNum"); - return (Criteria) this; - } - - public Criteria andGoldNumGreaterThanOrEqualTo(Double value) { - addCriterion("gold_num >=", value, "goldNum"); - return (Criteria) this; - } - - public Criteria andGoldNumLessThan(Double value) { - addCriterion("gold_num <", value, "goldNum"); - return (Criteria) this; - } - - public Criteria andGoldNumLessThanOrEqualTo(Double value) { - addCriterion("gold_num <=", value, "goldNum"); - return (Criteria) this; - } - - public Criteria andGoldNumIn(List values) { - addCriterion("gold_num in", values, "goldNum"); - return (Criteria) this; - } - - public Criteria andGoldNumNotIn(List values) { - addCriterion("gold_num not in", values, "goldNum"); - return (Criteria) this; - } - - public Criteria andGoldNumBetween(Double value1, Double value2) { - addCriterion("gold_num between", value1, value2, "goldNum"); - return (Criteria) this; - } - - public Criteria andGoldNumNotBetween(Double value1, Double value2) { - addCriterion("gold_num not between", value1, value2, "goldNum"); - return (Criteria) this; - } - - public Criteria andDiamondNumIsNull() { - addCriterion("diamond_num is null"); - return (Criteria) this; - } - - public Criteria andDiamondNumIsNotNull() { - addCriterion("diamond_num is not null"); - return (Criteria) this; - } - - public Criteria andDiamondNumEqualTo(Double value) { - addCriterion("diamond_num =", value, "diamondNum"); - return (Criteria) this; - } - - public Criteria andDiamondNumNotEqualTo(Double value) { - addCriterion("diamond_num <>", value, "diamondNum"); - return (Criteria) this; - } - - public Criteria andDiamondNumGreaterThan(Double value) { - addCriterion("diamond_num >", value, "diamondNum"); - return (Criteria) this; - } - - public Criteria andDiamondNumGreaterThanOrEqualTo(Double value) { - addCriterion("diamond_num >=", value, "diamondNum"); - return (Criteria) this; - } - - public Criteria andDiamondNumLessThan(Double value) { - addCriterion("diamond_num <", value, "diamondNum"); - return (Criteria) this; - } - - public Criteria andDiamondNumLessThanOrEqualTo(Double value) { - addCriterion("diamond_num <=", value, "diamondNum"); - return (Criteria) this; - } - - public Criteria andDiamondNumIn(List values) { - addCriterion("diamond_num in", values, "diamondNum"); - return (Criteria) this; - } - - public Criteria andDiamondNumNotIn(List values) { - addCriterion("diamond_num not in", values, "diamondNum"); - return (Criteria) this; - } - - public Criteria andDiamondNumBetween(Double value1, Double value2) { - addCriterion("diamond_num between", value1, value2, "diamondNum"); - return (Criteria) this; - } - - public Criteria andDiamondNumNotBetween(Double value1, Double value2) { - addCriterion("diamond_num not between", value1, value2, "diamondNum"); - return (Criteria) this; - } - - public Criteria andTotalNumIsNull() { - addCriterion("total_num is null"); - return (Criteria) this; - } - - public Criteria andTotalNumIsNotNull() { - addCriterion("total_num is not null"); - return (Criteria) this; - } - - public Criteria andTotalNumEqualTo(Double value) { - addCriterion("total_num =", value, "totalNum"); - return (Criteria) this; - } - - public Criteria andTotalNumNotEqualTo(Double value) { - addCriterion("total_num <>", value, "totalNum"); - return (Criteria) this; - } - - public Criteria andTotalNumGreaterThan(Double value) { - addCriterion("total_num >", value, "totalNum"); - return (Criteria) this; - } - - public Criteria andTotalNumGreaterThanOrEqualTo(Double value) { - addCriterion("total_num >=", value, "totalNum"); - return (Criteria) this; - } - - public Criteria andTotalNumLessThan(Double value) { - addCriterion("total_num <", value, "totalNum"); - return (Criteria) this; - } - - public Criteria andTotalNumLessThanOrEqualTo(Double value) { - addCriterion("total_num <=", value, "totalNum"); - return (Criteria) this; - } - - public Criteria andTotalNumIn(List values) { - addCriterion("total_num in", values, "totalNum"); - return (Criteria) this; - } - - public Criteria andTotalNumNotIn(List values) { - addCriterion("total_num not in", values, "totalNum"); - return (Criteria) this; - } - - public Criteria andTotalNumBetween(Double value1, Double value2) { - addCriterion("total_num between", value1, value2, "totalNum"); - return (Criteria) this; - } - - public Criteria andTotalNumNotBetween(Double value1, Double value2) { - addCriterion("total_num not between", value1, value2, "totalNum"); - return (Criteria) this; - } - - public Criteria andGoldIncreaseNumIsNull() { - addCriterion("gold_increase_num is null"); - return (Criteria) this; - } - - public Criteria andGoldIncreaseNumIsNotNull() { - addCriterion("gold_increase_num is not null"); - return (Criteria) this; - } - - public Criteria andGoldIncreaseNumEqualTo(Double value) { - addCriterion("gold_increase_num =", value, "goldIncreaseNum"); - return (Criteria) this; - } - - public Criteria andGoldIncreaseNumNotEqualTo(Double value) { - addCriterion("gold_increase_num <>", value, "goldIncreaseNum"); - return (Criteria) this; - } - - public Criteria andGoldIncreaseNumGreaterThan(Double value) { - addCriterion("gold_increase_num >", value, "goldIncreaseNum"); - return (Criteria) this; - } - - public Criteria andGoldIncreaseNumGreaterThanOrEqualTo(Double value) { - addCriterion("gold_increase_num >=", value, "goldIncreaseNum"); - return (Criteria) this; - } - - public Criteria andGoldIncreaseNumLessThan(Double value) { - addCriterion("gold_increase_num <", value, "goldIncreaseNum"); - return (Criteria) this; - } - - public Criteria andGoldIncreaseNumLessThanOrEqualTo(Double value) { - addCriterion("gold_increase_num <=", value, "goldIncreaseNum"); - return (Criteria) this; - } - - public Criteria andGoldIncreaseNumIn(List values) { - addCriterion("gold_increase_num in", values, "goldIncreaseNum"); - return (Criteria) this; - } - - public Criteria andGoldIncreaseNumNotIn(List values) { - addCriterion("gold_increase_num not in", values, "goldIncreaseNum"); - return (Criteria) this; - } - - public Criteria andGoldIncreaseNumBetween(Double value1, Double value2) { - addCriterion("gold_increase_num between", value1, value2, "goldIncreaseNum"); - return (Criteria) this; - } - - public Criteria andGoldIncreaseNumNotBetween(Double value1, Double value2) { - addCriterion("gold_increase_num not between", value1, value2, "goldIncreaseNum"); - return (Criteria) this; - } - - public Criteria andGoldDecreaseNumIsNull() { - addCriterion("gold_decrease_num is null"); - return (Criteria) this; - } - - public Criteria andGoldDecreaseNumIsNotNull() { - addCriterion("gold_decrease_num is not null"); - return (Criteria) this; - } - - public Criteria andGoldDecreaseNumEqualTo(Double value) { - addCriterion("gold_decrease_num =", value, "goldDecreaseNum"); - return (Criteria) this; - } - - public Criteria andGoldDecreaseNumNotEqualTo(Double value) { - addCriterion("gold_decrease_num <>", value, "goldDecreaseNum"); - return (Criteria) this; - } - - public Criteria andGoldDecreaseNumGreaterThan(Double value) { - addCriterion("gold_decrease_num >", value, "goldDecreaseNum"); - return (Criteria) this; - } - - public Criteria andGoldDecreaseNumGreaterThanOrEqualTo(Double value) { - addCriterion("gold_decrease_num >=", value, "goldDecreaseNum"); - return (Criteria) this; - } - - public Criteria andGoldDecreaseNumLessThan(Double value) { - addCriterion("gold_decrease_num <", value, "goldDecreaseNum"); - return (Criteria) this; - } - - public Criteria andGoldDecreaseNumLessThanOrEqualTo(Double value) { - addCriterion("gold_decrease_num <=", value, "goldDecreaseNum"); - return (Criteria) this; - } - - public Criteria andGoldDecreaseNumIn(List values) { - addCriterion("gold_decrease_num in", values, "goldDecreaseNum"); - return (Criteria) this; - } - - public Criteria andGoldDecreaseNumNotIn(List values) { - addCriterion("gold_decrease_num not in", values, "goldDecreaseNum"); - return (Criteria) this; - } - - public Criteria andGoldDecreaseNumBetween(Double value1, Double value2) { - addCriterion("gold_decrease_num between", value1, value2, "goldDecreaseNum"); - return (Criteria) this; - } - - public Criteria andGoldDecreaseNumNotBetween(Double value1, Double value2) { - addCriterion("gold_decrease_num not between", value1, value2, "goldDecreaseNum"); - return (Criteria) this; - } - - public Criteria andDiamondIncreaseNumIsNull() { - addCriterion("diamond_increase_num is null"); - return (Criteria) this; - } - - public Criteria andDiamondIncreaseNumIsNotNull() { - addCriterion("diamond_increase_num is not null"); - return (Criteria) this; - } - - public Criteria andDiamondIncreaseNumEqualTo(Double value) { - addCriterion("diamond_increase_num =", value, "diamondIncreaseNum"); - return (Criteria) this; - } - - public Criteria andDiamondIncreaseNumNotEqualTo(Double value) { - addCriterion("diamond_increase_num <>", value, "diamondIncreaseNum"); - return (Criteria) this; - } - - public Criteria andDiamondIncreaseNumGreaterThan(Double value) { - addCriterion("diamond_increase_num >", value, "diamondIncreaseNum"); - return (Criteria) this; - } - - public Criteria andDiamondIncreaseNumGreaterThanOrEqualTo(Double value) { - addCriterion("diamond_increase_num >=", value, "diamondIncreaseNum"); - return (Criteria) this; - } - - public Criteria andDiamondIncreaseNumLessThan(Double value) { - addCriterion("diamond_increase_num <", value, "diamondIncreaseNum"); - return (Criteria) this; - } - - public Criteria andDiamondIncreaseNumLessThanOrEqualTo(Double value) { - addCriterion("diamond_increase_num <=", value, "diamondIncreaseNum"); - return (Criteria) this; - } - - public Criteria andDiamondIncreaseNumIn(List values) { - addCriterion("diamond_increase_num in", values, "diamondIncreaseNum"); - return (Criteria) this; - } - - public Criteria andDiamondIncreaseNumNotIn(List values) { - addCriterion("diamond_increase_num not in", values, "diamondIncreaseNum"); - return (Criteria) this; - } - - public Criteria andDiamondIncreaseNumBetween(Double value1, Double value2) { - addCriterion("diamond_increase_num between", value1, value2, "diamondIncreaseNum"); - return (Criteria) this; - } - - public Criteria andDiamondIncreaseNumNotBetween(Double value1, Double value2) { - addCriterion("diamond_increase_num not between", value1, value2, "diamondIncreaseNum"); - return (Criteria) this; - } - - public Criteria andDiamondDecreaseNumIsNull() { - addCriterion("diamond_decrease_num is null"); - return (Criteria) this; - } - - public Criteria andDiamondDecreaseNumIsNotNull() { - addCriterion("diamond_decrease_num is not null"); - return (Criteria) this; - } - - public Criteria andDiamondDecreaseNumEqualTo(Double value) { - addCriterion("diamond_decrease_num =", value, "diamondDecreaseNum"); - return (Criteria) this; - } - - public Criteria andDiamondDecreaseNumNotEqualTo(Double value) { - addCriterion("diamond_decrease_num <>", value, "diamondDecreaseNum"); - return (Criteria) this; - } - - public Criteria andDiamondDecreaseNumGreaterThan(Double value) { - addCriterion("diamond_decrease_num >", value, "diamondDecreaseNum"); - return (Criteria) this; - } - - public Criteria andDiamondDecreaseNumGreaterThanOrEqualTo(Double value) { - addCriterion("diamond_decrease_num >=", value, "diamondDecreaseNum"); - return (Criteria) this; - } - - public Criteria andDiamondDecreaseNumLessThan(Double value) { - addCriterion("diamond_decrease_num <", value, "diamondDecreaseNum"); - return (Criteria) this; - } - - public Criteria andDiamondDecreaseNumLessThanOrEqualTo(Double value) { - addCriterion("diamond_decrease_num <=", value, "diamondDecreaseNum"); - return (Criteria) this; - } - - public Criteria andDiamondDecreaseNumIn(List values) { - addCriterion("diamond_decrease_num in", values, "diamondDecreaseNum"); - return (Criteria) this; - } - - public Criteria andDiamondDecreaseNumNotIn(List values) { - addCriterion("diamond_decrease_num not in", values, "diamondDecreaseNum"); - return (Criteria) this; - } - - public Criteria andDiamondDecreaseNumBetween(Double value1, Double value2) { - addCriterion("diamond_decrease_num between", value1, value2, "diamondDecreaseNum"); - return (Criteria) this; - } - - public Criteria andDiamondDecreaseNumNotBetween(Double value1, Double value2) { - addCriterion("diamond_decrease_num not between", value1, value2, "diamondDecreaseNum"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(Date value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(Date value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(Date value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(Date value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(Date value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(Date value1, Date value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(Date value1, Date value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andBillTimeIsNull() { - addCriterion("bill_time is null"); - return (Criteria) this; - } - - public Criteria andBillTimeIsNotNull() { - addCriterion("bill_time is not null"); - return (Criteria) this; - } - - public Criteria andBillTimeEqualTo(Date value) { - addCriterion("bill_time =", value, "billTime"); - return (Criteria) this; - } - - public Criteria andBillTimeNotEqualTo(Date value) { - addCriterion("bill_time <>", value, "billTime"); - return (Criteria) this; - } - - public Criteria andBillTimeGreaterThan(Date value) { - addCriterion("bill_time >", value, "billTime"); - return (Criteria) this; - } - - public Criteria andBillTimeGreaterThanOrEqualTo(Date value) { - addCriterion("bill_time >=", value, "billTime"); - return (Criteria) this; - } - - public Criteria andBillTimeLessThan(Date value) { - addCriterion("bill_time <", value, "billTime"); - return (Criteria) this; - } - - public Criteria andBillTimeLessThanOrEqualTo(Date value) { - addCriterion("bill_time <=", value, "billTime"); - return (Criteria) this; - } - - public Criteria andBillTimeIn(List values) { - addCriterion("bill_time in", values, "billTime"); - return (Criteria) this; - } - - public Criteria andBillTimeNotIn(List values) { - addCriterion("bill_time not in", values, "billTime"); - return (Criteria) this; - } - - public Criteria andBillTimeBetween(Date value1, Date value2) { - addCriterion("bill_time between", value1, value2, "billTime"); - return (Criteria) this; - } - - public Criteria andBillTimeNotBetween(Date value1, Date value2) { - addCriterion("bill_time not between", value1, value2, "billTime"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/FinanceTypeConfig.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/FinanceTypeConfig.java deleted file mode 100644 index 259ef474a..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/FinanceTypeConfig.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.accompany.business.model; - -import java.util.Date; - -public class FinanceTypeConfig { - private Byte objType; - - private String objTypeName; - - private Byte bigObjType; - - private String bigObjTypeName; - - private Date createTime; - - private Boolean statisticsType; - - public Byte getObjType() { - return objType; - } - - public void setObjType(Byte objType) { - this.objType = objType; - } - - public String getObjTypeName() { - return objTypeName; - } - - public void setObjTypeName(String objTypeName) { - this.objTypeName = objTypeName == null ? null : objTypeName.trim(); - } - - public Byte getBigObjType() { - return bigObjType; - } - - public void setBigObjType(Byte bigObjType) { - this.bigObjType = bigObjType; - } - - public String getBigObjTypeName() { - return bigObjTypeName; - } - - public void setBigObjTypeName(String bigObjTypeName) { - this.bigObjTypeName = bigObjTypeName == null ? null : bigObjTypeName.trim(); - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Boolean getStatisticsType() { - return statisticsType; - } - - public void setStatisticsType(Boolean statisticsType) { - this.statisticsType = statisticsType; - } - - @Override - public boolean equals(Object obj) { - FinanceTypeConfig financeTypeConfig = (FinanceTypeConfig) obj; - if (financeTypeConfig.getObjType().intValue() == getObjType().intValue()) - return true; - else { - return false; - } - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/FinanceTypeConfigExample.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/FinanceTypeConfigExample.java deleted file mode 100644 index c40320742..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/FinanceTypeConfigExample.java +++ /dev/null @@ -1,601 +0,0 @@ -package com.accompany.business.model; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class FinanceTypeConfigExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - private Integer limit; - - private Integer offset; - - public FinanceTypeConfigExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - public void setLimit(Integer limit) { - this.limit = limit; - } - - public Integer getLimit() { - return limit; - } - - public void setOffset(Integer offset) { - this.offset = offset; - } - - public Integer getOffset() { - return offset; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andObjTypeIsNull() { - addCriterion("obj_type is null"); - return (Criteria) this; - } - - public Criteria andObjTypeIsNotNull() { - addCriterion("obj_type is not null"); - return (Criteria) this; - } - - public Criteria andObjTypeEqualTo(Byte value) { - addCriterion("obj_type =", value, "objType"); - return (Criteria) this; - } - - public Criteria andObjTypeNotEqualTo(Byte value) { - addCriterion("obj_type <>", value, "objType"); - return (Criteria) this; - } - - public Criteria andObjTypeGreaterThan(Byte value) { - addCriterion("obj_type >", value, "objType"); - return (Criteria) this; - } - - public Criteria andObjTypeGreaterThanOrEqualTo(Byte value) { - addCriterion("obj_type >=", value, "objType"); - return (Criteria) this; - } - - public Criteria andObjTypeLessThan(Byte value) { - addCriterion("obj_type <", value, "objType"); - return (Criteria) this; - } - - public Criteria andObjTypeLessThanOrEqualTo(Byte value) { - addCriterion("obj_type <=", value, "objType"); - return (Criteria) this; - } - - public Criteria andObjTypeIn(List values) { - addCriterion("obj_type in", values, "objType"); - return (Criteria) this; - } - - public Criteria andObjTypeNotIn(List values) { - addCriterion("obj_type not in", values, "objType"); - return (Criteria) this; - } - - public Criteria andObjTypeBetween(Byte value1, Byte value2) { - addCriterion("obj_type between", value1, value2, "objType"); - return (Criteria) this; - } - - public Criteria andObjTypeNotBetween(Byte value1, Byte value2) { - addCriterion("obj_type not between", value1, value2, "objType"); - return (Criteria) this; - } - - public Criteria andObjTypeNameIsNull() { - addCriterion("obj_type_name is null"); - return (Criteria) this; - } - - public Criteria andObjTypeNameIsNotNull() { - addCriterion("obj_type_name is not null"); - return (Criteria) this; - } - - public Criteria andObjTypeNameEqualTo(String value) { - addCriterion("obj_type_name =", value, "objTypeName"); - return (Criteria) this; - } - - public Criteria andObjTypeNameNotEqualTo(String value) { - addCriterion("obj_type_name <>", value, "objTypeName"); - return (Criteria) this; - } - - public Criteria andObjTypeNameGreaterThan(String value) { - addCriterion("obj_type_name >", value, "objTypeName"); - return (Criteria) this; - } - - public Criteria andObjTypeNameGreaterThanOrEqualTo(String value) { - addCriterion("obj_type_name >=", value, "objTypeName"); - return (Criteria) this; - } - - public Criteria andObjTypeNameLessThan(String value) { - addCriterion("obj_type_name <", value, "objTypeName"); - return (Criteria) this; - } - - public Criteria andObjTypeNameLessThanOrEqualTo(String value) { - addCriterion("obj_type_name <=", value, "objTypeName"); - return (Criteria) this; - } - - public Criteria andObjTypeNameLike(String value) { - addCriterion("obj_type_name like", value, "objTypeName"); - return (Criteria) this; - } - - public Criteria andObjTypeNameNotLike(String value) { - addCriterion("obj_type_name not like", value, "objTypeName"); - return (Criteria) this; - } - - public Criteria andObjTypeNameIn(List values) { - addCriterion("obj_type_name in", values, "objTypeName"); - return (Criteria) this; - } - - public Criteria andObjTypeNameNotIn(List values) { - addCriterion("obj_type_name not in", values, "objTypeName"); - return (Criteria) this; - } - - public Criteria andObjTypeNameBetween(String value1, String value2) { - addCriterion("obj_type_name between", value1, value2, "objTypeName"); - return (Criteria) this; - } - - public Criteria andObjTypeNameNotBetween(String value1, String value2) { - addCriterion("obj_type_name not between", value1, value2, "objTypeName"); - return (Criteria) this; - } - - public Criteria andBigObjTypeIsNull() { - addCriterion("big_obj_type is null"); - return (Criteria) this; - } - - public Criteria andBigObjTypeIsNotNull() { - addCriterion("big_obj_type is not null"); - return (Criteria) this; - } - - public Criteria andBigObjTypeEqualTo(Byte value) { - addCriterion("big_obj_type =", value, "bigObjType"); - return (Criteria) this; - } - - public Criteria andBigObjTypeNotEqualTo(Byte value) { - addCriterion("big_obj_type <>", value, "bigObjType"); - return (Criteria) this; - } - - public Criteria andBigObjTypeGreaterThan(Byte value) { - addCriterion("big_obj_type >", value, "bigObjType"); - return (Criteria) this; - } - - public Criteria andBigObjTypeGreaterThanOrEqualTo(Byte value) { - addCriterion("big_obj_type >=", value, "bigObjType"); - return (Criteria) this; - } - - public Criteria andBigObjTypeLessThan(Byte value) { - addCriterion("big_obj_type <", value, "bigObjType"); - return (Criteria) this; - } - - public Criteria andBigObjTypeLessThanOrEqualTo(Byte value) { - addCriterion("big_obj_type <=", value, "bigObjType"); - return (Criteria) this; - } - - public Criteria andBigObjTypeIn(List values) { - addCriterion("big_obj_type in", values, "bigObjType"); - return (Criteria) this; - } - - public Criteria andBigObjTypeNotIn(List values) { - addCriterion("big_obj_type not in", values, "bigObjType"); - return (Criteria) this; - } - - public Criteria andBigObjTypeBetween(Byte value1, Byte value2) { - addCriterion("big_obj_type between", value1, value2, "bigObjType"); - return (Criteria) this; - } - - public Criteria andBigObjTypeNotBetween(Byte value1, Byte value2) { - addCriterion("big_obj_type not between", value1, value2, "bigObjType"); - return (Criteria) this; - } - - public Criteria andBigObjTypeNameIsNull() { - addCriterion("big_obj_type_name is null"); - return (Criteria) this; - } - - public Criteria andBigObjTypeNameIsNotNull() { - addCriterion("big_obj_type_name is not null"); - return (Criteria) this; - } - - public Criteria andBigObjTypeNameEqualTo(String value) { - addCriterion("big_obj_type_name =", value, "bigObjTypeName"); - return (Criteria) this; - } - - public Criteria andBigObjTypeNameNotEqualTo(String value) { - addCriterion("big_obj_type_name <>", value, "bigObjTypeName"); - return (Criteria) this; - } - - public Criteria andBigObjTypeNameGreaterThan(String value) { - addCriterion("big_obj_type_name >", value, "bigObjTypeName"); - return (Criteria) this; - } - - public Criteria andBigObjTypeNameGreaterThanOrEqualTo(String value) { - addCriterion("big_obj_type_name >=", value, "bigObjTypeName"); - return (Criteria) this; - } - - public Criteria andBigObjTypeNameLessThan(String value) { - addCriterion("big_obj_type_name <", value, "bigObjTypeName"); - return (Criteria) this; - } - - public Criteria andBigObjTypeNameLessThanOrEqualTo(String value) { - addCriterion("big_obj_type_name <=", value, "bigObjTypeName"); - return (Criteria) this; - } - - public Criteria andBigObjTypeNameLike(String value) { - addCriterion("big_obj_type_name like", value, "bigObjTypeName"); - return (Criteria) this; - } - - public Criteria andBigObjTypeNameNotLike(String value) { - addCriterion("big_obj_type_name not like", value, "bigObjTypeName"); - return (Criteria) this; - } - - public Criteria andBigObjTypeNameIn(List values) { - addCriterion("big_obj_type_name in", values, "bigObjTypeName"); - return (Criteria) this; - } - - public Criteria andBigObjTypeNameNotIn(List values) { - addCriterion("big_obj_type_name not in", values, "bigObjTypeName"); - return (Criteria) this; - } - - public Criteria andBigObjTypeNameBetween(String value1, String value2) { - addCriterion("big_obj_type_name between", value1, value2, "bigObjTypeName"); - return (Criteria) this; - } - - public Criteria andBigObjTypeNameNotBetween(String value1, String value2) { - addCriterion("big_obj_type_name not between", value1, value2, "bigObjTypeName"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(Date value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(Date value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(Date value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(Date value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(Date value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(Date value1, Date value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(Date value1, Date value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andStatisticsTypeIsNull() { - addCriterion("statistics_type is null"); - return (Criteria) this; - } - - public Criteria andStatisticsTypeIsNotNull() { - addCriterion("statistics_type is not null"); - return (Criteria) this; - } - - public Criteria andStatisticsTypeEqualTo(Boolean value) { - addCriterion("statistics_type =", value, "statisticsType"); - return (Criteria) this; - } - - public Criteria andStatisticsTypeNotEqualTo(Boolean value) { - addCriterion("statistics_type <>", value, "statisticsType"); - return (Criteria) this; - } - - public Criteria andStatisticsTypeGreaterThan(Boolean value) { - addCriterion("statistics_type >", value, "statisticsType"); - return (Criteria) this; - } - - public Criteria andStatisticsTypeGreaterThanOrEqualTo(Boolean value) { - addCriterion("statistics_type >=", value, "statisticsType"); - return (Criteria) this; - } - - public Criteria andStatisticsTypeLessThan(Boolean value) { - addCriterion("statistics_type <", value, "statisticsType"); - return (Criteria) this; - } - - public Criteria andStatisticsTypeLessThanOrEqualTo(Boolean value) { - addCriterion("statistics_type <=", value, "statisticsType"); - return (Criteria) this; - } - - public Criteria andStatisticsTypeIn(List values) { - addCriterion("statistics_type in", values, "statisticsType"); - return (Criteria) this; - } - - public Criteria andStatisticsTypeNotIn(List values) { - addCriterion("statistics_type not in", values, "statisticsType"); - return (Criteria) this; - } - - public Criteria andStatisticsTypeBetween(Boolean value1, Boolean value2) { - addCriterion("statistics_type between", value1, value2, "statisticsType"); - return (Criteria) this; - } - - public Criteria andStatisticsTypeNotBetween(Boolean value1, Boolean value2) { - addCriterion("statistics_type not between", value1, value2, "statisticsType"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/OperationAct.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/OperationAct.java deleted file mode 100644 index 2b61d0819..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/OperationAct.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.accompany.business.model; - -import com.accompany.common.annotation.ReplaceAppDomain; - -import java.util.Date; - -public class OperationAct { - private Integer id; - - private String actTitle; - - private String actDesc; - - @ReplaceAppDomain - private String actImage; - - private Date createTime; - - private Byte status; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getActTitle() { - return actTitle; - } - - public void setActTitle(String actTitle) { - this.actTitle = actTitle == null ? null : actTitle.trim(); - } - - public String getActDesc() { - return actDesc; - } - - public void setActDesc(String actDesc) { - this.actDesc = actDesc == null ? null : actDesc.trim(); - } - - public String getActImage() { - return actImage; - } - - public void setActImage(String actImage) { - this.actImage = actImage == null ? null : actImage.trim(); - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Byte getStatus() { - return status; - } - - public void setStatus(Byte status) { - this.status = status; - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/OperationActExample.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/OperationActExample.java deleted file mode 100644 index 15aa6e7a9..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/OperationActExample.java +++ /dev/null @@ -1,611 +0,0 @@ -package com.accompany.business.model; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class OperationActExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - private Integer limit; - - private Integer offset; - - public OperationActExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - public void setLimit(Integer limit) { - this.limit = limit; - } - - public Integer getLimit() { - return limit; - } - - public void setOffset(Integer offset) { - this.offset = offset; - } - - public Integer getOffset() { - return offset; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(Integer value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(Integer value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(Integer value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(Integer value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(Integer value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(Integer value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(Integer value1, Integer value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(Integer value1, Integer value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andActTitleIsNull() { - addCriterion("act_title is null"); - return (Criteria) this; - } - - public Criteria andActTitleIsNotNull() { - addCriterion("act_title is not null"); - return (Criteria) this; - } - - public Criteria andActTitleEqualTo(String value) { - addCriterion("act_title =", value, "actTitle"); - return (Criteria) this; - } - - public Criteria andActTitleNotEqualTo(String value) { - addCriterion("act_title <>", value, "actTitle"); - return (Criteria) this; - } - - public Criteria andActTitleGreaterThan(String value) { - addCriterion("act_title >", value, "actTitle"); - return (Criteria) this; - } - - public Criteria andActTitleGreaterThanOrEqualTo(String value) { - addCriterion("act_title >=", value, "actTitle"); - return (Criteria) this; - } - - public Criteria andActTitleLessThan(String value) { - addCriterion("act_title <", value, "actTitle"); - return (Criteria) this; - } - - public Criteria andActTitleLessThanOrEqualTo(String value) { - addCriterion("act_title <=", value, "actTitle"); - return (Criteria) this; - } - - public Criteria andActTitleLike(String value) { - addCriterion("act_title like", value, "actTitle"); - return (Criteria) this; - } - - public Criteria andActTitleNotLike(String value) { - addCriterion("act_title not like", value, "actTitle"); - return (Criteria) this; - } - - public Criteria andActTitleIn(List values) { - addCriterion("act_title in", values, "actTitle"); - return (Criteria) this; - } - - public Criteria andActTitleNotIn(List values) { - addCriterion("act_title not in", values, "actTitle"); - return (Criteria) this; - } - - public Criteria andActTitleBetween(String value1, String value2) { - addCriterion("act_title between", value1, value2, "actTitle"); - return (Criteria) this; - } - - public Criteria andActTitleNotBetween(String value1, String value2) { - addCriterion("act_title not between", value1, value2, "actTitle"); - return (Criteria) this; - } - - public Criteria andActDescIsNull() { - addCriterion("act_desc is null"); - return (Criteria) this; - } - - public Criteria andActDescIsNotNull() { - addCriterion("act_desc is not null"); - return (Criteria) this; - } - - public Criteria andActDescEqualTo(String value) { - addCriterion("act_desc =", value, "actDesc"); - return (Criteria) this; - } - - public Criteria andActDescNotEqualTo(String value) { - addCriterion("act_desc <>", value, "actDesc"); - return (Criteria) this; - } - - public Criteria andActDescGreaterThan(String value) { - addCriterion("act_desc >", value, "actDesc"); - return (Criteria) this; - } - - public Criteria andActDescGreaterThanOrEqualTo(String value) { - addCriterion("act_desc >=", value, "actDesc"); - return (Criteria) this; - } - - public Criteria andActDescLessThan(String value) { - addCriterion("act_desc <", value, "actDesc"); - return (Criteria) this; - } - - public Criteria andActDescLessThanOrEqualTo(String value) { - addCriterion("act_desc <=", value, "actDesc"); - return (Criteria) this; - } - - public Criteria andActDescLike(String value) { - addCriterion("act_desc like", value, "actDesc"); - return (Criteria) this; - } - - public Criteria andActDescNotLike(String value) { - addCriterion("act_desc not like", value, "actDesc"); - return (Criteria) this; - } - - public Criteria andActDescIn(List values) { - addCriterion("act_desc in", values, "actDesc"); - return (Criteria) this; - } - - public Criteria andActDescNotIn(List values) { - addCriterion("act_desc not in", values, "actDesc"); - return (Criteria) this; - } - - public Criteria andActDescBetween(String value1, String value2) { - addCriterion("act_desc between", value1, value2, "actDesc"); - return (Criteria) this; - } - - public Criteria andActDescNotBetween(String value1, String value2) { - addCriterion("act_desc not between", value1, value2, "actDesc"); - return (Criteria) this; - } - - public Criteria andActImageIsNull() { - addCriterion("act_image is null"); - return (Criteria) this; - } - - public Criteria andActImageIsNotNull() { - addCriterion("act_image is not null"); - return (Criteria) this; - } - - public Criteria andActImageEqualTo(String value) { - addCriterion("act_image =", value, "actImage"); - return (Criteria) this; - } - - public Criteria andActImageNotEqualTo(String value) { - addCriterion("act_image <>", value, "actImage"); - return (Criteria) this; - } - - public Criteria andActImageGreaterThan(String value) { - addCriterion("act_image >", value, "actImage"); - return (Criteria) this; - } - - public Criteria andActImageGreaterThanOrEqualTo(String value) { - addCriterion("act_image >=", value, "actImage"); - return (Criteria) this; - } - - public Criteria andActImageLessThan(String value) { - addCriterion("act_image <", value, "actImage"); - return (Criteria) this; - } - - public Criteria andActImageLessThanOrEqualTo(String value) { - addCriterion("act_image <=", value, "actImage"); - return (Criteria) this; - } - - public Criteria andActImageLike(String value) { - addCriterion("act_image like", value, "actImage"); - return (Criteria) this; - } - - public Criteria andActImageNotLike(String value) { - addCriterion("act_image not like", value, "actImage"); - return (Criteria) this; - } - - public Criteria andActImageIn(List values) { - addCriterion("act_image in", values, "actImage"); - return (Criteria) this; - } - - public Criteria andActImageNotIn(List values) { - addCriterion("act_image not in", values, "actImage"); - return (Criteria) this; - } - - public Criteria andActImageBetween(String value1, String value2) { - addCriterion("act_image between", value1, value2, "actImage"); - return (Criteria) this; - } - - public Criteria andActImageNotBetween(String value1, String value2) { - addCriterion("act_image not between", value1, value2, "actImage"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(Date value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(Date value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(Date value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(Date value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(Date value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(Date value1, Date value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(Date value1, Date value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andStatusIsNull() { - addCriterion("status is null"); - return (Criteria) this; - } - - public Criteria andStatusIsNotNull() { - addCriterion("status is not null"); - return (Criteria) this; - } - - public Criteria andStatusEqualTo(Byte value) { - addCriterion("status =", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotEqualTo(Byte value) { - addCriterion("status <>", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusGreaterThan(Byte value) { - addCriterion("status >", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusGreaterThanOrEqualTo(Byte value) { - addCriterion("status >=", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLessThan(Byte value) { - addCriterion("status <", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLessThanOrEqualTo(Byte value) { - addCriterion("status <=", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusIn(List values) { - addCriterion("status in", values, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotIn(List values) { - addCriterion("status not in", values, "status"); - return (Criteria) this; - } - - public Criteria andStatusBetween(Byte value1, Byte value2) { - addCriterion("status between", value1, value2, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotBetween(Byte value1, Byte value2) { - addCriterion("status not between", value1, value2, "status"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/OperationSmsRecord.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/OperationSmsRecord.java deleted file mode 100644 index da01b998e..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/OperationSmsRecord.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.accompany.business.model; - -import java.util.Date; - -public class OperationSmsRecord { - private Long recordId; - - private Long uid; - - private String phone; - - private Integer templateId; - - private Integer sendStatus; - - private Date createTime; - - private Date sendTime; - - private String errorMsg; - - private Integer operator; - - public Long getRecordId() { - return recordId; - } - - public void setRecordId(Long recordId) { - this.recordId = recordId; - } - - public Long getUid() { - return uid; - } - - public void setUid(Long uid) { - this.uid = uid; - } - - public String getPhone() { - return phone; - } - - public void setPhone(String phone) { - this.phone = phone == null ? null : phone.trim(); - } - - public Integer getTemplateId() { - return templateId; - } - - public void setTemplateId(Integer templateId) { - this.templateId = templateId; - } - - public Integer getSendStatus() { - return sendStatus; - } - - public void setSendStatus(Integer sendStatus) { - this.sendStatus = sendStatus; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Date getSendTime() { - return sendTime; - } - - public void setSendTime(Date sendTime) { - this.sendTime = sendTime; - } - - public String getErrorMsg() { - return errorMsg; - } - - public void setErrorMsg(String errorMsg) { - this.errorMsg = errorMsg == null ? null : errorMsg.trim(); - } - - public Integer getOperator() { - return operator; - } - - public void setOperator(Integer operator) { - this.operator = operator; - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/OperationSmsRecordExample.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/OperationSmsRecordExample.java deleted file mode 100644 index f4746eb75..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/OperationSmsRecordExample.java +++ /dev/null @@ -1,781 +0,0 @@ -package com.accompany.business.model; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class OperationSmsRecordExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - private Integer limit; - - private Integer offset; - - public OperationSmsRecordExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - public void setLimit(Integer limit) { - this.limit = limit; - } - - public Integer getLimit() { - return limit; - } - - public void setOffset(Integer offset) { - this.offset = offset; - } - - public Integer getOffset() { - return offset; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andRecordIdIsNull() { - addCriterion("record_id is null"); - return (Criteria) this; - } - - public Criteria andRecordIdIsNotNull() { - addCriterion("record_id is not null"); - return (Criteria) this; - } - - public Criteria andRecordIdEqualTo(Long value) { - addCriterion("record_id =", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdNotEqualTo(Long value) { - addCriterion("record_id <>", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdGreaterThan(Long value) { - addCriterion("record_id >", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdGreaterThanOrEqualTo(Long value) { - addCriterion("record_id >=", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdLessThan(Long value) { - addCriterion("record_id <", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdLessThanOrEqualTo(Long value) { - addCriterion("record_id <=", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdIn(List values) { - addCriterion("record_id in", values, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdNotIn(List values) { - addCriterion("record_id not in", values, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdBetween(Long value1, Long value2) { - addCriterion("record_id between", value1, value2, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdNotBetween(Long value1, Long value2) { - addCriterion("record_id not between", value1, value2, "recordId"); - return (Criteria) this; - } - - public Criteria andUidIsNull() { - addCriterion("uid is null"); - return (Criteria) this; - } - - public Criteria andUidIsNotNull() { - addCriterion("uid is not null"); - return (Criteria) this; - } - - public Criteria andUidEqualTo(Long value) { - addCriterion("uid =", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotEqualTo(Long value) { - addCriterion("uid <>", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidGreaterThan(Long value) { - addCriterion("uid >", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidGreaterThanOrEqualTo(Long value) { - addCriterion("uid >=", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidLessThan(Long value) { - addCriterion("uid <", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidLessThanOrEqualTo(Long value) { - addCriterion("uid <=", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidIn(List values) { - addCriterion("uid in", values, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotIn(List values) { - addCriterion("uid not in", values, "uid"); - return (Criteria) this; - } - - public Criteria andUidBetween(Long value1, Long value2) { - addCriterion("uid between", value1, value2, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotBetween(Long value1, Long value2) { - addCriterion("uid not between", value1, value2, "uid"); - return (Criteria) this; - } - - public Criteria andPhoneIsNull() { - addCriterion("phone is null"); - return (Criteria) this; - } - - public Criteria andPhoneIsNotNull() { - addCriterion("phone is not null"); - return (Criteria) this; - } - - public Criteria andPhoneEqualTo(String value) { - addCriterion("phone =", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneNotEqualTo(String value) { - addCriterion("phone <>", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneGreaterThan(String value) { - addCriterion("phone >", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneGreaterThanOrEqualTo(String value) { - addCriterion("phone >=", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneLessThan(String value) { - addCriterion("phone <", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneLessThanOrEqualTo(String value) { - addCriterion("phone <=", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneLike(String value) { - addCriterion("phone like", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneNotLike(String value) { - addCriterion("phone not like", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneIn(List values) { - addCriterion("phone in", values, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneNotIn(List values) { - addCriterion("phone not in", values, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneBetween(String value1, String value2) { - addCriterion("phone between", value1, value2, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneNotBetween(String value1, String value2) { - addCriterion("phone not between", value1, value2, "phone"); - return (Criteria) this; - } - - public Criteria andTemplateIdIsNull() { - addCriterion("template_id is null"); - return (Criteria) this; - } - - public Criteria andTemplateIdIsNotNull() { - addCriterion("template_id is not null"); - return (Criteria) this; - } - - public Criteria andTemplateIdEqualTo(Integer value) { - addCriterion("template_id =", value, "templateId"); - return (Criteria) this; - } - - public Criteria andTemplateIdNotEqualTo(Integer value) { - addCriterion("template_id <>", value, "templateId"); - return (Criteria) this; - } - - public Criteria andTemplateIdGreaterThan(Integer value) { - addCriterion("template_id >", value, "templateId"); - return (Criteria) this; - } - - public Criteria andTemplateIdGreaterThanOrEqualTo(Integer value) { - addCriterion("template_id >=", value, "templateId"); - return (Criteria) this; - } - - public Criteria andTemplateIdLessThan(Integer value) { - addCriterion("template_id <", value, "templateId"); - return (Criteria) this; - } - - public Criteria andTemplateIdLessThanOrEqualTo(Integer value) { - addCriterion("template_id <=", value, "templateId"); - return (Criteria) this; - } - - public Criteria andTemplateIdIn(List values) { - addCriterion("template_id in", values, "templateId"); - return (Criteria) this; - } - - public Criteria andTemplateIdNotIn(List values) { - addCriterion("template_id not in", values, "templateId"); - return (Criteria) this; - } - - public Criteria andTemplateIdBetween(Integer value1, Integer value2) { - addCriterion("template_id between", value1, value2, "templateId"); - return (Criteria) this; - } - - public Criteria andTemplateIdNotBetween(Integer value1, Integer value2) { - addCriterion("template_id not between", value1, value2, "templateId"); - return (Criteria) this; - } - - public Criteria andSendStatusIsNull() { - addCriterion("send_status is null"); - return (Criteria) this; - } - - public Criteria andSendStatusIsNotNull() { - addCriterion("send_status is not null"); - return (Criteria) this; - } - - public Criteria andSendStatusEqualTo(Integer value) { - addCriterion("send_status =", value, "sendStatus"); - return (Criteria) this; - } - - public Criteria andSendStatusNotEqualTo(Integer value) { - addCriterion("send_status <>", value, "sendStatus"); - return (Criteria) this; - } - - public Criteria andSendStatusGreaterThan(Integer value) { - addCriterion("send_status >", value, "sendStatus"); - return (Criteria) this; - } - - public Criteria andSendStatusGreaterThanOrEqualTo(Integer value) { - addCriterion("send_status >=", value, "sendStatus"); - return (Criteria) this; - } - - public Criteria andSendStatusLessThan(Integer value) { - addCriterion("send_status <", value, "sendStatus"); - return (Criteria) this; - } - - public Criteria andSendStatusLessThanOrEqualTo(Integer value) { - addCriterion("send_status <=", value, "sendStatus"); - return (Criteria) this; - } - - public Criteria andSendStatusIn(List values) { - addCriterion("send_status in", values, "sendStatus"); - return (Criteria) this; - } - - public Criteria andSendStatusNotIn(List values) { - addCriterion("send_status not in", values, "sendStatus"); - return (Criteria) this; - } - - public Criteria andSendStatusBetween(Integer value1, Integer value2) { - addCriterion("send_status between", value1, value2, "sendStatus"); - return (Criteria) this; - } - - public Criteria andSendStatusNotBetween(Integer value1, Integer value2) { - addCriterion("send_status not between", value1, value2, "sendStatus"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(Date value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(Date value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(Date value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(Date value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(Date value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(Date value1, Date value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(Date value1, Date value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andSendTimeIsNull() { - addCriterion("send_time is null"); - return (Criteria) this; - } - - public Criteria andSendTimeIsNotNull() { - addCriterion("send_time is not null"); - return (Criteria) this; - } - - public Criteria andSendTimeEqualTo(Date value) { - addCriterion("send_time =", value, "sendTime"); - return (Criteria) this; - } - - public Criteria andSendTimeNotEqualTo(Date value) { - addCriterion("send_time <>", value, "sendTime"); - return (Criteria) this; - } - - public Criteria andSendTimeGreaterThan(Date value) { - addCriterion("send_time >", value, "sendTime"); - return (Criteria) this; - } - - public Criteria andSendTimeGreaterThanOrEqualTo(Date value) { - addCriterion("send_time >=", value, "sendTime"); - return (Criteria) this; - } - - public Criteria andSendTimeLessThan(Date value) { - addCriterion("send_time <", value, "sendTime"); - return (Criteria) this; - } - - public Criteria andSendTimeLessThanOrEqualTo(Date value) { - addCriterion("send_time <=", value, "sendTime"); - return (Criteria) this; - } - - public Criteria andSendTimeIn(List values) { - addCriterion("send_time in", values, "sendTime"); - return (Criteria) this; - } - - public Criteria andSendTimeNotIn(List values) { - addCriterion("send_time not in", values, "sendTime"); - return (Criteria) this; - } - - public Criteria andSendTimeBetween(Date value1, Date value2) { - addCriterion("send_time between", value1, value2, "sendTime"); - return (Criteria) this; - } - - public Criteria andSendTimeNotBetween(Date value1, Date value2) { - addCriterion("send_time not between", value1, value2, "sendTime"); - return (Criteria) this; - } - - public Criteria andErrorMsgIsNull() { - addCriterion("error_msg is null"); - return (Criteria) this; - } - - public Criteria andErrorMsgIsNotNull() { - addCriterion("error_msg is not null"); - return (Criteria) this; - } - - public Criteria andErrorMsgEqualTo(String value) { - addCriterion("error_msg =", value, "errorMsg"); - return (Criteria) this; - } - - public Criteria andErrorMsgNotEqualTo(String value) { - addCriterion("error_msg <>", value, "errorMsg"); - return (Criteria) this; - } - - public Criteria andErrorMsgGreaterThan(String value) { - addCriterion("error_msg >", value, "errorMsg"); - return (Criteria) this; - } - - public Criteria andErrorMsgGreaterThanOrEqualTo(String value) { - addCriterion("error_msg >=", value, "errorMsg"); - return (Criteria) this; - } - - public Criteria andErrorMsgLessThan(String value) { - addCriterion("error_msg <", value, "errorMsg"); - return (Criteria) this; - } - - public Criteria andErrorMsgLessThanOrEqualTo(String value) { - addCriterion("error_msg <=", value, "errorMsg"); - return (Criteria) this; - } - - public Criteria andErrorMsgLike(String value) { - addCriterion("error_msg like", value, "errorMsg"); - return (Criteria) this; - } - - public Criteria andErrorMsgNotLike(String value) { - addCriterion("error_msg not like", value, "errorMsg"); - return (Criteria) this; - } - - public Criteria andErrorMsgIn(List values) { - addCriterion("error_msg in", values, "errorMsg"); - return (Criteria) this; - } - - public Criteria andErrorMsgNotIn(List values) { - addCriterion("error_msg not in", values, "errorMsg"); - return (Criteria) this; - } - - public Criteria andErrorMsgBetween(String value1, String value2) { - addCriterion("error_msg between", value1, value2, "errorMsg"); - return (Criteria) this; - } - - public Criteria andErrorMsgNotBetween(String value1, String value2) { - addCriterion("error_msg not between", value1, value2, "errorMsg"); - return (Criteria) this; - } - - public Criteria andOperatorIsNull() { - addCriterion("operator is null"); - return (Criteria) this; - } - - public Criteria andOperatorIsNotNull() { - addCriterion("operator is not null"); - return (Criteria) this; - } - - public Criteria andOperatorEqualTo(Integer value) { - addCriterion("operator =", value, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorNotEqualTo(Integer value) { - addCriterion("operator <>", value, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorGreaterThan(Integer value) { - addCriterion("operator >", value, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorGreaterThanOrEqualTo(Integer value) { - addCriterion("operator >=", value, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorLessThan(Integer value) { - addCriterion("operator <", value, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorLessThanOrEqualTo(Integer value) { - addCriterion("operator <=", value, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorIn(List values) { - addCriterion("operator in", values, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorNotIn(List values) { - addCriterion("operator not in", values, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorBetween(Integer value1, Integer value2) { - addCriterion("operator between", value1, value2, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorNotBetween(Integer value1, Integer value2) { - addCriterion("operator not between", value1, value2, "operator"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/PkActRecord.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/PkActRecord.java deleted file mode 100644 index 7cf5c3069..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/PkActRecord.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.accompany.business.model; - -import java.util.Date; - -public class PkActRecord { - private Integer recordId; - - private Long uid; - - private String targetUnionid; - - private String ip; - - private Date createTime; - - public Integer getRecordId() { - return recordId; - } - - public void setRecordId(Integer recordId) { - this.recordId = recordId; - } - - public Long getUid() { - return uid; - } - - public void setUid(Long uid) { - this.uid = uid; - } - - public String getTargetUnionid() { - return targetUnionid; - } - - public void setTargetUnionid(String targetUnionid) { - this.targetUnionid = targetUnionid == null ? null : targetUnionid.trim(); - } - - public String getIp() { - return ip; - } - - public void setIp(String ip) { - this.ip = ip == null ? null : ip.trim(); - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/PkActRecordExample.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/PkActRecordExample.java deleted file mode 100644 index db79dc611..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/PkActRecordExample.java +++ /dev/null @@ -1,541 +0,0 @@ -package com.accompany.business.model; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class PkActRecordExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - private Integer limit; - - private Integer offset; - - public PkActRecordExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - public void setLimit(Integer limit) { - this.limit = limit; - } - - public Integer getLimit() { - return limit; - } - - public void setOffset(Integer offset) { - this.offset = offset; - } - - public Integer getOffset() { - return offset; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andRecordIdIsNull() { - addCriterion("record_id is null"); - return (Criteria) this; - } - - public Criteria andRecordIdIsNotNull() { - addCriterion("record_id is not null"); - return (Criteria) this; - } - - public Criteria andRecordIdEqualTo(Integer value) { - addCriterion("record_id =", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdNotEqualTo(Integer value) { - addCriterion("record_id <>", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdGreaterThan(Integer value) { - addCriterion("record_id >", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdGreaterThanOrEqualTo(Integer value) { - addCriterion("record_id >=", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdLessThan(Integer value) { - addCriterion("record_id <", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdLessThanOrEqualTo(Integer value) { - addCriterion("record_id <=", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdIn(List values) { - addCriterion("record_id in", values, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdNotIn(List values) { - addCriterion("record_id not in", values, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdBetween(Integer value1, Integer value2) { - addCriterion("record_id between", value1, value2, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdNotBetween(Integer value1, Integer value2) { - addCriterion("record_id not between", value1, value2, "recordId"); - return (Criteria) this; - } - - public Criteria andUidIsNull() { - addCriterion("uid is null"); - return (Criteria) this; - } - - public Criteria andUidIsNotNull() { - addCriterion("uid is not null"); - return (Criteria) this; - } - - public Criteria andUidEqualTo(Long value) { - addCriterion("uid =", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotEqualTo(Long value) { - addCriterion("uid <>", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidGreaterThan(Long value) { - addCriterion("uid >", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidGreaterThanOrEqualTo(Long value) { - addCriterion("uid >=", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidLessThan(Long value) { - addCriterion("uid <", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidLessThanOrEqualTo(Long value) { - addCriterion("uid <=", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidIn(List values) { - addCriterion("uid in", values, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotIn(List values) { - addCriterion("uid not in", values, "uid"); - return (Criteria) this; - } - - public Criteria andUidBetween(Long value1, Long value2) { - addCriterion("uid between", value1, value2, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotBetween(Long value1, Long value2) { - addCriterion("uid not between", value1, value2, "uid"); - return (Criteria) this; - } - - public Criteria andTargetUnionidIsNull() { - addCriterion("target_unionid is null"); - return (Criteria) this; - } - - public Criteria andTargetUnionidIsNotNull() { - addCriterion("target_unionid is not null"); - return (Criteria) this; - } - - public Criteria andTargetUnionidEqualTo(String value) { - addCriterion("target_unionid =", value, "targetUnionid"); - return (Criteria) this; - } - - public Criteria andTargetUnionidNotEqualTo(String value) { - addCriterion("target_unionid <>", value, "targetUnionid"); - return (Criteria) this; - } - - public Criteria andTargetUnionidGreaterThan(String value) { - addCriterion("target_unionid >", value, "targetUnionid"); - return (Criteria) this; - } - - public Criteria andTargetUnionidGreaterThanOrEqualTo(String value) { - addCriterion("target_unionid >=", value, "targetUnionid"); - return (Criteria) this; - } - - public Criteria andTargetUnionidLessThan(String value) { - addCriterion("target_unionid <", value, "targetUnionid"); - return (Criteria) this; - } - - public Criteria andTargetUnionidLessThanOrEqualTo(String value) { - addCriterion("target_unionid <=", value, "targetUnionid"); - return (Criteria) this; - } - - public Criteria andTargetUnionidLike(String value) { - addCriterion("target_unionid like", value, "targetUnionid"); - return (Criteria) this; - } - - public Criteria andTargetUnionidNotLike(String value) { - addCriterion("target_unionid not like", value, "targetUnionid"); - return (Criteria) this; - } - - public Criteria andTargetUnionidIn(List values) { - addCriterion("target_unionid in", values, "targetUnionid"); - return (Criteria) this; - } - - public Criteria andTargetUnionidNotIn(List values) { - addCriterion("target_unionid not in", values, "targetUnionid"); - return (Criteria) this; - } - - public Criteria andTargetUnionidBetween(String value1, String value2) { - addCriterion("target_unionid between", value1, value2, "targetUnionid"); - return (Criteria) this; - } - - public Criteria andTargetUnionidNotBetween(String value1, String value2) { - addCriterion("target_unionid not between", value1, value2, "targetUnionid"); - return (Criteria) this; - } - - public Criteria andIpIsNull() { - addCriterion("ip is null"); - return (Criteria) this; - } - - public Criteria andIpIsNotNull() { - addCriterion("ip is not null"); - return (Criteria) this; - } - - public Criteria andIpEqualTo(String value) { - addCriterion("ip =", value, "ip"); - return (Criteria) this; - } - - public Criteria andIpNotEqualTo(String value) { - addCriterion("ip <>", value, "ip"); - return (Criteria) this; - } - - public Criteria andIpGreaterThan(String value) { - addCriterion("ip >", value, "ip"); - return (Criteria) this; - } - - public Criteria andIpGreaterThanOrEqualTo(String value) { - addCriterion("ip >=", value, "ip"); - return (Criteria) this; - } - - public Criteria andIpLessThan(String value) { - addCriterion("ip <", value, "ip"); - return (Criteria) this; - } - - public Criteria andIpLessThanOrEqualTo(String value) { - addCriterion("ip <=", value, "ip"); - return (Criteria) this; - } - - public Criteria andIpLike(String value) { - addCriterion("ip like", value, "ip"); - return (Criteria) this; - } - - public Criteria andIpNotLike(String value) { - addCriterion("ip not like", value, "ip"); - return (Criteria) this; - } - - public Criteria andIpIn(List values) { - addCriterion("ip in", values, "ip"); - return (Criteria) this; - } - - public Criteria andIpNotIn(List values) { - addCriterion("ip not in", values, "ip"); - return (Criteria) this; - } - - public Criteria andIpBetween(String value1, String value2) { - addCriterion("ip between", value1, value2, "ip"); - return (Criteria) this; - } - - public Criteria andIpNotBetween(String value1, String value2) { - addCriterion("ip not between", value1, value2, "ip"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(Date value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(Date value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(Date value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(Date value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(Date value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(Date value1, Date value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(Date value1, Date value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/SysConfExample.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/SysConfExample.java deleted file mode 100644 index 5695b1718..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/SysConfExample.java +++ /dev/null @@ -1,691 +0,0 @@ -package com.accompany.business.model; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class SysConfExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - private Integer limit; - - private Integer offset; - - public SysConfExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - public void setLimit(Integer limit) { - this.limit = limit; - } - - public Integer getLimit() { - return limit; - } - - public void setOffset(Integer offset) { - this.offset = offset; - } - - public Integer getOffset() { - return offset; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andConfigIdIsNull() { - addCriterion("config_id is null"); - return (Criteria) this; - } - - public Criteria andConfigIdIsNotNull() { - addCriterion("config_id is not null"); - return (Criteria) this; - } - - public Criteria andConfigIdEqualTo(String value) { - addCriterion("config_id =", value, "configId"); - return (Criteria) this; - } - - public Criteria andConfigIdNotEqualTo(String value) { - addCriterion("config_id <>", value, "configId"); - return (Criteria) this; - } - - public Criteria andConfigIdGreaterThan(String value) { - addCriterion("config_id >", value, "configId"); - return (Criteria) this; - } - - public Criteria andConfigIdGreaterThanOrEqualTo(String value) { - addCriterion("config_id >=", value, "configId"); - return (Criteria) this; - } - - public Criteria andConfigIdLessThan(String value) { - addCriterion("config_id <", value, "configId"); - return (Criteria) this; - } - - public Criteria andConfigIdLessThanOrEqualTo(String value) { - addCriterion("config_id <=", value, "configId"); - return (Criteria) this; - } - - public Criteria andConfigIdLike(String value) { - addCriterion("config_id like", value, "configId"); - return (Criteria) this; - } - - public Criteria andConfigIdNotLike(String value) { - addCriterion("config_id not like", value, "configId"); - return (Criteria) this; - } - - public Criteria andConfigIdIn(List values) { - addCriterion("config_id in", values, "configId"); - return (Criteria) this; - } - - public Criteria andConfigIdNotIn(List values) { - addCriterion("config_id not in", values, "configId"); - return (Criteria) this; - } - - public Criteria andConfigIdBetween(String value1, String value2) { - addCriterion("config_id between", value1, value2, "configId"); - return (Criteria) this; - } - - public Criteria andConfigIdNotBetween(String value1, String value2) { - addCriterion("config_id not between", value1, value2, "configId"); - return (Criteria) this; - } - - public Criteria andConfigNameIsNull() { - addCriterion("config_name is null"); - return (Criteria) this; - } - - public Criteria andConfigNameIsNotNull() { - addCriterion("config_name is not null"); - return (Criteria) this; - } - - public Criteria andConfigNameEqualTo(String value) { - addCriterion("config_name =", value, "configName"); - return (Criteria) this; - } - - public Criteria andConfigNameNotEqualTo(String value) { - addCriterion("config_name <>", value, "configName"); - return (Criteria) this; - } - - public Criteria andConfigNameGreaterThan(String value) { - addCriterion("config_name >", value, "configName"); - return (Criteria) this; - } - - public Criteria andConfigNameGreaterThanOrEqualTo(String value) { - addCriterion("config_name >=", value, "configName"); - return (Criteria) this; - } - - public Criteria andConfigNameLessThan(String value) { - addCriterion("config_name <", value, "configName"); - return (Criteria) this; - } - - public Criteria andConfigNameLessThanOrEqualTo(String value) { - addCriterion("config_name <=", value, "configName"); - return (Criteria) this; - } - - public Criteria andConfigNameLike(String value) { - addCriterion("config_name like", value, "configName"); - return (Criteria) this; - } - - public Criteria andConfigNameNotLike(String value) { - addCriterion("config_name not like", value, "configName"); - return (Criteria) this; - } - - public Criteria andConfigNameIn(List values) { - addCriterion("config_name in", values, "configName"); - return (Criteria) this; - } - - public Criteria andConfigNameNotIn(List values) { - addCriterion("config_name not in", values, "configName"); - return (Criteria) this; - } - - public Criteria andConfigNameBetween(String value1, String value2) { - addCriterion("config_name between", value1, value2, "configName"); - return (Criteria) this; - } - - public Criteria andConfigNameNotBetween(String value1, String value2) { - addCriterion("config_name not between", value1, value2, "configName"); - return (Criteria) this; - } - - public Criteria andConfigValueIsNull() { - addCriterion("config_value is null"); - return (Criteria) this; - } - - public Criteria andConfigValueIsNotNull() { - addCriterion("config_value is not null"); - return (Criteria) this; - } - - public Criteria andConfigValueEqualTo(String value) { - addCriterion("config_value =", value, "configValue"); - return (Criteria) this; - } - - public Criteria andConfigValueNotEqualTo(String value) { - addCriterion("config_value <>", value, "configValue"); - return (Criteria) this; - } - - public Criteria andConfigValueGreaterThan(String value) { - addCriterion("config_value >", value, "configValue"); - return (Criteria) this; - } - - public Criteria andConfigValueGreaterThanOrEqualTo(String value) { - addCriterion("config_value >=", value, "configValue"); - return (Criteria) this; - } - - public Criteria andConfigValueLessThan(String value) { - addCriterion("config_value <", value, "configValue"); - return (Criteria) this; - } - - public Criteria andConfigValueLessThanOrEqualTo(String value) { - addCriterion("config_value <=", value, "configValue"); - return (Criteria) this; - } - - public Criteria andConfigValueLike(String value) { - addCriterion("config_value like", value, "configValue"); - return (Criteria) this; - } - - public Criteria andConfigValueNotLike(String value) { - addCriterion("config_value not like", value, "configValue"); - return (Criteria) this; - } - - public Criteria andConfigValueIn(List values) { - addCriterion("config_value in", values, "configValue"); - return (Criteria) this; - } - - public Criteria andConfigValueNotIn(List values) { - addCriterion("config_value not in", values, "configValue"); - return (Criteria) this; - } - - public Criteria andConfigValueBetween(String value1, String value2) { - addCriterion("config_value between", value1, value2, "configValue"); - return (Criteria) this; - } - - public Criteria andConfigValueNotBetween(String value1, String value2) { - addCriterion("config_value not between", value1, value2, "configValue"); - return (Criteria) this; - } - - public Criteria andNameSpaceIsNull() { - addCriterion("name_space is null"); - return (Criteria) this; - } - - public Criteria andNameSpaceIsNotNull() { - addCriterion("name_space is not null"); - return (Criteria) this; - } - - public Criteria andNameSpaceEqualTo(String value) { - addCriterion("name_space =", value, "nameSpace"); - return (Criteria) this; - } - - public Criteria andNameSpaceNotEqualTo(String value) { - addCriterion("name_space <>", value, "nameSpace"); - return (Criteria) this; - } - - public Criteria andNameSpaceGreaterThan(String value) { - addCriterion("name_space >", value, "nameSpace"); - return (Criteria) this; - } - - public Criteria andNameSpaceGreaterThanOrEqualTo(String value) { - addCriterion("name_space >=", value, "nameSpace"); - return (Criteria) this; - } - - public Criteria andNameSpaceLessThan(String value) { - addCriterion("name_space <", value, "nameSpace"); - return (Criteria) this; - } - - public Criteria andNameSpaceLessThanOrEqualTo(String value) { - addCriterion("name_space <=", value, "nameSpace"); - return (Criteria) this; - } - - public Criteria andNameSpaceLike(String value) { - addCriterion("name_space like", value, "nameSpace"); - return (Criteria) this; - } - - public Criteria andNameSpaceNotLike(String value) { - addCriterion("name_space not like", value, "nameSpace"); - return (Criteria) this; - } - - public Criteria andNameSpaceIn(List values) { - addCriterion("name_space in", values, "nameSpace"); - return (Criteria) this; - } - - public Criteria andNameSpaceNotIn(List values) { - addCriterion("name_space not in", values, "nameSpace"); - return (Criteria) this; - } - - public Criteria andNameSpaceBetween(String value1, String value2) { - addCriterion("name_space between", value1, value2, "nameSpace"); - return (Criteria) this; - } - - public Criteria andNameSpaceNotBetween(String value1, String value2) { - addCriterion("name_space not between", value1, value2, "nameSpace"); - return (Criteria) this; - } - - public Criteria andConfigStatusIsNull() { - addCriterion("config_status is null"); - return (Criteria) this; - } - - public Criteria andConfigStatusIsNotNull() { - addCriterion("config_status is not null"); - return (Criteria) this; - } - - public Criteria andConfigStatusEqualTo(Byte value) { - addCriterion("config_status =", value, "configStatus"); - return (Criteria) this; - } - - public Criteria andConfigStatusNotEqualTo(Byte value) { - addCriterion("config_status <>", value, "configStatus"); - return (Criteria) this; - } - - public Criteria andConfigStatusGreaterThan(Byte value) { - addCriterion("config_status >", value, "configStatus"); - return (Criteria) this; - } - - public Criteria andConfigStatusGreaterThanOrEqualTo(Byte value) { - addCriterion("config_status >=", value, "configStatus"); - return (Criteria) this; - } - - public Criteria andConfigStatusLessThan(Byte value) { - addCriterion("config_status <", value, "configStatus"); - return (Criteria) this; - } - - public Criteria andConfigStatusLessThanOrEqualTo(Byte value) { - addCriterion("config_status <=", value, "configStatus"); - return (Criteria) this; - } - - public Criteria andConfigStatusIn(List values) { - addCriterion("config_status in", values, "configStatus"); - return (Criteria) this; - } - - public Criteria andConfigStatusNotIn(List values) { - addCriterion("config_status not in", values, "configStatus"); - return (Criteria) this; - } - - public Criteria andConfigStatusBetween(Byte value1, Byte value2) { - addCriterion("config_status between", value1, value2, "configStatus"); - return (Criteria) this; - } - - public Criteria andConfigStatusNotBetween(Byte value1, Byte value2) { - addCriterion("config_status not between", value1, value2, "configStatus"); - return (Criteria) this; - } - - public Criteria andOperatorIsNull() { - addCriterion("`operator` is null"); - return (Criteria) this; - } - - public Criteria andOperatorIsNotNull() { - addCriterion("`operator` is not null"); - return (Criteria) this; - } - - public Criteria andOperatorEqualTo(String value) { - addCriterion("`operator` =", value, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorNotEqualTo(String value) { - addCriterion("`operator` <>", value, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorGreaterThan(String value) { - addCriterion("`operator` >", value, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorGreaterThanOrEqualTo(String value) { - addCriterion("`operator` >=", value, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorLessThan(String value) { - addCriterion("`operator` <", value, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorLessThanOrEqualTo(String value) { - addCriterion("`operator` <=", value, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorLike(String value) { - addCriterion("`operator` like", value, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorNotLike(String value) { - addCriterion("`operator` not like", value, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorIn(List values) { - addCriterion("`operator` in", values, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorNotIn(List values) { - addCriterion("`operator` not in", values, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorBetween(String value1, String value2) { - addCriterion("`operator` between", value1, value2, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorNotBetween(String value1, String value2) { - addCriterion("`operator` not between", value1, value2, "operator"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNull() { - addCriterion("update_time is null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNotNull() { - addCriterion("update_time is not null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeEqualTo(Date value) { - addCriterion("update_time =", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotEqualTo(Date value) { - addCriterion("update_time <>", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThan(Date value) { - addCriterion("update_time >", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("update_time >=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThan(Date value) { - addCriterion("update_time <", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { - addCriterion("update_time <=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIn(List values) { - addCriterion("update_time in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotIn(List values) { - addCriterion("update_time not in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeBetween(Date value1, Date value2) { - addCriterion("update_time between", value1, value2, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { - addCriterion("update_time not between", value1, value2, "updateTime"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/Title.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/Title.java deleted file mode 100644 index 1faba5026..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/Title.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.accompany.business.model; - -import java.util.Date; - -public class Title { - private Long id; - - private String name; - - private Integer seqNo; - - private Boolean status; - - private Byte type; - - private String childClass; - - private Boolean deleteFlag; - - private Date createTime; - - private Date operateTime; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name == null ? null : name.trim(); - } - - public Integer getSeqNo() { - return seqNo; - } - - public void setSeqNo(Integer seqNo) { - this.seqNo = seqNo; - } - - public Boolean getStatus() { - return status; - } - - public void setStatus(Boolean status) { - this.status = status; - } - - public Byte getType() { - return type; - } - - public void setType(Byte type) { - this.type = type; - } - - public String getChildClass() { - return childClass; - } - - public void setChildClass(String childClass) { - this.childClass = childClass == null ? null : childClass.trim(); - } - - public Boolean getDeleteFlag() { - return deleteFlag; - } - - public void setDeleteFlag(Boolean deleteFlag) { - this.deleteFlag = deleteFlag; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Date getOperateTime() { - return operateTime; - } - - public void setOperateTime(Date operateTime) { - this.operateTime = operateTime; - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/TitleExample.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/TitleExample.java deleted file mode 100644 index ddcf77e8d..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/TitleExample.java +++ /dev/null @@ -1,781 +0,0 @@ -package com.accompany.business.model; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class TitleExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - private Integer limit; - - private Integer offset; - - public TitleExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - public void setLimit(Integer limit) { - this.limit = limit; - } - - public Integer getLimit() { - return limit; - } - - public void setOffset(Integer offset) { - this.offset = offset; - } - - public Integer getOffset() { - return offset; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(Long value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(Long value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(Long value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(Long value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(Long value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(Long value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(Long value1, Long value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(Long value1, Long value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andNameIsNull() { - addCriterion("name is null"); - return (Criteria) this; - } - - public Criteria andNameIsNotNull() { - addCriterion("name is not null"); - return (Criteria) this; - } - - public Criteria andNameEqualTo(String value) { - addCriterion("name =", value, "name"); - return (Criteria) this; - } - - public Criteria andNameNotEqualTo(String value) { - addCriterion("name <>", value, "name"); - return (Criteria) this; - } - - public Criteria andNameGreaterThan(String value) { - addCriterion("name >", value, "name"); - return (Criteria) this; - } - - public Criteria andNameGreaterThanOrEqualTo(String value) { - addCriterion("name >=", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLessThan(String value) { - addCriterion("name <", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLessThanOrEqualTo(String value) { - addCriterion("name <=", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLike(String value) { - addCriterion("name like", value, "name"); - return (Criteria) this; - } - - public Criteria andNameNotLike(String value) { - addCriterion("name not like", value, "name"); - return (Criteria) this; - } - - public Criteria andNameIn(List values) { - addCriterion("name in", values, "name"); - return (Criteria) this; - } - - public Criteria andNameNotIn(List values) { - addCriterion("name not in", values, "name"); - return (Criteria) this; - } - - public Criteria andNameBetween(String value1, String value2) { - addCriterion("name between", value1, value2, "name"); - return (Criteria) this; - } - - public Criteria andNameNotBetween(String value1, String value2) { - addCriterion("name not between", value1, value2, "name"); - return (Criteria) this; - } - - public Criteria andSeqNoIsNull() { - addCriterion("seq_no is null"); - return (Criteria) this; - } - - public Criteria andSeqNoIsNotNull() { - addCriterion("seq_no is not null"); - return (Criteria) this; - } - - public Criteria andSeqNoEqualTo(Integer value) { - addCriterion("seq_no =", value, "seqNo"); - return (Criteria) this; - } - - public Criteria andSeqNoNotEqualTo(Integer value) { - addCriterion("seq_no <>", value, "seqNo"); - return (Criteria) this; - } - - public Criteria andSeqNoGreaterThan(Integer value) { - addCriterion("seq_no >", value, "seqNo"); - return (Criteria) this; - } - - public Criteria andSeqNoGreaterThanOrEqualTo(Integer value) { - addCriterion("seq_no >=", value, "seqNo"); - return (Criteria) this; - } - - public Criteria andSeqNoLessThan(Integer value) { - addCriterion("seq_no <", value, "seqNo"); - return (Criteria) this; - } - - public Criteria andSeqNoLessThanOrEqualTo(Integer value) { - addCriterion("seq_no <=", value, "seqNo"); - return (Criteria) this; - } - - public Criteria andSeqNoIn(List values) { - addCriterion("seq_no in", values, "seqNo"); - return (Criteria) this; - } - - public Criteria andSeqNoNotIn(List values) { - addCriterion("seq_no not in", values, "seqNo"); - return (Criteria) this; - } - - public Criteria andSeqNoBetween(Integer value1, Integer value2) { - addCriterion("seq_no between", value1, value2, "seqNo"); - return (Criteria) this; - } - - public Criteria andSeqNoNotBetween(Integer value1, Integer value2) { - addCriterion("seq_no not between", value1, value2, "seqNo"); - return (Criteria) this; - } - - public Criteria andStatusIsNull() { - addCriterion("status is null"); - return (Criteria) this; - } - - public Criteria andStatusIsNotNull() { - addCriterion("status is not null"); - return (Criteria) this; - } - - public Criteria andStatusEqualTo(Boolean value) { - addCriterion("status =", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotEqualTo(Boolean value) { - addCriterion("status <>", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusGreaterThan(Boolean value) { - addCriterion("status >", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusGreaterThanOrEqualTo(Boolean value) { - addCriterion("status >=", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLessThan(Boolean value) { - addCriterion("status <", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLessThanOrEqualTo(Boolean value) { - addCriterion("status <=", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusIn(List values) { - addCriterion("status in", values, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotIn(List values) { - addCriterion("status not in", values, "status"); - return (Criteria) this; - } - - public Criteria andStatusBetween(Boolean value1, Boolean value2) { - addCriterion("status between", value1, value2, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotBetween(Boolean value1, Boolean value2) { - addCriterion("status not between", value1, value2, "status"); - return (Criteria) this; - } - - public Criteria andTypeIsNull() { - addCriterion("type is null"); - return (Criteria) this; - } - - public Criteria andTypeIsNotNull() { - addCriterion("type is not null"); - return (Criteria) this; - } - - public Criteria andTypeEqualTo(Byte value) { - addCriterion("type =", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotEqualTo(Byte value) { - addCriterion("type <>", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeGreaterThan(Byte value) { - addCriterion("type >", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeGreaterThanOrEqualTo(Byte value) { - addCriterion("type >=", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLessThan(Byte value) { - addCriterion("type <", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLessThanOrEqualTo(Byte value) { - addCriterion("type <=", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeIn(List values) { - addCriterion("type in", values, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotIn(List values) { - addCriterion("type not in", values, "type"); - return (Criteria) this; - } - - public Criteria andTypeBetween(Byte value1, Byte value2) { - addCriterion("type between", value1, value2, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotBetween(Byte value1, Byte value2) { - addCriterion("type not between", value1, value2, "type"); - return (Criteria) this; - } - - public Criteria andChildClassIsNull() { - addCriterion("child_class is null"); - return (Criteria) this; - } - - public Criteria andChildClassIsNotNull() { - addCriterion("child_class is not null"); - return (Criteria) this; - } - - public Criteria andChildClassEqualTo(String value) { - addCriterion("child_class =", value, "childClass"); - return (Criteria) this; - } - - public Criteria andChildClassNotEqualTo(String value) { - addCriterion("child_class <>", value, "childClass"); - return (Criteria) this; - } - - public Criteria andChildClassGreaterThan(String value) { - addCriterion("child_class >", value, "childClass"); - return (Criteria) this; - } - - public Criteria andChildClassGreaterThanOrEqualTo(String value) { - addCriterion("child_class >=", value, "childClass"); - return (Criteria) this; - } - - public Criteria andChildClassLessThan(String value) { - addCriterion("child_class <", value, "childClass"); - return (Criteria) this; - } - - public Criteria andChildClassLessThanOrEqualTo(String value) { - addCriterion("child_class <=", value, "childClass"); - return (Criteria) this; - } - - public Criteria andChildClassLike(String value) { - addCriterion("child_class like", value, "childClass"); - return (Criteria) this; - } - - public Criteria andChildClassNotLike(String value) { - addCriterion("child_class not like", value, "childClass"); - return (Criteria) this; - } - - public Criteria andChildClassIn(List values) { - addCriterion("child_class in", values, "childClass"); - return (Criteria) this; - } - - public Criteria andChildClassNotIn(List values) { - addCriterion("child_class not in", values, "childClass"); - return (Criteria) this; - } - - public Criteria andChildClassBetween(String value1, String value2) { - addCriterion("child_class between", value1, value2, "childClass"); - return (Criteria) this; - } - - public Criteria andChildClassNotBetween(String value1, String value2) { - addCriterion("child_class not between", value1, value2, "childClass"); - return (Criteria) this; - } - - public Criteria andDeleteFlagIsNull() { - addCriterion("delete_flag is null"); - return (Criteria) this; - } - - public Criteria andDeleteFlagIsNotNull() { - addCriterion("delete_flag is not null"); - return (Criteria) this; - } - - public Criteria andDeleteFlagEqualTo(Boolean value) { - addCriterion("delete_flag =", value, "deleteFlag"); - return (Criteria) this; - } - - public Criteria andDeleteFlagNotEqualTo(Boolean value) { - addCriterion("delete_flag <>", value, "deleteFlag"); - return (Criteria) this; - } - - public Criteria andDeleteFlagGreaterThan(Boolean value) { - addCriterion("delete_flag >", value, "deleteFlag"); - return (Criteria) this; - } - - public Criteria andDeleteFlagGreaterThanOrEqualTo(Boolean value) { - addCriterion("delete_flag >=", value, "deleteFlag"); - return (Criteria) this; - } - - public Criteria andDeleteFlagLessThan(Boolean value) { - addCriterion("delete_flag <", value, "deleteFlag"); - return (Criteria) this; - } - - public Criteria andDeleteFlagLessThanOrEqualTo(Boolean value) { - addCriterion("delete_flag <=", value, "deleteFlag"); - return (Criteria) this; - } - - public Criteria andDeleteFlagIn(List values) { - addCriterion("delete_flag in", values, "deleteFlag"); - return (Criteria) this; - } - - public Criteria andDeleteFlagNotIn(List values) { - addCriterion("delete_flag not in", values, "deleteFlag"); - return (Criteria) this; - } - - public Criteria andDeleteFlagBetween(Boolean value1, Boolean value2) { - addCriterion("delete_flag between", value1, value2, "deleteFlag"); - return (Criteria) this; - } - - public Criteria andDeleteFlagNotBetween(Boolean value1, Boolean value2) { - addCriterion("delete_flag not between", value1, value2, "deleteFlag"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(Date value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(Date value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(Date value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(Date value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(Date value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(Date value1, Date value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(Date value1, Date value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andOperateTimeIsNull() { - addCriterion("operate_time is null"); - return (Criteria) this; - } - - public Criteria andOperateTimeIsNotNull() { - addCriterion("operate_time is not null"); - return (Criteria) this; - } - - public Criteria andOperateTimeEqualTo(Date value) { - addCriterion("operate_time =", value, "operateTime"); - return (Criteria) this; - } - - public Criteria andOperateTimeNotEqualTo(Date value) { - addCriterion("operate_time <>", value, "operateTime"); - return (Criteria) this; - } - - public Criteria andOperateTimeGreaterThan(Date value) { - addCriterion("operate_time >", value, "operateTime"); - return (Criteria) this; - } - - public Criteria andOperateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("operate_time >=", value, "operateTime"); - return (Criteria) this; - } - - public Criteria andOperateTimeLessThan(Date value) { - addCriterion("operate_time <", value, "operateTime"); - return (Criteria) this; - } - - public Criteria andOperateTimeLessThanOrEqualTo(Date value) { - addCriterion("operate_time <=", value, "operateTime"); - return (Criteria) this; - } - - public Criteria andOperateTimeIn(List values) { - addCriterion("operate_time in", values, "operateTime"); - return (Criteria) this; - } - - public Criteria andOperateTimeNotIn(List values) { - addCriterion("operate_time not in", values, "operateTime"); - return (Criteria) this; - } - - public Criteria andOperateTimeBetween(Date value1, Date value2) { - addCriterion("operate_time between", value1, value2, "operateTime"); - return (Criteria) this; - } - - public Criteria andOperateTimeNotBetween(Date value1, Date value2) { - addCriterion("operate_time not between", value1, value2, "operateTime"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/TopLine.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/TopLine.java deleted file mode 100644 index e17e2ac2c..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/TopLine.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.accompany.business.model; - -import com.accompany.common.annotation.ReplaceAppDomain; - -public class TopLine { - private Long id; - - private String title; - - private Byte type; - - @ReplaceAppDomain - private String img; - - private Byte paramType; - - private String params; - - private Byte isPublish; - - private Long publishTime; - - private String custmeParam; - - private String roomUid; - - private Integer toplineType; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title == null ? null : title.trim(); - } - - public Byte getType() { - return type; - } - - public void setType(Byte type) { - this.type = type; - } - - public String getImg() { - return img; - } - - public void setImg(String img) { - this.img = img == null ? null : img.trim(); - } - - public Byte getParamType() { - return paramType; - } - - public void setParamType(Byte paramType) { - this.paramType = paramType; - } - - public String getParams() { - return params; - } - - public void setParams(String params) { - this.params = params == null ? null : params.trim(); - } - - public Byte getIsPublish() { - return isPublish; - } - - public void setIsPublish(Byte isPublish) { - this.isPublish = isPublish; - } - - public Long getPublishTime() { - return publishTime; - } - - public void setPublishTime(Long publishTime) { - this.publishTime = publishTime; - } - - public String getCustmeParam() { - return custmeParam; - } - - public void setCustmeParam(String custmeParam) { - this.custmeParam = custmeParam == null ? null : custmeParam.trim(); - } - - public String getRoomUid() { - return roomUid; - } - - public void setRoomUid(String roomUid) { - this.roomUid = roomUid == null ? null : roomUid.trim(); - } - - public Integer getToplineType() { - return toplineType; - } - - public void setToplineType(Integer toplineType) { - this.toplineType = toplineType; - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/TopLineExample.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/TopLineExample.java deleted file mode 100644 index 42352be9e..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/TopLineExample.java +++ /dev/null @@ -1,930 +0,0 @@ -package com.accompany.business.model; - -import java.util.ArrayList; -import java.util.List; - -public class TopLineExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - private Integer limit; - - private Integer offset; - - public TopLineExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - public void setLimit(Integer limit) { - this.limit = limit; - } - - public Integer getLimit() { - return limit; - } - - public void setOffset(Integer offset) { - this.offset = offset; - } - - public Integer getOffset() { - return offset; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(Long value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(Long value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(Long value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(Long value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(Long value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(Long value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(Long value1, Long value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(Long value1, Long value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andTitleIsNull() { - addCriterion("title is null"); - return (Criteria) this; - } - - public Criteria andTitleIsNotNull() { - addCriterion("title is not null"); - return (Criteria) this; - } - - public Criteria andTitleEqualTo(String value) { - addCriterion("title =", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleNotEqualTo(String value) { - addCriterion("title <>", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleGreaterThan(String value) { - addCriterion("title >", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleGreaterThanOrEqualTo(String value) { - addCriterion("title >=", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleLessThan(String value) { - addCriterion("title <", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleLessThanOrEqualTo(String value) { - addCriterion("title <=", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleLike(String value) { - addCriterion("title like", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleNotLike(String value) { - addCriterion("title not like", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleIn(List values) { - addCriterion("title in", values, "title"); - return (Criteria) this; - } - - public Criteria andTitleNotIn(List values) { - addCriterion("title not in", values, "title"); - return (Criteria) this; - } - - public Criteria andTitleBetween(String value1, String value2) { - addCriterion("title between", value1, value2, "title"); - return (Criteria) this; - } - - public Criteria andTitleNotBetween(String value1, String value2) { - addCriterion("title not between", value1, value2, "title"); - return (Criteria) this; - } - - public Criteria andTypeIsNull() { - addCriterion("type is null"); - return (Criteria) this; - } - - public Criteria andTypeIsNotNull() { - addCriterion("type is not null"); - return (Criteria) this; - } - - public Criteria andTypeEqualTo(Byte value) { - addCriterion("type =", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotEqualTo(Byte value) { - addCriterion("type <>", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeGreaterThan(Byte value) { - addCriterion("type >", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeGreaterThanOrEqualTo(Byte value) { - addCriterion("type >=", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLessThan(Byte value) { - addCriterion("type <", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLessThanOrEqualTo(Byte value) { - addCriterion("type <=", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeIn(List values) { - addCriterion("type in", values, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotIn(List values) { - addCriterion("type not in", values, "type"); - return (Criteria) this; - } - - public Criteria andTypeBetween(Byte value1, Byte value2) { - addCriterion("type between", value1, value2, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotBetween(Byte value1, Byte value2) { - addCriterion("type not between", value1, value2, "type"); - return (Criteria) this; - } - - public Criteria andImgIsNull() { - addCriterion("img is null"); - return (Criteria) this; - } - - public Criteria andImgIsNotNull() { - addCriterion("img is not null"); - return (Criteria) this; - } - - public Criteria andImgEqualTo(String value) { - addCriterion("img =", value, "img"); - return (Criteria) this; - } - - public Criteria andImgNotEqualTo(String value) { - addCriterion("img <>", value, "img"); - return (Criteria) this; - } - - public Criteria andImgGreaterThan(String value) { - addCriterion("img >", value, "img"); - return (Criteria) this; - } - - public Criteria andImgGreaterThanOrEqualTo(String value) { - addCriterion("img >=", value, "img"); - return (Criteria) this; - } - - public Criteria andImgLessThan(String value) { - addCriterion("img <", value, "img"); - return (Criteria) this; - } - - public Criteria andImgLessThanOrEqualTo(String value) { - addCriterion("img <=", value, "img"); - return (Criteria) this; - } - - public Criteria andImgLike(String value) { - addCriterion("img like", value, "img"); - return (Criteria) this; - } - - public Criteria andImgNotLike(String value) { - addCriterion("img not like", value, "img"); - return (Criteria) this; - } - - public Criteria andImgIn(List values) { - addCriterion("img in", values, "img"); - return (Criteria) this; - } - - public Criteria andImgNotIn(List values) { - addCriterion("img not in", values, "img"); - return (Criteria) this; - } - - public Criteria andImgBetween(String value1, String value2) { - addCriterion("img between", value1, value2, "img"); - return (Criteria) this; - } - - public Criteria andImgNotBetween(String value1, String value2) { - addCriterion("img not between", value1, value2, "img"); - return (Criteria) this; - } - - public Criteria andParamTypeIsNull() { - addCriterion("param_type is null"); - return (Criteria) this; - } - - public Criteria andParamTypeIsNotNull() { - addCriterion("param_type is not null"); - return (Criteria) this; - } - - public Criteria andParamTypeEqualTo(Byte value) { - addCriterion("param_type =", value, "paramType"); - return (Criteria) this; - } - - public Criteria andParamTypeNotEqualTo(Byte value) { - addCriterion("param_type <>", value, "paramType"); - return (Criteria) this; - } - - public Criteria andParamTypeGreaterThan(Byte value) { - addCriterion("param_type >", value, "paramType"); - return (Criteria) this; - } - - public Criteria andParamTypeGreaterThanOrEqualTo(Byte value) { - addCriterion("param_type >=", value, "paramType"); - return (Criteria) this; - } - - public Criteria andParamTypeLessThan(Byte value) { - addCriterion("param_type <", value, "paramType"); - return (Criteria) this; - } - - public Criteria andParamTypeLessThanOrEqualTo(Byte value) { - addCriterion("param_type <=", value, "paramType"); - return (Criteria) this; - } - - public Criteria andParamTypeIn(List values) { - addCriterion("param_type in", values, "paramType"); - return (Criteria) this; - } - - public Criteria andParamTypeNotIn(List values) { - addCriterion("param_type not in", values, "paramType"); - return (Criteria) this; - } - - public Criteria andParamTypeBetween(Byte value1, Byte value2) { - addCriterion("param_type between", value1, value2, "paramType"); - return (Criteria) this; - } - - public Criteria andParamTypeNotBetween(Byte value1, Byte value2) { - addCriterion("param_type not between", value1, value2, "paramType"); - return (Criteria) this; - } - - public Criteria andParamsIsNull() { - addCriterion("params is null"); - return (Criteria) this; - } - - public Criteria andParamsIsNotNull() { - addCriterion("params is not null"); - return (Criteria) this; - } - - public Criteria andParamsEqualTo(String value) { - addCriterion("params =", value, "params"); - return (Criteria) this; - } - - public Criteria andParamsNotEqualTo(String value) { - addCriterion("params <>", value, "params"); - return (Criteria) this; - } - - public Criteria andParamsGreaterThan(String value) { - addCriterion("params >", value, "params"); - return (Criteria) this; - } - - public Criteria andParamsGreaterThanOrEqualTo(String value) { - addCriterion("params >=", value, "params"); - return (Criteria) this; - } - - public Criteria andParamsLessThan(String value) { - addCriterion("params <", value, "params"); - return (Criteria) this; - } - - public Criteria andParamsLessThanOrEqualTo(String value) { - addCriterion("params <=", value, "params"); - return (Criteria) this; - } - - public Criteria andParamsLike(String value) { - addCriterion("params like", value, "params"); - return (Criteria) this; - } - - public Criteria andParamsNotLike(String value) { - addCriterion("params not like", value, "params"); - return (Criteria) this; - } - - public Criteria andParamsIn(List values) { - addCriterion("params in", values, "params"); - return (Criteria) this; - } - - public Criteria andParamsNotIn(List values) { - addCriterion("params not in", values, "params"); - return (Criteria) this; - } - - public Criteria andParamsBetween(String value1, String value2) { - addCriterion("params between", value1, value2, "params"); - return (Criteria) this; - } - - public Criteria andParamsNotBetween(String value1, String value2) { - addCriterion("params not between", value1, value2, "params"); - return (Criteria) this; - } - - public Criteria andIsPublishIsNull() { - addCriterion("is_publish is null"); - return (Criteria) this; - } - - public Criteria andIsPublishIsNotNull() { - addCriterion("is_publish is not null"); - return (Criteria) this; - } - - public Criteria andIsPublishEqualTo(Byte value) { - addCriterion("is_publish =", value, "isPublish"); - return (Criteria) this; - } - - public Criteria andIsPublishNotEqualTo(Byte value) { - addCriterion("is_publish <>", value, "isPublish"); - return (Criteria) this; - } - - public Criteria andIsPublishGreaterThan(Byte value) { - addCriterion("is_publish >", value, "isPublish"); - return (Criteria) this; - } - - public Criteria andIsPublishGreaterThanOrEqualTo(Byte value) { - addCriterion("is_publish >=", value, "isPublish"); - return (Criteria) this; - } - - public Criteria andIsPublishLessThan(Byte value) { - addCriterion("is_publish <", value, "isPublish"); - return (Criteria) this; - } - - public Criteria andIsPublishLessThanOrEqualTo(Byte value) { - addCriterion("is_publish <=", value, "isPublish"); - return (Criteria) this; - } - - public Criteria andIsPublishIn(List values) { - addCriterion("is_publish in", values, "isPublish"); - return (Criteria) this; - } - - public Criteria andIsPublishNotIn(List values) { - addCriterion("is_publish not in", values, "isPublish"); - return (Criteria) this; - } - - public Criteria andIsPublishBetween(Byte value1, Byte value2) { - addCriterion("is_publish between", value1, value2, "isPublish"); - return (Criteria) this; - } - - public Criteria andIsPublishNotBetween(Byte value1, Byte value2) { - addCriterion("is_publish not between", value1, value2, "isPublish"); - return (Criteria) this; - } - - public Criteria andPublishTimeIsNull() { - addCriterion("publish_time is null"); - return (Criteria) this; - } - - public Criteria andPublishTimeIsNotNull() { - addCriterion("publish_time is not null"); - return (Criteria) this; - } - - public Criteria andPublishTimeEqualTo(Long value) { - addCriterion("publish_time =", value, "publishTime"); - return (Criteria) this; - } - - public Criteria andPublishTimeNotEqualTo(Long value) { - addCriterion("publish_time <>", value, "publishTime"); - return (Criteria) this; - } - - public Criteria andPublishTimeGreaterThan(Long value) { - addCriterion("publish_time >", value, "publishTime"); - return (Criteria) this; - } - - public Criteria andPublishTimeGreaterThanOrEqualTo(Long value) { - addCriterion("publish_time >=", value, "publishTime"); - return (Criteria) this; - } - - public Criteria andPublishTimeLessThan(Long value) { - addCriterion("publish_time <", value, "publishTime"); - return (Criteria) this; - } - - public Criteria andPublishTimeLessThanOrEqualTo(Long value) { - addCriterion("publish_time <=", value, "publishTime"); - return (Criteria) this; - } - - public Criteria andPublishTimeIn(List values) { - addCriterion("publish_time in", values, "publishTime"); - return (Criteria) this; - } - - public Criteria andPublishTimeNotIn(List values) { - addCriterion("publish_time not in", values, "publishTime"); - return (Criteria) this; - } - - public Criteria andPublishTimeBetween(Long value1, Long value2) { - addCriterion("publish_time between", value1, value2, "publishTime"); - return (Criteria) this; - } - - public Criteria andPublishTimeNotBetween(Long value1, Long value2) { - addCriterion("publish_time not between", value1, value2, "publishTime"); - return (Criteria) this; - } - - public Criteria andCustmeParamIsNull() { - addCriterion("custme_param is null"); - return (Criteria) this; - } - - public Criteria andCustmeParamIsNotNull() { - addCriterion("custme_param is not null"); - return (Criteria) this; - } - - public Criteria andCustmeParamEqualTo(String value) { - addCriterion("custme_param =", value, "custmeParam"); - return (Criteria) this; - } - - public Criteria andCustmeParamNotEqualTo(String value) { - addCriterion("custme_param <>", value, "custmeParam"); - return (Criteria) this; - } - - public Criteria andCustmeParamGreaterThan(String value) { - addCriterion("custme_param >", value, "custmeParam"); - return (Criteria) this; - } - - public Criteria andCustmeParamGreaterThanOrEqualTo(String value) { - addCriterion("custme_param >=", value, "custmeParam"); - return (Criteria) this; - } - - public Criteria andCustmeParamLessThan(String value) { - addCriterion("custme_param <", value, "custmeParam"); - return (Criteria) this; - } - - public Criteria andCustmeParamLessThanOrEqualTo(String value) { - addCriterion("custme_param <=", value, "custmeParam"); - return (Criteria) this; - } - - public Criteria andCustmeParamLike(String value) { - addCriterion("custme_param like", value, "custmeParam"); - return (Criteria) this; - } - - public Criteria andCustmeParamNotLike(String value) { - addCriterion("custme_param not like", value, "custmeParam"); - return (Criteria) this; - } - - public Criteria andCustmeParamIn(List values) { - addCriterion("custme_param in", values, "custmeParam"); - return (Criteria) this; - } - - public Criteria andCustmeParamNotIn(List values) { - addCriterion("custme_param not in", values, "custmeParam"); - return (Criteria) this; - } - - public Criteria andCustmeParamBetween(String value1, String value2) { - addCriterion("custme_param between", value1, value2, "custmeParam"); - return (Criteria) this; - } - - public Criteria andCustmeParamNotBetween(String value1, String value2) { - addCriterion("custme_param not between", value1, value2, "custmeParam"); - return (Criteria) this; - } - - public Criteria andRoomUidIsNull() { - addCriterion("room_uid is null"); - return (Criteria) this; - } - - public Criteria andRoomUidIsNotNull() { - addCriterion("room_uid is not null"); - return (Criteria) this; - } - - public Criteria andRoomUidEqualTo(String value) { - addCriterion("room_uid =", value, "roomUid"); - return (Criteria) this; - } - - public Criteria andRoomUidNotEqualTo(String value) { - addCriterion("room_uid <>", value, "roomUid"); - return (Criteria) this; - } - - public Criteria andRoomUidGreaterThan(String value) { - addCriterion("room_uid >", value, "roomUid"); - return (Criteria) this; - } - - public Criteria andRoomUidGreaterThanOrEqualTo(String value) { - addCriterion("room_uid >=", value, "roomUid"); - return (Criteria) this; - } - - public Criteria andRoomUidLessThan(String value) { - addCriterion("room_uid <", value, "roomUid"); - return (Criteria) this; - } - - public Criteria andRoomUidLessThanOrEqualTo(String value) { - addCriterion("room_uid <=", value, "roomUid"); - return (Criteria) this; - } - - public Criteria andRoomUidLike(String value) { - addCriterion("room_uid like", value, "roomUid"); - return (Criteria) this; - } - - public Criteria andRoomUidNotLike(String value) { - addCriterion("room_uid not like", value, "roomUid"); - return (Criteria) this; - } - - public Criteria andRoomUidIn(List values) { - addCriterion("room_uid in", values, "roomUid"); - return (Criteria) this; - } - - public Criteria andRoomUidNotIn(List values) { - addCriterion("room_uid not in", values, "roomUid"); - return (Criteria) this; - } - - public Criteria andRoomUidBetween(String value1, String value2) { - addCriterion("room_uid between", value1, value2, "roomUid"); - return (Criteria) this; - } - - public Criteria andRoomUidNotBetween(String value1, String value2) { - addCriterion("room_uid not between", value1, value2, "roomUid"); - return (Criteria) this; - } - - public Criteria andToplineTypeIsNull() { - addCriterion("topline_type is null"); - return (Criteria) this; - } - - public Criteria andToplineTypeIsNotNull() { - addCriterion("topline_type is not null"); - return (Criteria) this; - } - - public Criteria andToplineTypeEqualTo(Integer value) { - addCriterion("topline_type =", value, "toplineType"); - return (Criteria) this; - } - - public Criteria andToplineTypeNotEqualTo(Integer value) { - addCriterion("topline_type <>", value, "toplineType"); - return (Criteria) this; - } - - public Criteria andToplineTypeGreaterThan(Integer value) { - addCriterion("topline_type >", value, "toplineType"); - return (Criteria) this; - } - - public Criteria andToplineTypeGreaterThanOrEqualTo(Integer value) { - addCriterion("topline_type >=", value, "toplineType"); - return (Criteria) this; - } - - public Criteria andToplineTypeLessThan(Integer value) { - addCriterion("topline_type <", value, "toplineType"); - return (Criteria) this; - } - - public Criteria andToplineTypeLessThanOrEqualTo(Integer value) { - addCriterion("topline_type <=", value, "toplineType"); - return (Criteria) this; - } - - public Criteria andToplineTypeIn(List values) { - addCriterion("topline_type in", values, "toplineType"); - return (Criteria) this; - } - - public Criteria andToplineTypeNotIn(List values) { - addCriterion("topline_type not in", values, "toplineType"); - return (Criteria) this; - } - - public Criteria andToplineTypeBetween(Integer value1, Integer value2) { - addCriterion("topline_type between", value1, value2, "toplineType"); - return (Criteria) this; - } - - public Criteria andToplineTypeNotBetween(Integer value1, Integer value2) { - addCriterion("topline_type not between", value1, value2, "toplineType"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/TopicBoxItem.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/TopicBoxItem.java deleted file mode 100644 index e5ccf2960..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/TopicBoxItem.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.accompany.business.model; - -import java.util.Date; - -public class TopicBoxItem { - private Integer id; - - private String content; - - private Integer seqNo; - - private Long operatorId; - - private String operator; - - private Byte status; - - private Date createTime; - - private Date updateTime; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getContent() { - return content; - } - - public void setContent(String content) { - this.content = content == null ? null : content.trim(); - } - - public Integer getSeqNo() { - return seqNo; - } - - public void setSeqNo(Integer seqNo) { - this.seqNo = seqNo; - } - - public Long getOperatorId() { - return operatorId; - } - - public void setOperatorId(Long operatorId) { - this.operatorId = operatorId; - } - - public String getOperator() { - return operator; - } - - public void setOperator(String operator) { - this.operator = operator == null ? null : operator.trim(); - } - - public Byte getStatus() { - return status; - } - - public void setStatus(Byte status) { - this.status = status; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Date getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/TopicBoxItemExample.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/TopicBoxItemExample.java deleted file mode 100644 index 5475bc3b0..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/TopicBoxItemExample.java +++ /dev/null @@ -1,701 +0,0 @@ -package com.accompany.business.model; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class TopicBoxItemExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public TopicBoxItemExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(Integer value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(Integer value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(Integer value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(Integer value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(Integer value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(Integer value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(Integer value1, Integer value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(Integer value1, Integer value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andContentIsNull() { - addCriterion("content is null"); - return (Criteria) this; - } - - public Criteria andContentIsNotNull() { - addCriterion("content is not null"); - return (Criteria) this; - } - - public Criteria andContentEqualTo(String value) { - addCriterion("content =", value, "content"); - return (Criteria) this; - } - - public Criteria andContentNotEqualTo(String value) { - addCriterion("content <>", value, "content"); - return (Criteria) this; - } - - public Criteria andContentGreaterThan(String value) { - addCriterion("content >", value, "content"); - return (Criteria) this; - } - - public Criteria andContentGreaterThanOrEqualTo(String value) { - addCriterion("content >=", value, "content"); - return (Criteria) this; - } - - public Criteria andContentLessThan(String value) { - addCriterion("content <", value, "content"); - return (Criteria) this; - } - - public Criteria andContentLessThanOrEqualTo(String value) { - addCriterion("content <=", value, "content"); - return (Criteria) this; - } - - public Criteria andContentLike(String value) { - addCriterion("content like", value, "content"); - return (Criteria) this; - } - - public Criteria andContentNotLike(String value) { - addCriterion("content not like", value, "content"); - return (Criteria) this; - } - - public Criteria andContentIn(List values) { - addCriterion("content in", values, "content"); - return (Criteria) this; - } - - public Criteria andContentNotIn(List values) { - addCriterion("content not in", values, "content"); - return (Criteria) this; - } - - public Criteria andContentBetween(String value1, String value2) { - addCriterion("content between", value1, value2, "content"); - return (Criteria) this; - } - - public Criteria andContentNotBetween(String value1, String value2) { - addCriterion("content not between", value1, value2, "content"); - return (Criteria) this; - } - - public Criteria andSeqNoIsNull() { - addCriterion("seq_no is null"); - return (Criteria) this; - } - - public Criteria andSeqNoIsNotNull() { - addCriterion("seq_no is not null"); - return (Criteria) this; - } - - public Criteria andSeqNoEqualTo(Integer value) { - addCriterion("seq_no =", value, "seqNo"); - return (Criteria) this; - } - - public Criteria andSeqNoNotEqualTo(Integer value) { - addCriterion("seq_no <>", value, "seqNo"); - return (Criteria) this; - } - - public Criteria andSeqNoGreaterThan(Integer value) { - addCriterion("seq_no >", value, "seqNo"); - return (Criteria) this; - } - - public Criteria andSeqNoGreaterThanOrEqualTo(Integer value) { - addCriterion("seq_no >=", value, "seqNo"); - return (Criteria) this; - } - - public Criteria andSeqNoLessThan(Integer value) { - addCriterion("seq_no <", value, "seqNo"); - return (Criteria) this; - } - - public Criteria andSeqNoLessThanOrEqualTo(Integer value) { - addCriterion("seq_no <=", value, "seqNo"); - return (Criteria) this; - } - - public Criteria andSeqNoIn(List values) { - addCriterion("seq_no in", values, "seqNo"); - return (Criteria) this; - } - - public Criteria andSeqNoNotIn(List values) { - addCriterion("seq_no not in", values, "seqNo"); - return (Criteria) this; - } - - public Criteria andSeqNoBetween(Integer value1, Integer value2) { - addCriterion("seq_no between", value1, value2, "seqNo"); - return (Criteria) this; - } - - public Criteria andSeqNoNotBetween(Integer value1, Integer value2) { - addCriterion("seq_no not between", value1, value2, "seqNo"); - return (Criteria) this; - } - - public Criteria andOperatorIdIsNull() { - addCriterion("operator_id is null"); - return (Criteria) this; - } - - public Criteria andOperatorIdIsNotNull() { - addCriterion("operator_id is not null"); - return (Criteria) this; - } - - public Criteria andOperatorIdEqualTo(Long value) { - addCriterion("operator_id =", value, "operatorId"); - return (Criteria) this; - } - - public Criteria andOperatorIdNotEqualTo(Long value) { - addCriterion("operator_id <>", value, "operatorId"); - return (Criteria) this; - } - - public Criteria andOperatorIdGreaterThan(Long value) { - addCriterion("operator_id >", value, "operatorId"); - return (Criteria) this; - } - - public Criteria andOperatorIdGreaterThanOrEqualTo(Long value) { - addCriterion("operator_id >=", value, "operatorId"); - return (Criteria) this; - } - - public Criteria andOperatorIdLessThan(Long value) { - addCriterion("operator_id <", value, "operatorId"); - return (Criteria) this; - } - - public Criteria andOperatorIdLessThanOrEqualTo(Long value) { - addCriterion("operator_id <=", value, "operatorId"); - return (Criteria) this; - } - - public Criteria andOperatorIdIn(List values) { - addCriterion("operator_id in", values, "operatorId"); - return (Criteria) this; - } - - public Criteria andOperatorIdNotIn(List values) { - addCriterion("operator_id not in", values, "operatorId"); - return (Criteria) this; - } - - public Criteria andOperatorIdBetween(Long value1, Long value2) { - addCriterion("operator_id between", value1, value2, "operatorId"); - return (Criteria) this; - } - - public Criteria andOperatorIdNotBetween(Long value1, Long value2) { - addCriterion("operator_id not between", value1, value2, "operatorId"); - return (Criteria) this; - } - - public Criteria andOperatorIsNull() { - addCriterion("operator is null"); - return (Criteria) this; - } - - public Criteria andOperatorIsNotNull() { - addCriterion("operator is not null"); - return (Criteria) this; - } - - public Criteria andOperatorEqualTo(String value) { - addCriterion("operator =", value, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorNotEqualTo(String value) { - addCriterion("operator <>", value, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorGreaterThan(String value) { - addCriterion("operator >", value, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorGreaterThanOrEqualTo(String value) { - addCriterion("operator >=", value, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorLessThan(String value) { - addCriterion("operator <", value, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorLessThanOrEqualTo(String value) { - addCriterion("operator <=", value, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorLike(String value) { - addCriterion("operator like", value, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorNotLike(String value) { - addCriterion("operator not like", value, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorIn(List values) { - addCriterion("operator in", values, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorNotIn(List values) { - addCriterion("operator not in", values, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorBetween(String value1, String value2) { - addCriterion("operator between", value1, value2, "operator"); - return (Criteria) this; - } - - public Criteria andOperatorNotBetween(String value1, String value2) { - addCriterion("operator not between", value1, value2, "operator"); - return (Criteria) this; - } - - public Criteria andStatusIsNull() { - addCriterion("status is null"); - return (Criteria) this; - } - - public Criteria andStatusIsNotNull() { - addCriterion("status is not null"); - return (Criteria) this; - } - - public Criteria andStatusEqualTo(Byte value) { - addCriterion("status =", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotEqualTo(Byte value) { - addCriterion("status <>", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusGreaterThan(Byte value) { - addCriterion("status >", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusGreaterThanOrEqualTo(Byte value) { - addCriterion("status >=", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLessThan(Byte value) { - addCriterion("status <", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLessThanOrEqualTo(Byte value) { - addCriterion("status <=", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusIn(List values) { - addCriterion("status in", values, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotIn(List values) { - addCriterion("status not in", values, "status"); - return (Criteria) this; - } - - public Criteria andStatusBetween(Byte value1, Byte value2) { - addCriterion("status between", value1, value2, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotBetween(Byte value1, Byte value2) { - addCriterion("status not between", value1, value2, "status"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(Date value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(Date value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(Date value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(Date value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(Date value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(Date value1, Date value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(Date value1, Date value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNull() { - addCriterion("update_time is null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNotNull() { - addCriterion("update_time is not null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeEqualTo(Date value) { - addCriterion("update_time =", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotEqualTo(Date value) { - addCriterion("update_time <>", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThan(Date value) { - addCriterion("update_time >", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("update_time >=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThan(Date value) { - addCriterion("update_time <", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { - addCriterion("update_time <=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIn(List values) { - addCriterion("update_time in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotIn(List values) { - addCriterion("update_time not in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeBetween(Date value1, Date value2) { - addCriterion("update_time between", value1, value2, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { - addCriterion("update_time not between", value1, value2, "updateTime"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/TopicBoxItemVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/TopicBoxItemVo.java deleted file mode 100644 index 7d0534d76..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/TopicBoxItemVo.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.accompany.business.model; - -/** - * ｛这里添加描述｝ - * - * @author fangchengyan - * @date 2019-05-30 17:28 - */ -public class TopicBoxItemVo { - - private Integer id; - - private String content; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getContent() { - return content; - } - - public void setContent(String content) { - this.content = content; - } -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/TopicBoxMsg.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/TopicBoxMsg.java deleted file mode 100644 index b5cbd8f5e..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/TopicBoxMsg.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.accompany.business.model; - -import java.util.Date; - -public class TopicBoxMsg { - private Long id; - - private Long fromUid; - - private Long toUid; - - private Byte type; - - private Date createTime; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Long getFromUid() { - return fromUid; - } - - public void setFromUid(Long fromUid) { - this.fromUid = fromUid; - } - - public Long getToUid() { - return toUid; - } - - public void setToUid(Long toUid) { - this.toUid = toUid; - } - - public Byte getType() { - return type; - } - - public void setType(Byte type) { - this.type = type; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/TopicBoxMsgExample.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/TopicBoxMsgExample.java deleted file mode 100644 index dad69dd54..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/TopicBoxMsgExample.java +++ /dev/null @@ -1,521 +0,0 @@ -package com.accompany.business.model; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class TopicBoxMsgExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - private Integer limit; - - private Integer offset; - - public TopicBoxMsgExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - public void setLimit(Integer limit) { - this.limit = limit; - } - - public Integer getLimit() { - return limit; - } - - public void setOffset(Integer offset) { - this.offset = offset; - } - - public Integer getOffset() { - return offset; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(Long value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(Long value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(Long value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(Long value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(Long value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(Long value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(Long value1, Long value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(Long value1, Long value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andFromUidIsNull() { - addCriterion("from_uid is null"); - return (Criteria) this; - } - - public Criteria andFromUidIsNotNull() { - addCriterion("from_uid is not null"); - return (Criteria) this; - } - - public Criteria andFromUidEqualTo(Long value) { - addCriterion("from_uid =", value, "fromUid"); - return (Criteria) this; - } - - public Criteria andFromUidNotEqualTo(Long value) { - addCriterion("from_uid <>", value, "fromUid"); - return (Criteria) this; - } - - public Criteria andFromUidGreaterThan(Long value) { - addCriterion("from_uid >", value, "fromUid"); - return (Criteria) this; - } - - public Criteria andFromUidGreaterThanOrEqualTo(Long value) { - addCriterion("from_uid >=", value, "fromUid"); - return (Criteria) this; - } - - public Criteria andFromUidLessThan(Long value) { - addCriterion("from_uid <", value, "fromUid"); - return (Criteria) this; - } - - public Criteria andFromUidLessThanOrEqualTo(Long value) { - addCriterion("from_uid <=", value, "fromUid"); - return (Criteria) this; - } - - public Criteria andFromUidIn(List values) { - addCriterion("from_uid in", values, "fromUid"); - return (Criteria) this; - } - - public Criteria andFromUidNotIn(List values) { - addCriterion("from_uid not in", values, "fromUid"); - return (Criteria) this; - } - - public Criteria andFromUidBetween(Long value1, Long value2) { - addCriterion("from_uid between", value1, value2, "fromUid"); - return (Criteria) this; - } - - public Criteria andFromUidNotBetween(Long value1, Long value2) { - addCriterion("from_uid not between", value1, value2, "fromUid"); - return (Criteria) this; - } - - public Criteria andToUidIsNull() { - addCriterion("to_uid is null"); - return (Criteria) this; - } - - public Criteria andToUidIsNotNull() { - addCriterion("to_uid is not null"); - return (Criteria) this; - } - - public Criteria andToUidEqualTo(Long value) { - addCriterion("to_uid =", value, "toUid"); - return (Criteria) this; - } - - public Criteria andToUidNotEqualTo(Long value) { - addCriterion("to_uid <>", value, "toUid"); - return (Criteria) this; - } - - public Criteria andToUidGreaterThan(Long value) { - addCriterion("to_uid >", value, "toUid"); - return (Criteria) this; - } - - public Criteria andToUidGreaterThanOrEqualTo(Long value) { - addCriterion("to_uid >=", value, "toUid"); - return (Criteria) this; - } - - public Criteria andToUidLessThan(Long value) { - addCriterion("to_uid <", value, "toUid"); - return (Criteria) this; - } - - public Criteria andToUidLessThanOrEqualTo(Long value) { - addCriterion("to_uid <=", value, "toUid"); - return (Criteria) this; - } - - public Criteria andToUidIn(List values) { - addCriterion("to_uid in", values, "toUid"); - return (Criteria) this; - } - - public Criteria andToUidNotIn(List values) { - addCriterion("to_uid not in", values, "toUid"); - return (Criteria) this; - } - - public Criteria andToUidBetween(Long value1, Long value2) { - addCriterion("to_uid between", value1, value2, "toUid"); - return (Criteria) this; - } - - public Criteria andToUidNotBetween(Long value1, Long value2) { - addCriterion("to_uid not between", value1, value2, "toUid"); - return (Criteria) this; - } - - public Criteria andTypeIsNull() { - addCriterion("`type` is null"); - return (Criteria) this; - } - - public Criteria andTypeIsNotNull() { - addCriterion("`type` is not null"); - return (Criteria) this; - } - - public Criteria andTypeEqualTo(Byte value) { - addCriterion("`type` =", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotEqualTo(Byte value) { - addCriterion("`type` <>", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeGreaterThan(Byte value) { - addCriterion("`type` >", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeGreaterThanOrEqualTo(Byte value) { - addCriterion("`type` >=", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLessThan(Byte value) { - addCriterion("`type` <", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLessThanOrEqualTo(Byte value) { - addCriterion("`type` <=", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeIn(List values) { - addCriterion("`type` in", values, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotIn(List values) { - addCriterion("`type` not in", values, "type"); - return (Criteria) this; - } - - public Criteria andTypeBetween(Byte value1, Byte value2) { - addCriterion("`type` between", value1, value2, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotBetween(Byte value1, Byte value2) { - addCriterion("`type` not between", value1, value2, "type"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(Date value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(Date value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(Date value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(Date value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(Date value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(Date value1, Date value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(Date value1, Date value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/TopicRoom.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/TopicRoom.java deleted file mode 100644 index a3fae754f..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/TopicRoom.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.accompany.business.model; - -import java.util.Date; - -public class TopicRoom { - private Long id; - - private Long moduleId; - - private Long uid; - - private String name; - - private Integer seqNo; - - private Boolean status; - - private Date createTime; - - private Date updateTime; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Long getModuleId() { - return moduleId; - } - - public void setModuleId(Long moduleId) { - this.moduleId = moduleId; - } - - public Long getUid() { - return uid; - } - - public void setUid(Long uid) { - this.uid = uid; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name == null ? null : name.trim(); - } - - public Integer getSeqNo() { - return seqNo; - } - - public void setSeqNo(Integer seqNo) { - this.seqNo = seqNo; - } - - public Boolean getStatus() { - return status; - } - - public void setStatus(Boolean status) { - this.status = status; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Date getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/TopicRoomExample.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/TopicRoomExample.java deleted file mode 100644 index 8cd8165d2..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/TopicRoomExample.java +++ /dev/null @@ -1,711 +0,0 @@ -package com.accompany.business.model; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class TopicRoomExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - private Integer limit; - - private Integer offset; - - public TopicRoomExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - public void setLimit(Integer limit) { - this.limit = limit; - } - - public Integer getLimit() { - return limit; - } - - public void setOffset(Integer offset) { - this.offset = offset; - } - - public Integer getOffset() { - return offset; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(Long value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(Long value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(Long value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(Long value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(Long value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(Long value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(Long value1, Long value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(Long value1, Long value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andModuleIdIsNull() { - addCriterion("module_id is null"); - return (Criteria) this; - } - - public Criteria andModuleIdIsNotNull() { - addCriterion("module_id is not null"); - return (Criteria) this; - } - - public Criteria andModuleIdEqualTo(Long value) { - addCriterion("module_id =", value, "moduleId"); - return (Criteria) this; - } - - public Criteria andModuleIdNotEqualTo(Long value) { - addCriterion("module_id <>", value, "moduleId"); - return (Criteria) this; - } - - public Criteria andModuleIdGreaterThan(Long value) { - addCriterion("module_id >", value, "moduleId"); - return (Criteria) this; - } - - public Criteria andModuleIdGreaterThanOrEqualTo(Long value) { - addCriterion("module_id >=", value, "moduleId"); - return (Criteria) this; - } - - public Criteria andModuleIdLessThan(Long value) { - addCriterion("module_id <", value, "moduleId"); - return (Criteria) this; - } - - public Criteria andModuleIdLessThanOrEqualTo(Long value) { - addCriterion("module_id <=", value, "moduleId"); - return (Criteria) this; - } - - public Criteria andModuleIdIn(List values) { - addCriterion("module_id in", values, "moduleId"); - return (Criteria) this; - } - - public Criteria andModuleIdNotIn(List values) { - addCriterion("module_id not in", values, "moduleId"); - return (Criteria) this; - } - - public Criteria andModuleIdBetween(Long value1, Long value2) { - addCriterion("module_id between", value1, value2, "moduleId"); - return (Criteria) this; - } - - public Criteria andModuleIdNotBetween(Long value1, Long value2) { - addCriterion("module_id not between", value1, value2, "moduleId"); - return (Criteria) this; - } - - public Criteria andUidIsNull() { - addCriterion("uid is null"); - return (Criteria) this; - } - - public Criteria andUidIsNotNull() { - addCriterion("uid is not null"); - return (Criteria) this; - } - - public Criteria andUidEqualTo(Long value) { - addCriterion("uid =", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotEqualTo(Long value) { - addCriterion("uid <>", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidGreaterThan(Long value) { - addCriterion("uid >", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidGreaterThanOrEqualTo(Long value) { - addCriterion("uid >=", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidLessThan(Long value) { - addCriterion("uid <", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidLessThanOrEqualTo(Long value) { - addCriterion("uid <=", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidIn(List values) { - addCriterion("uid in", values, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotIn(List values) { - addCriterion("uid not in", values, "uid"); - return (Criteria) this; - } - - public Criteria andUidBetween(Long value1, Long value2) { - addCriterion("uid between", value1, value2, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotBetween(Long value1, Long value2) { - addCriterion("uid not between", value1, value2, "uid"); - return (Criteria) this; - } - - public Criteria andNameIsNull() { - addCriterion("name is null"); - return (Criteria) this; - } - - public Criteria andNameIsNotNull() { - addCriterion("name is not null"); - return (Criteria) this; - } - - public Criteria andNameEqualTo(String value) { - addCriterion("name =", value, "name"); - return (Criteria) this; - } - - public Criteria andNameNotEqualTo(String value) { - addCriterion("name <>", value, "name"); - return (Criteria) this; - } - - public Criteria andNameGreaterThan(String value) { - addCriterion("name >", value, "name"); - return (Criteria) this; - } - - public Criteria andNameGreaterThanOrEqualTo(String value) { - addCriterion("name >=", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLessThan(String value) { - addCriterion("name <", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLessThanOrEqualTo(String value) { - addCriterion("name <=", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLike(String value) { - addCriterion("name like", value, "name"); - return (Criteria) this; - } - - public Criteria andNameNotLike(String value) { - addCriterion("name not like", value, "name"); - return (Criteria) this; - } - - public Criteria andNameIn(List values) { - addCriterion("name in", values, "name"); - return (Criteria) this; - } - - public Criteria andNameNotIn(List values) { - addCriterion("name not in", values, "name"); - return (Criteria) this; - } - - public Criteria andNameBetween(String value1, String value2) { - addCriterion("name between", value1, value2, "name"); - return (Criteria) this; - } - - public Criteria andNameNotBetween(String value1, String value2) { - addCriterion("name not between", value1, value2, "name"); - return (Criteria) this; - } - - public Criteria andSeqNoIsNull() { - addCriterion("seq_no is null"); - return (Criteria) this; - } - - public Criteria andSeqNoIsNotNull() { - addCriterion("seq_no is not null"); - return (Criteria) this; - } - - public Criteria andSeqNoEqualTo(Integer value) { - addCriterion("seq_no =", value, "seqNo"); - return (Criteria) this; - } - - public Criteria andSeqNoNotEqualTo(Integer value) { - addCriterion("seq_no <>", value, "seqNo"); - return (Criteria) this; - } - - public Criteria andSeqNoGreaterThan(Integer value) { - addCriterion("seq_no >", value, "seqNo"); - return (Criteria) this; - } - - public Criteria andSeqNoGreaterThanOrEqualTo(Integer value) { - addCriterion("seq_no >=", value, "seqNo"); - return (Criteria) this; - } - - public Criteria andSeqNoLessThan(Integer value) { - addCriterion("seq_no <", value, "seqNo"); - return (Criteria) this; - } - - public Criteria andSeqNoLessThanOrEqualTo(Integer value) { - addCriterion("seq_no <=", value, "seqNo"); - return (Criteria) this; - } - - public Criteria andSeqNoIn(List values) { - addCriterion("seq_no in", values, "seqNo"); - return (Criteria) this; - } - - public Criteria andSeqNoNotIn(List values) { - addCriterion("seq_no not in", values, "seqNo"); - return (Criteria) this; - } - - public Criteria andSeqNoBetween(Integer value1, Integer value2) { - addCriterion("seq_no between", value1, value2, "seqNo"); - return (Criteria) this; - } - - public Criteria andSeqNoNotBetween(Integer value1, Integer value2) { - addCriterion("seq_no not between", value1, value2, "seqNo"); - return (Criteria) this; - } - - public Criteria andStatusIsNull() { - addCriterion("status is null"); - return (Criteria) this; - } - - public Criteria andStatusIsNotNull() { - addCriterion("status is not null"); - return (Criteria) this; - } - - public Criteria andStatusEqualTo(Boolean value) { - addCriterion("status =", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotEqualTo(Boolean value) { - addCriterion("status <>", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusGreaterThan(Boolean value) { - addCriterion("status >", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusGreaterThanOrEqualTo(Boolean value) { - addCriterion("status >=", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLessThan(Boolean value) { - addCriterion("status <", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLessThanOrEqualTo(Boolean value) { - addCriterion("status <=", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusIn(List values) { - addCriterion("status in", values, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotIn(List values) { - addCriterion("status not in", values, "status"); - return (Criteria) this; - } - - public Criteria andStatusBetween(Boolean value1, Boolean value2) { - addCriterion("status between", value1, value2, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotBetween(Boolean value1, Boolean value2) { - addCriterion("status not between", value1, value2, "status"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(Date value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(Date value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(Date value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(Date value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(Date value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(Date value1, Date value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(Date value1, Date value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNull() { - addCriterion("update_time is null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNotNull() { - addCriterion("update_time is not null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeEqualTo(Date value) { - addCriterion("update_time =", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotEqualTo(Date value) { - addCriterion("update_time <>", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThan(Date value) { - addCriterion("update_time >", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("update_time >=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThan(Date value) { - addCriterion("update_time <", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { - addCriterion("update_time <=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIn(List values) { - addCriterion("update_time in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotIn(List values) { - addCriterion("update_time not in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeBetween(Date value1, Date value2) { - addCriterion("update_time between", value1, value2, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { - addCriterion("update_time not between", value1, value2, "updateTime"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserCertifyRecord.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserCertifyRecord.java deleted file mode 100644 index 69cac7354..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserCertifyRecord.java +++ /dev/null @@ -1,175 +0,0 @@ -package com.accompany.business.model; - -import java.util.Date; - -public class UserCertifyRecord { - private Long recordId; - - private Long uid; - - private String name; - - private String idCardNum; - - private String phone; - - private String verifyCode; - - private String deviceId; - - private String ip; - - private String app; - - private String channel; - - private String model; - - private Byte bindStatus; - - private String certifyType; - - private String ticket; - - private String token; - - private Date createtime; - - private Date updateTime; - - public Long getRecordId() { - return recordId; - } - - public void setRecordId(Long recordId) { - this.recordId = recordId; - } - - public Long getUid() { - return uid; - } - - public void setUid(Long uid) { - this.uid = uid; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name == null ? null : name.trim(); - } - - public String getIdCardNum() { - return idCardNum; - } - - public void setIdCardNum(String idCardNum) { - this.idCardNum = idCardNum == null ? null : idCardNum.trim(); - } - - public String getPhone() { - return phone; - } - - public void setPhone(String phone) { - this.phone = phone == null ? null : phone.trim(); - } - - public String getVerifyCode() { - return verifyCode; - } - - public void setVerifyCode(String verifyCode) { - this.verifyCode = verifyCode == null ? null : verifyCode.trim(); - } - - public String getDeviceId() { - return deviceId; - } - - public void setDeviceId(String deviceId) { - this.deviceId = deviceId == null ? null : deviceId.trim(); - } - - public String getIp() { - return ip; - } - - public void setIp(String ip) { - this.ip = ip == null ? null : ip.trim(); - } - - public String getApp() { - return app; - } - - public void setApp(String app) { - this.app = app == null ? null : app.trim(); - } - - public String getChannel() { - return channel; - } - - public void setChannel(String channel) { - this.channel = channel == null ? null : channel.trim(); - } - - public String getModel() { - return model; - } - - public void setModel(String model) { - this.model = model == null ? null : model.trim(); - } - - public Byte getBindStatus() { - return bindStatus; - } - - public void setBindStatus(Byte bindStatus) { - this.bindStatus = bindStatus; - } - - public String getCertifyType() { - return certifyType; - } - - public void setCertifyType(String certifyType) { - this.certifyType = certifyType == null ? null : certifyType.trim(); - } - - public String getTicket() { - return ticket; - } - - public void setTicket(String ticket) { - this.ticket = ticket == null ? null : ticket.trim(); - } - - public String getToken() { - return token; - } - - public void setToken(String token) { - this.token = token == null ? null : token.trim(); - } - - public Date getCreatetime() { - return createtime; - } - - public void setCreatetime(Date createtime) { - this.createtime = createtime; - } - - public Date getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserCertifyRecordExample.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserCertifyRecordExample.java deleted file mode 100644 index bf76c1082..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserCertifyRecordExample.java +++ /dev/null @@ -1,1361 +0,0 @@ -package com.accompany.business.model; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class UserCertifyRecordExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - private Integer limit; - - private Integer offset; - - public UserCertifyRecordExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - public void setLimit(Integer limit) { - this.limit = limit; - } - - public Integer getLimit() { - return limit; - } - - public void setOffset(Integer offset) { - this.offset = offset; - } - - public Integer getOffset() { - return offset; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andRecordIdIsNull() { - addCriterion("record_id is null"); - return (Criteria) this; - } - - public Criteria andRecordIdIsNotNull() { - addCriterion("record_id is not null"); - return (Criteria) this; - } - - public Criteria andRecordIdEqualTo(Long value) { - addCriterion("record_id =", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdNotEqualTo(Long value) { - addCriterion("record_id <>", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdGreaterThan(Long value) { - addCriterion("record_id >", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdGreaterThanOrEqualTo(Long value) { - addCriterion("record_id >=", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdLessThan(Long value) { - addCriterion("record_id <", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdLessThanOrEqualTo(Long value) { - addCriterion("record_id <=", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdIn(List values) { - addCriterion("record_id in", values, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdNotIn(List values) { - addCriterion("record_id not in", values, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdBetween(Long value1, Long value2) { - addCriterion("record_id between", value1, value2, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdNotBetween(Long value1, Long value2) { - addCriterion("record_id not between", value1, value2, "recordId"); - return (Criteria) this; - } - - public Criteria andUidIsNull() { - addCriterion("uid is null"); - return (Criteria) this; - } - - public Criteria andUidIsNotNull() { - addCriterion("uid is not null"); - return (Criteria) this; - } - - public Criteria andUidEqualTo(Long value) { - addCriterion("uid =", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotEqualTo(Long value) { - addCriterion("uid <>", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidGreaterThan(Long value) { - addCriterion("uid >", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidGreaterThanOrEqualTo(Long value) { - addCriterion("uid >=", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidLessThan(Long value) { - addCriterion("uid <", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidLessThanOrEqualTo(Long value) { - addCriterion("uid <=", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidIn(List values) { - addCriterion("uid in", values, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotIn(List values) { - addCriterion("uid not in", values, "uid"); - return (Criteria) this; - } - - public Criteria andUidBetween(Long value1, Long value2) { - addCriterion("uid between", value1, value2, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotBetween(Long value1, Long value2) { - addCriterion("uid not between", value1, value2, "uid"); - return (Criteria) this; - } - - public Criteria andNameIsNull() { - addCriterion("name is null"); - return (Criteria) this; - } - - public Criteria andNameIsNotNull() { - addCriterion("name is not null"); - return (Criteria) this; - } - - public Criteria andNameEqualTo(String value) { - addCriterion("name =", value, "name"); - return (Criteria) this; - } - - public Criteria andNameNotEqualTo(String value) { - addCriterion("name <>", value, "name"); - return (Criteria) this; - } - - public Criteria andNameGreaterThan(String value) { - addCriterion("name >", value, "name"); - return (Criteria) this; - } - - public Criteria andNameGreaterThanOrEqualTo(String value) { - addCriterion("name >=", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLessThan(String value) { - addCriterion("name <", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLessThanOrEqualTo(String value) { - addCriterion("name <=", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLike(String value) { - addCriterion("name like", value, "name"); - return (Criteria) this; - } - - public Criteria andNameNotLike(String value) { - addCriterion("name not like", value, "name"); - return (Criteria) this; - } - - public Criteria andNameIn(List values) { - addCriterion("name in", values, "name"); - return (Criteria) this; - } - - public Criteria andNameNotIn(List values) { - addCriterion("name not in", values, "name"); - return (Criteria) this; - } - - public Criteria andNameBetween(String value1, String value2) { - addCriterion("name between", value1, value2, "name"); - return (Criteria) this; - } - - public Criteria andNameNotBetween(String value1, String value2) { - addCriterion("name not between", value1, value2, "name"); - return (Criteria) this; - } - - public Criteria andIdCardNumIsNull() { - addCriterion("id_card_num is null"); - return (Criteria) this; - } - - public Criteria andIdCardNumIsNotNull() { - addCriterion("id_card_num is not null"); - return (Criteria) this; - } - - public Criteria andIdCardNumEqualTo(String value) { - addCriterion("id_card_num =", value, "idCardNum"); - return (Criteria) this; - } - - public Criteria andIdCardNumNotEqualTo(String value) { - addCriterion("id_card_num <>", value, "idCardNum"); - return (Criteria) this; - } - - public Criteria andIdCardNumGreaterThan(String value) { - addCriterion("id_card_num >", value, "idCardNum"); - return (Criteria) this; - } - - public Criteria andIdCardNumGreaterThanOrEqualTo(String value) { - addCriterion("id_card_num >=", value, "idCardNum"); - return (Criteria) this; - } - - public Criteria andIdCardNumLessThan(String value) { - addCriterion("id_card_num <", value, "idCardNum"); - return (Criteria) this; - } - - public Criteria andIdCardNumLessThanOrEqualTo(String value) { - addCriterion("id_card_num <=", value, "idCardNum"); - return (Criteria) this; - } - - public Criteria andIdCardNumLike(String value) { - addCriterion("id_card_num like", value, "idCardNum"); - return (Criteria) this; - } - - public Criteria andIdCardNumNotLike(String value) { - addCriterion("id_card_num not like", value, "idCardNum"); - return (Criteria) this; - } - - public Criteria andIdCardNumIn(List values) { - addCriterion("id_card_num in", values, "idCardNum"); - return (Criteria) this; - } - - public Criteria andIdCardNumNotIn(List values) { - addCriterion("id_card_num not in", values, "idCardNum"); - return (Criteria) this; - } - - public Criteria andIdCardNumBetween(String value1, String value2) { - addCriterion("id_card_num between", value1, value2, "idCardNum"); - return (Criteria) this; - } - - public Criteria andIdCardNumNotBetween(String value1, String value2) { - addCriterion("id_card_num not between", value1, value2, "idCardNum"); - return (Criteria) this; - } - - public Criteria andPhoneIsNull() { - addCriterion("phone is null"); - return (Criteria) this; - } - - public Criteria andPhoneIsNotNull() { - addCriterion("phone is not null"); - return (Criteria) this; - } - - public Criteria andPhoneEqualTo(String value) { - addCriterion("phone =", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneNotEqualTo(String value) { - addCriterion("phone <>", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneGreaterThan(String value) { - addCriterion("phone >", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneGreaterThanOrEqualTo(String value) { - addCriterion("phone >=", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneLessThan(String value) { - addCriterion("phone <", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneLessThanOrEqualTo(String value) { - addCriterion("phone <=", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneLike(String value) { - addCriterion("phone like", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneNotLike(String value) { - addCriterion("phone not like", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneIn(List values) { - addCriterion("phone in", values, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneNotIn(List values) { - addCriterion("phone not in", values, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneBetween(String value1, String value2) { - addCriterion("phone between", value1, value2, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneNotBetween(String value1, String value2) { - addCriterion("phone not between", value1, value2, "phone"); - return (Criteria) this; - } - - public Criteria andVerifyCodeIsNull() { - addCriterion("verify_code is null"); - return (Criteria) this; - } - - public Criteria andVerifyCodeIsNotNull() { - addCriterion("verify_code is not null"); - return (Criteria) this; - } - - public Criteria andVerifyCodeEqualTo(String value) { - addCriterion("verify_code =", value, "verifyCode"); - return (Criteria) this; - } - - public Criteria andVerifyCodeNotEqualTo(String value) { - addCriterion("verify_code <>", value, "verifyCode"); - return (Criteria) this; - } - - public Criteria andVerifyCodeGreaterThan(String value) { - addCriterion("verify_code >", value, "verifyCode"); - return (Criteria) this; - } - - public Criteria andVerifyCodeGreaterThanOrEqualTo(String value) { - addCriterion("verify_code >=", value, "verifyCode"); - return (Criteria) this; - } - - public Criteria andVerifyCodeLessThan(String value) { - addCriterion("verify_code <", value, "verifyCode"); - return (Criteria) this; - } - - public Criteria andVerifyCodeLessThanOrEqualTo(String value) { - addCriterion("verify_code <=", value, "verifyCode"); - return (Criteria) this; - } - - public Criteria andVerifyCodeLike(String value) { - addCriterion("verify_code like", value, "verifyCode"); - return (Criteria) this; - } - - public Criteria andVerifyCodeNotLike(String value) { - addCriterion("verify_code not like", value, "verifyCode"); - return (Criteria) this; - } - - public Criteria andVerifyCodeIn(List values) { - addCriterion("verify_code in", values, "verifyCode"); - return (Criteria) this; - } - - public Criteria andVerifyCodeNotIn(List values) { - addCriterion("verify_code not in", values, "verifyCode"); - return (Criteria) this; - } - - public Criteria andVerifyCodeBetween(String value1, String value2) { - addCriterion("verify_code between", value1, value2, "verifyCode"); - return (Criteria) this; - } - - public Criteria andVerifyCodeNotBetween(String value1, String value2) { - addCriterion("verify_code not between", value1, value2, "verifyCode"); - return (Criteria) this; - } - - public Criteria andDeviceIdIsNull() { - addCriterion("device_id is null"); - return (Criteria) this; - } - - public Criteria andDeviceIdIsNotNull() { - addCriterion("device_id is not null"); - return (Criteria) this; - } - - public Criteria andDeviceIdEqualTo(String value) { - addCriterion("device_id =", value, "deviceId"); - return (Criteria) this; - } - - public Criteria andDeviceIdNotEqualTo(String value) { - addCriterion("device_id <>", value, "deviceId"); - return (Criteria) this; - } - - public Criteria andDeviceIdGreaterThan(String value) { - addCriterion("device_id >", value, "deviceId"); - return (Criteria) this; - } - - public Criteria andDeviceIdGreaterThanOrEqualTo(String value) { - addCriterion("device_id >=", value, "deviceId"); - return (Criteria) this; - } - - public Criteria andDeviceIdLessThan(String value) { - addCriterion("device_id <", value, "deviceId"); - return (Criteria) this; - } - - public Criteria andDeviceIdLessThanOrEqualTo(String value) { - addCriterion("device_id <=", value, "deviceId"); - return (Criteria) this; - } - - public Criteria andDeviceIdLike(String value) { - addCriterion("device_id like", value, "deviceId"); - return (Criteria) this; - } - - public Criteria andDeviceIdNotLike(String value) { - addCriterion("device_id not like", value, "deviceId"); - return (Criteria) this; - } - - public Criteria andDeviceIdIn(List values) { - addCriterion("device_id in", values, "deviceId"); - return (Criteria) this; - } - - public Criteria andDeviceIdNotIn(List values) { - addCriterion("device_id not in", values, "deviceId"); - return (Criteria) this; - } - - public Criteria andDeviceIdBetween(String value1, String value2) { - addCriterion("device_id between", value1, value2, "deviceId"); - return (Criteria) this; - } - - public Criteria andDeviceIdNotBetween(String value1, String value2) { - addCriterion("device_id not between", value1, value2, "deviceId"); - return (Criteria) this; - } - - public Criteria andIpIsNull() { - addCriterion("ip is null"); - return (Criteria) this; - } - - public Criteria andIpIsNotNull() { - addCriterion("ip is not null"); - return (Criteria) this; - } - - public Criteria andIpEqualTo(String value) { - addCriterion("ip =", value, "ip"); - return (Criteria) this; - } - - public Criteria andIpNotEqualTo(String value) { - addCriterion("ip <>", value, "ip"); - return (Criteria) this; - } - - public Criteria andIpGreaterThan(String value) { - addCriterion("ip >", value, "ip"); - return (Criteria) this; - } - - public Criteria andIpGreaterThanOrEqualTo(String value) { - addCriterion("ip >=", value, "ip"); - return (Criteria) this; - } - - public Criteria andIpLessThan(String value) { - addCriterion("ip <", value, "ip"); - return (Criteria) this; - } - - public Criteria andIpLessThanOrEqualTo(String value) { - addCriterion("ip <=", value, "ip"); - return (Criteria) this; - } - - public Criteria andIpLike(String value) { - addCriterion("ip like", value, "ip"); - return (Criteria) this; - } - - public Criteria andIpNotLike(String value) { - addCriterion("ip not like", value, "ip"); - return (Criteria) this; - } - - public Criteria andIpIn(List values) { - addCriterion("ip in", values, "ip"); - return (Criteria) this; - } - - public Criteria andIpNotIn(List values) { - addCriterion("ip not in", values, "ip"); - return (Criteria) this; - } - - public Criteria andIpBetween(String value1, String value2) { - addCriterion("ip between", value1, value2, "ip"); - return (Criteria) this; - } - - public Criteria andIpNotBetween(String value1, String value2) { - addCriterion("ip not between", value1, value2, "ip"); - return (Criteria) this; - } - - public Criteria andAppIsNull() { - addCriterion("app is null"); - return (Criteria) this; - } - - public Criteria andAppIsNotNull() { - addCriterion("app is not null"); - return (Criteria) this; - } - - public Criteria andAppEqualTo(String value) { - addCriterion("app =", value, "app"); - return (Criteria) this; - } - - public Criteria andAppNotEqualTo(String value) { - addCriterion("app <>", value, "app"); - return (Criteria) this; - } - - public Criteria andAppGreaterThan(String value) { - addCriterion("app >", value, "app"); - return (Criteria) this; - } - - public Criteria andAppGreaterThanOrEqualTo(String value) { - addCriterion("app >=", value, "app"); - return (Criteria) this; - } - - public Criteria andAppLessThan(String value) { - addCriterion("app <", value, "app"); - return (Criteria) this; - } - - public Criteria andAppLessThanOrEqualTo(String value) { - addCriterion("app <=", value, "app"); - return (Criteria) this; - } - - public Criteria andAppLike(String value) { - addCriterion("app like", value, "app"); - return (Criteria) this; - } - - public Criteria andAppNotLike(String value) { - addCriterion("app not like", value, "app"); - return (Criteria) this; - } - - public Criteria andAppIn(List values) { - addCriterion("app in", values, "app"); - return (Criteria) this; - } - - public Criteria andAppNotIn(List values) { - addCriterion("app not in", values, "app"); - return (Criteria) this; - } - - public Criteria andAppBetween(String value1, String value2) { - addCriterion("app between", value1, value2, "app"); - return (Criteria) this; - } - - public Criteria andAppNotBetween(String value1, String value2) { - addCriterion("app not between", value1, value2, "app"); - return (Criteria) this; - } - - public Criteria andChannelIsNull() { - addCriterion("channel is null"); - return (Criteria) this; - } - - public Criteria andChannelIsNotNull() { - addCriterion("channel is not null"); - return (Criteria) this; - } - - public Criteria andChannelEqualTo(String value) { - addCriterion("channel =", value, "channel"); - return (Criteria) this; - } - - public Criteria andChannelNotEqualTo(String value) { - addCriterion("channel <>", value, "channel"); - return (Criteria) this; - } - - public Criteria andChannelGreaterThan(String value) { - addCriterion("channel >", value, "channel"); - return (Criteria) this; - } - - public Criteria andChannelGreaterThanOrEqualTo(String value) { - addCriterion("channel >=", value, "channel"); - return (Criteria) this; - } - - public Criteria andChannelLessThan(String value) { - addCriterion("channel <", value, "channel"); - return (Criteria) this; - } - - public Criteria andChannelLessThanOrEqualTo(String value) { - addCriterion("channel <=", value, "channel"); - return (Criteria) this; - } - - public Criteria andChannelLike(String value) { - addCriterion("channel like", value, "channel"); - return (Criteria) this; - } - - public Criteria andChannelNotLike(String value) { - addCriterion("channel not like", value, "channel"); - return (Criteria) this; - } - - public Criteria andChannelIn(List values) { - addCriterion("channel in", values, "channel"); - return (Criteria) this; - } - - public Criteria andChannelNotIn(List values) { - addCriterion("channel not in", values, "channel"); - return (Criteria) this; - } - - public Criteria andChannelBetween(String value1, String value2) { - addCriterion("channel between", value1, value2, "channel"); - return (Criteria) this; - } - - public Criteria andChannelNotBetween(String value1, String value2) { - addCriterion("channel not between", value1, value2, "channel"); - return (Criteria) this; - } - - public Criteria andModelIsNull() { - addCriterion("model is null"); - return (Criteria) this; - } - - public Criteria andModelIsNotNull() { - addCriterion("model is not null"); - return (Criteria) this; - } - - public Criteria andModelEqualTo(String value) { - addCriterion("model =", value, "model"); - return (Criteria) this; - } - - public Criteria andModelNotEqualTo(String value) { - addCriterion("model <>", value, "model"); - return (Criteria) this; - } - - public Criteria andModelGreaterThan(String value) { - addCriterion("model >", value, "model"); - return (Criteria) this; - } - - public Criteria andModelGreaterThanOrEqualTo(String value) { - addCriterion("model >=", value, "model"); - return (Criteria) this; - } - - public Criteria andModelLessThan(String value) { - addCriterion("model <", value, "model"); - return (Criteria) this; - } - - public Criteria andModelLessThanOrEqualTo(String value) { - addCriterion("model <=", value, "model"); - return (Criteria) this; - } - - public Criteria andModelLike(String value) { - addCriterion("model like", value, "model"); - return (Criteria) this; - } - - public Criteria andModelNotLike(String value) { - addCriterion("model not like", value, "model"); - return (Criteria) this; - } - - public Criteria andModelIn(List values) { - addCriterion("model in", values, "model"); - return (Criteria) this; - } - - public Criteria andModelNotIn(List values) { - addCriterion("model not in", values, "model"); - return (Criteria) this; - } - - public Criteria andModelBetween(String value1, String value2) { - addCriterion("model between", value1, value2, "model"); - return (Criteria) this; - } - - public Criteria andModelNotBetween(String value1, String value2) { - addCriterion("model not between", value1, value2, "model"); - return (Criteria) this; - } - - public Criteria andBindStatusIsNull() { - addCriterion("bind_status is null"); - return (Criteria) this; - } - - public Criteria andBindStatusIsNotNull() { - addCriterion("bind_status is not null"); - return (Criteria) this; - } - - public Criteria andBindStatusEqualTo(Byte value) { - addCriterion("bind_status =", value, "bindStatus"); - return (Criteria) this; - } - - public Criteria andBindStatusNotEqualTo(Byte value) { - addCriterion("bind_status <>", value, "bindStatus"); - return (Criteria) this; - } - - public Criteria andBindStatusGreaterThan(Byte value) { - addCriterion("bind_status >", value, "bindStatus"); - return (Criteria) this; - } - - public Criteria andBindStatusGreaterThanOrEqualTo(Byte value) { - addCriterion("bind_status >=", value, "bindStatus"); - return (Criteria) this; - } - - public Criteria andBindStatusLessThan(Byte value) { - addCriterion("bind_status <", value, "bindStatus"); - return (Criteria) this; - } - - public Criteria andBindStatusLessThanOrEqualTo(Byte value) { - addCriterion("bind_status <=", value, "bindStatus"); - return (Criteria) this; - } - - public Criteria andBindStatusIn(List values) { - addCriterion("bind_status in", values, "bindStatus"); - return (Criteria) this; - } - - public Criteria andBindStatusNotIn(List values) { - addCriterion("bind_status not in", values, "bindStatus"); - return (Criteria) this; - } - - public Criteria andBindStatusBetween(Byte value1, Byte value2) { - addCriterion("bind_status between", value1, value2, "bindStatus"); - return (Criteria) this; - } - - public Criteria andBindStatusNotBetween(Byte value1, Byte value2) { - addCriterion("bind_status not between", value1, value2, "bindStatus"); - return (Criteria) this; - } - - public Criteria andCertifyTypeIsNull() { - addCriterion("certify_type is null"); - return (Criteria) this; - } - - public Criteria andCertifyTypeIsNotNull() { - addCriterion("certify_type is not null"); - return (Criteria) this; - } - - public Criteria andCertifyTypeEqualTo(String value) { - addCriterion("certify_type =", value, "certifyType"); - return (Criteria) this; - } - - public Criteria andCertifyTypeNotEqualTo(String value) { - addCriterion("certify_type <>", value, "certifyType"); - return (Criteria) this; - } - - public Criteria andCertifyTypeGreaterThan(String value) { - addCriterion("certify_type >", value, "certifyType"); - return (Criteria) this; - } - - public Criteria andCertifyTypeGreaterThanOrEqualTo(String value) { - addCriterion("certify_type >=", value, "certifyType"); - return (Criteria) this; - } - - public Criteria andCertifyTypeLessThan(String value) { - addCriterion("certify_type <", value, "certifyType"); - return (Criteria) this; - } - - public Criteria andCertifyTypeLessThanOrEqualTo(String value) { - addCriterion("certify_type <=", value, "certifyType"); - return (Criteria) this; - } - - public Criteria andCertifyTypeLike(String value) { - addCriterion("certify_type like", value, "certifyType"); - return (Criteria) this; - } - - public Criteria andCertifyTypeNotLike(String value) { - addCriterion("certify_type not like", value, "certifyType"); - return (Criteria) this; - } - - public Criteria andCertifyTypeIn(List values) { - addCriterion("certify_type in", values, "certifyType"); - return (Criteria) this; - } - - public Criteria andCertifyTypeNotIn(List values) { - addCriterion("certify_type not in", values, "certifyType"); - return (Criteria) this; - } - - public Criteria andCertifyTypeBetween(String value1, String value2) { - addCriterion("certify_type between", value1, value2, "certifyType"); - return (Criteria) this; - } - - public Criteria andCertifyTypeNotBetween(String value1, String value2) { - addCriterion("certify_type not between", value1, value2, "certifyType"); - return (Criteria) this; - } - - public Criteria andTicketIsNull() { - addCriterion("ticket is null"); - return (Criteria) this; - } - - public Criteria andTicketIsNotNull() { - addCriterion("ticket is not null"); - return (Criteria) this; - } - - public Criteria andTicketEqualTo(String value) { - addCriterion("ticket =", value, "ticket"); - return (Criteria) this; - } - - public Criteria andTicketNotEqualTo(String value) { - addCriterion("ticket <>", value, "ticket"); - return (Criteria) this; - } - - public Criteria andTicketGreaterThan(String value) { - addCriterion("ticket >", value, "ticket"); - return (Criteria) this; - } - - public Criteria andTicketGreaterThanOrEqualTo(String value) { - addCriterion("ticket >=", value, "ticket"); - return (Criteria) this; - } - - public Criteria andTicketLessThan(String value) { - addCriterion("ticket <", value, "ticket"); - return (Criteria) this; - } - - public Criteria andTicketLessThanOrEqualTo(String value) { - addCriterion("ticket <=", value, "ticket"); - return (Criteria) this; - } - - public Criteria andTicketLike(String value) { - addCriterion("ticket like", value, "ticket"); - return (Criteria) this; - } - - public Criteria andTicketNotLike(String value) { - addCriterion("ticket not like", value, "ticket"); - return (Criteria) this; - } - - public Criteria andTicketIn(List values) { - addCriterion("ticket in", values, "ticket"); - return (Criteria) this; - } - - public Criteria andTicketNotIn(List values) { - addCriterion("ticket not in", values, "ticket"); - return (Criteria) this; - } - - public Criteria andTicketBetween(String value1, String value2) { - addCriterion("ticket between", value1, value2, "ticket"); - return (Criteria) this; - } - - public Criteria andTicketNotBetween(String value1, String value2) { - addCriterion("ticket not between", value1, value2, "ticket"); - return (Criteria) this; - } - - public Criteria andTokenIsNull() { - addCriterion("token is null"); - return (Criteria) this; - } - - public Criteria andTokenIsNotNull() { - addCriterion("token is not null"); - return (Criteria) this; - } - - public Criteria andTokenEqualTo(String value) { - addCriterion("token =", value, "token"); - return (Criteria) this; - } - - public Criteria andTokenNotEqualTo(String value) { - addCriterion("token <>", value, "token"); - return (Criteria) this; - } - - public Criteria andTokenGreaterThan(String value) { - addCriterion("token >", value, "token"); - return (Criteria) this; - } - - public Criteria andTokenGreaterThanOrEqualTo(String value) { - addCriterion("token >=", value, "token"); - return (Criteria) this; - } - - public Criteria andTokenLessThan(String value) { - addCriterion("token <", value, "token"); - return (Criteria) this; - } - - public Criteria andTokenLessThanOrEqualTo(String value) { - addCriterion("token <=", value, "token"); - return (Criteria) this; - } - - public Criteria andTokenLike(String value) { - addCriterion("token like", value, "token"); - return (Criteria) this; - } - - public Criteria andTokenNotLike(String value) { - addCriterion("token not like", value, "token"); - return (Criteria) this; - } - - public Criteria andTokenIn(List values) { - addCriterion("token in", values, "token"); - return (Criteria) this; - } - - public Criteria andTokenNotIn(List values) { - addCriterion("token not in", values, "token"); - return (Criteria) this; - } - - public Criteria andTokenBetween(String value1, String value2) { - addCriterion("token between", value1, value2, "token"); - return (Criteria) this; - } - - public Criteria andTokenNotBetween(String value1, String value2) { - addCriterion("token not between", value1, value2, "token"); - return (Criteria) this; - } - - public Criteria andCreatetimeIsNull() { - addCriterion("createTime is null"); - return (Criteria) this; - } - - public Criteria andCreatetimeIsNotNull() { - addCriterion("createTime is not null"); - return (Criteria) this; - } - - public Criteria andCreatetimeEqualTo(Date value) { - addCriterion("createTime =", value, "createtime"); - return (Criteria) this; - } - - public Criteria andCreatetimeNotEqualTo(Date value) { - addCriterion("createTime <>", value, "createtime"); - return (Criteria) this; - } - - public Criteria andCreatetimeGreaterThan(Date value) { - addCriterion("createTime >", value, "createtime"); - return (Criteria) this; - } - - public Criteria andCreatetimeGreaterThanOrEqualTo(Date value) { - addCriterion("createTime >=", value, "createtime"); - return (Criteria) this; - } - - public Criteria andCreatetimeLessThan(Date value) { - addCriterion("createTime <", value, "createtime"); - return (Criteria) this; - } - - public Criteria andCreatetimeLessThanOrEqualTo(Date value) { - addCriterion("createTime <=", value, "createtime"); - return (Criteria) this; - } - - public Criteria andCreatetimeIn(List values) { - addCriterion("createTime in", values, "createtime"); - return (Criteria) this; - } - - public Criteria andCreatetimeNotIn(List values) { - addCriterion("createTime not in", values, "createtime"); - return (Criteria) this; - } - - public Criteria andCreatetimeBetween(Date value1, Date value2) { - addCriterion("createTime between", value1, value2, "createtime"); - return (Criteria) this; - } - - public Criteria andCreatetimeNotBetween(Date value1, Date value2) { - addCriterion("createTime not between", value1, value2, "createtime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNull() { - addCriterion("update_time is null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNotNull() { - addCriterion("update_time is not null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeEqualTo(Date value) { - addCriterion("update_time =", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotEqualTo(Date value) { - addCriterion("update_time <>", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThan(Date value) { - addCriterion("update_time >", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("update_time >=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThan(Date value) { - addCriterion("update_time <", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { - addCriterion("update_time <=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIn(List values) { - addCriterion("update_time in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotIn(List values) { - addCriterion("update_time not in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeBetween(Date value1, Date value2) { - addCriterion("update_time between", value1, value2, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { - addCriterion("update_time not between", value1, value2, "updateTime"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserYearReport.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserYearReport.java deleted file mode 100644 index c20d85c7b..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserYearReport.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.accompany.business.model; - -import com.baomidou.mybatisplus.annotation.TableId; -import lombok.Data; - -import java.util.Date; - -@Data -public class UserYearReport { - @TableId - private Long uid; - private Date createTime; - private Long experienceValue; - private Integer experienceLevel; - private String experienceTitle; - private Long charmValue; - private Integer charmLevel; - private String charmTitle; - - private Long cpUid; - private Date cpCreateTime; - private Double cpValue; - - private Integer giftWallCount; - private Integer giftId; - private String giftName; - - private Long giveDiamond; - -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/WebConfig.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/WebConfig.java deleted file mode 100644 index 1527ece7e..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/WebConfig.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.accompany.business.model; - -public class WebConfig { - private String akey; - - private String aval; - - private String description; - - private Byte type; - - private Byte status; - - public String getAkey() { - return akey; - } - - public void setAkey(String akey) { - this.akey = akey == null ? null : akey.trim(); - } - - public String getAval() { - return aval; - } - - public void setAval(String aval) { - this.aval = aval == null ? null : aval.trim(); - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description == null ? null : description.trim(); - } - - public Byte getType() { - return type; - } - - public void setType(Byte type) { - this.type = type; - } - - public Byte getStatus() { - return status; - } - - public void setStatus(Byte status) { - this.status = status; - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/WebConfigExample.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/WebConfigExample.java deleted file mode 100644 index 6e7fd93be..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/WebConfigExample.java +++ /dev/null @@ -1,550 +0,0 @@ -package com.accompany.business.model; - -import java.util.ArrayList; -import java.util.List; - -public class WebConfigExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - private Integer limit; - - private Integer offset; - - public WebConfigExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - public void setLimit(Integer limit) { - this.limit = limit; - } - - public Integer getLimit() { - return limit; - } - - public void setOffset(Integer offset) { - this.offset = offset; - } - - public Integer getOffset() { - return offset; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andAkeyIsNull() { - addCriterion("akey is null"); - return (Criteria) this; - } - - public Criteria andAkeyIsNotNull() { - addCriterion("akey is not null"); - return (Criteria) this; - } - - public Criteria andAkeyEqualTo(String value) { - addCriterion("akey =", value, "akey"); - return (Criteria) this; - } - - public Criteria andAkeyNotEqualTo(String value) { - addCriterion("akey <>", value, "akey"); - return (Criteria) this; - } - - public Criteria andAkeyGreaterThan(String value) { - addCriterion("akey >", value, "akey"); - return (Criteria) this; - } - - public Criteria andAkeyGreaterThanOrEqualTo(String value) { - addCriterion("akey >=", value, "akey"); - return (Criteria) this; - } - - public Criteria andAkeyLessThan(String value) { - addCriterion("akey <", value, "akey"); - return (Criteria) this; - } - - public Criteria andAkeyLessThanOrEqualTo(String value) { - addCriterion("akey <=", value, "akey"); - return (Criteria) this; - } - - public Criteria andAkeyLike(String value) { - addCriterion("akey like", value, "akey"); - return (Criteria) this; - } - - public Criteria andAkeyNotLike(String value) { - addCriterion("akey not like", value, "akey"); - return (Criteria) this; - } - - public Criteria andAkeyIn(List values) { - addCriterion("akey in", values, "akey"); - return (Criteria) this; - } - - public Criteria andAkeyNotIn(List values) { - addCriterion("akey not in", values, "akey"); - return (Criteria) this; - } - - public Criteria andAkeyBetween(String value1, String value2) { - addCriterion("akey between", value1, value2, "akey"); - return (Criteria) this; - } - - public Criteria andAkeyNotBetween(String value1, String value2) { - addCriterion("akey not between", value1, value2, "akey"); - return (Criteria) this; - } - - public Criteria andAvalIsNull() { - addCriterion("aval is null"); - return (Criteria) this; - } - - public Criteria andAvalIsNotNull() { - addCriterion("aval is not null"); - return (Criteria) this; - } - - public Criteria andAvalEqualTo(String value) { - addCriterion("aval =", value, "aval"); - return (Criteria) this; - } - - public Criteria andAvalNotEqualTo(String value) { - addCriterion("aval <>", value, "aval"); - return (Criteria) this; - } - - public Criteria andAvalGreaterThan(String value) { - addCriterion("aval >", value, "aval"); - return (Criteria) this; - } - - public Criteria andAvalGreaterThanOrEqualTo(String value) { - addCriterion("aval >=", value, "aval"); - return (Criteria) this; - } - - public Criteria andAvalLessThan(String value) { - addCriterion("aval <", value, "aval"); - return (Criteria) this; - } - - public Criteria andAvalLessThanOrEqualTo(String value) { - addCriterion("aval <=", value, "aval"); - return (Criteria) this; - } - - public Criteria andAvalLike(String value) { - addCriterion("aval like", value, "aval"); - return (Criteria) this; - } - - public Criteria andAvalNotLike(String value) { - addCriterion("aval not like", value, "aval"); - return (Criteria) this; - } - - public Criteria andAvalIn(List values) { - addCriterion("aval in", values, "aval"); - return (Criteria) this; - } - - public Criteria andAvalNotIn(List values) { - addCriterion("aval not in", values, "aval"); - return (Criteria) this; - } - - public Criteria andAvalBetween(String value1, String value2) { - addCriterion("aval between", value1, value2, "aval"); - return (Criteria) this; - } - - public Criteria andAvalNotBetween(String value1, String value2) { - addCriterion("aval not between", value1, value2, "aval"); - return (Criteria) this; - } - - public Criteria andDescriptionIsNull() { - addCriterion("description is null"); - return (Criteria) this; - } - - public Criteria andDescriptionIsNotNull() { - addCriterion("description is not null"); - return (Criteria) this; - } - - public Criteria andDescriptionEqualTo(String value) { - addCriterion("description =", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionNotEqualTo(String value) { - addCriterion("description <>", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionGreaterThan(String value) { - addCriterion("description >", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionGreaterThanOrEqualTo(String value) { - addCriterion("description >=", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionLessThan(String value) { - addCriterion("description <", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionLessThanOrEqualTo(String value) { - addCriterion("description <=", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionLike(String value) { - addCriterion("description like", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionNotLike(String value) { - addCriterion("description not like", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionIn(List values) { - addCriterion("description in", values, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionNotIn(List values) { - addCriterion("description not in", values, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionBetween(String value1, String value2) { - addCriterion("description between", value1, value2, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionNotBetween(String value1, String value2) { - addCriterion("description not between", value1, value2, "description"); - return (Criteria) this; - } - - public Criteria andTypeIsNull() { - addCriterion("type is null"); - return (Criteria) this; - } - - public Criteria andTypeIsNotNull() { - addCriterion("type is not null"); - return (Criteria) this; - } - - public Criteria andTypeEqualTo(Byte value) { - addCriterion("type =", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotEqualTo(Byte value) { - addCriterion("type <>", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeGreaterThan(Byte value) { - addCriterion("type >", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeGreaterThanOrEqualTo(Byte value) { - addCriterion("type >=", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLessThan(Byte value) { - addCriterion("type <", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLessThanOrEqualTo(Byte value) { - addCriterion("type <=", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeIn(List values) { - addCriterion("type in", values, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotIn(List values) { - addCriterion("type not in", values, "type"); - return (Criteria) this; - } - - public Criteria andTypeBetween(Byte value1, Byte value2) { - addCriterion("type between", value1, value2, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotBetween(Byte value1, Byte value2) { - addCriterion("type not between", value1, value2, "type"); - return (Criteria) this; - } - - public Criteria andStatusIsNull() { - addCriterion("status is null"); - return (Criteria) this; - } - - public Criteria andStatusIsNotNull() { - addCriterion("status is not null"); - return (Criteria) this; - } - - public Criteria andStatusEqualTo(Byte value) { - addCriterion("status =", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotEqualTo(Byte value) { - addCriterion("status <>", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusGreaterThan(Byte value) { - addCriterion("status >", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusGreaterThanOrEqualTo(Byte value) { - addCriterion("status >=", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLessThan(Byte value) { - addCriterion("status <", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLessThanOrEqualTo(Byte value) { - addCriterion("status <=", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusIn(List values) { - addCriterion("status in", values, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotIn(List values) { - addCriterion("status not in", values, "status"); - return (Criteria) this; - } - - public Criteria andStatusBetween(Byte value1, Byte value2) { - addCriterion("status between", value1, value2, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotBetween(Byte value1, Byte value2) { - addCriterion("status not between", value1, value2, "status"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/WithdrawAccount.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/WithdrawAccount.java deleted file mode 100644 index 918aba5ee..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/WithdrawAccount.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.accompany.business.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.util.StringUtils; - -import java.util.Date; - -/** - * @author yangming - * @since 2020-04-17 - * 提现 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@TableName("withdraw_account") -public class WithdrawAccount { - - @TableId("uid") - private Long uid; - - private String swift; - - @TableField("bank_name") - private String bankName; - - @TableField("bank_account_number") - private String accountNumber; - - @TableField("bank_account_name") - private String accountName; - - private String address; - - private String city; - - private String province; - - @TableField("post_code") - private String postCode; - - @TableField("create_time") - private Date createTime; - @TableField("update_time") - private Date updateTime; - - public boolean hasComplete(){ - return StringUtils.hasText(swift) && StringUtils.hasText(bankName) - && StringUtils.hasText(accountNumber) && StringUtils.hasText(accountName) - && StringUtils.hasText(address) && StringUtils.hasText(city) - && StringUtils.hasText(province) && StringUtils.hasText(postCode); - } - -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/WithdrawRecord.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/WithdrawRecord.java deleted file mode 100644 index f5e57e958..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/WithdrawRecord.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.accompany.business.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.util.Date; - -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@TableName("withdraw_record") -public class WithdrawRecord { - - @TableId(value = "id") - private Long id; - - private Long uid; - - private Double golds; - - private Double fee; - - private Double actualGolds; - - private String swift; - - @TableField("bank_name") - private String bankName; - - @TableField("bank_account_number") - private String accountNumber; - - @TableField("bank_account_name") - private String accountName; - - private String address; - - private String city; - - private String province; - - @TableField("post_code") - private String postCode; - - private String remark; - - private Byte status; - - @TableField("create_time") - private Date createTime; - @TableField("update_time") - private Date updateTime; - - private String operator; -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/activity/BigGiftNameplateActivityConfig.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/activity/BigGiftNameplateActivityConfig.java deleted file mode 100644 index e11672e72..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/activity/BigGiftNameplateActivityConfig.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.accompany.business.model.activity; - -import lombok.Data; - -import java.util.Date; - -@Data -public class BigGiftNameplateActivityConfig { - // 第一个铭牌id - Long nameplateId1; - // 第二个铭牌id - Long nameplateId2; - // 第三个铭牌id - Long nameplateId3; - // 第四个铭牌id - Long nameplateId4; - // 第一级礼物价值 - Long value1; - // 第二级礼物价值 - Long value2; - // 第一级天数 - Integer day1; - // 第二级天数 - Integer day2; - // 活动开始时间 - Date startTime; - // 活动结束时间 - Date endTime; - -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/activity/CarActivityConfig.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/activity/CarActivityConfig.java deleted file mode 100644 index ca47dbfd2..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/activity/CarActivityConfig.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.accompany.business.model.activity; - -import lombok.Data; - -import java.util.Date; - -@Data -public class CarActivityConfig { - // 活动开始时间 - Date startTime; - // 活动结束时间 - Date endTime; - -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/activity/ChildrenActivityConfig.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/activity/ChildrenActivityConfig.java deleted file mode 100644 index f031f2750..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/activity/ChildrenActivityConfig.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.accompany.business.model.activity; - -import lombok.Data; - -import java.util.Date; -import java.util.List; - -@Data -public class ChildrenActivityConfig { - // 第一条通知 - String firstNotice; - // 第二条通知 - String secondNotice; - // 礼物id - Long giftId; - // 第一个铭牌id - Long firstNameplateId; - // 第二个铭牌id - Long secondNameplateId; - // 活动开始时间 - Date startTime; - // 活动结束时间 - Date endTime; - // 数量天数对应 - List numDay; - -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/activity/PageActivity.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/activity/PageActivity.java deleted file mode 100644 index 51b3c9b20..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/activity/PageActivity.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.accompany.business.model.activity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - * @Author: yangming - * @Date: 2020/5/13 20:06 - * @Description: 页面活动 - **/ -@Data -@TableName(value = "page_activity") -public class PageActivity implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId(value = "id",type = IdType.AUTO) - private Long id; - - private String code; - - private String title; - - private String secondTitle; - - private String imgUrl; - - private Date createTime; - - private Date updateTime; - -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaActInfo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaActInfo.java deleted file mode 100644 index 6a8356323..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaActInfo.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.accompany.business.model.activity.luckysea; - -import com.accompany.business.mybatis.typehandler.LuckySeaDrawItemListTypeHandler; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; -import java.util.List; - -/** - *
类描述: 深海奇缘活动信息 - *
功能详细描述: - * - * @author H1 - * @date [2020/12/30] - */ -@Data -@ApiModel -@TableName(value = "lucky_sea_act_info", autoResultMap = true) -public class LuckySeaActInfo { - - @TableId(value = "round_id") - @ApiModelProperty("轮次") - private String roundId; - - @TableField(value = "start_time") - @ApiModelProperty("开始时间") - private Date startTime; - - @TableField(value = "end_time") - @ApiModelProperty("结束时间") - private Date endTime; - - @TableField(value = "draw_stage_start_time") - @ApiModelProperty("进入开奖阶段时间") - private Date drawStageStartTime; - - @TableField(value = "show_result_stage_start_time") - @ApiModelProperty("进入开奖结果展示阶段时间") - private Date showResultStageStartTime; - - @TableField(value = "status") - @ApiModelProperty("活动状态(1: 选择阶段 2:正在开奖 3:已经开奖)") - private Byte status; - - @TableField(value = "ticket") - @ApiModelProperty("门票数") - private Double ticket; - - @TableField(value = "draw_mode") - @ApiModelProperty("开奖模式") - private Integer drawMode; - - @TableField(value = "draw_name") - @ApiModelProperty("开奖名称") - private String drawName; - - @TableField(value = "draw_item_list", typeHandler = LuckySeaDrawItemListTypeHandler.class) - @ApiModelProperty("开奖选项列表") - private List drawItemList; - - @TableField(value = "create_time") - @ApiModelProperty("创建时间") - private Date createTime; - - @TableField(value = "update_time") - @ApiModelProperty("更新时间") - private Date updateTime; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaDrawItem.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaDrawItem.java deleted file mode 100644 index 604be5f9b..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaDrawItem.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.accompany.business.model.activity.luckysea; - -import com.accompany.common.annotation.ReplaceAppDomain; -import com.accompany.core.annotation.I18n; -import com.baomidou.mybatisplus.annotation.TableField; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -@ApiModel -public class LuckySeaDrawItem { - - @TableField(value = "draw_id") - @ApiModelProperty("中奖id") - private Long drawId; - - @TableField(value = "draw_multiple") - @ApiModelProperty("中奖倍数") - private Integer drawMultiple; - - @TableField(value = "draw_name") - @ApiModelProperty("中间配置名称") - @I18n(className = "LuckySeaActUserDrawItem") - private String drawName; - - @TableField(value = "draw_image_url") - @ApiModelProperty("中间配置图片") - @ReplaceAppDomain - private String drawImageUrl; - -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaItem.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaItem.java deleted file mode 100644 index b92b20c21..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaItem.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * 文 件 名: LuckySeaItem - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2020/12/30 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.model.activity.luckysea; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -/** - *
类描述: 深海奇缘活动奖项item - *
功能详细描述: - * - * @author H1 - * @date [2020/12/30] - */ -@Data -@ApiModel -@TableName("lucky_sea_item") -public class LuckySeaItem { - - @TableId(value = "id", type = IdType.AUTO) - @ApiModelProperty("id") - private Long id; - - @TableField("name") - @ApiModelProperty("名称") - private String name; - - @TableField("image_url") - @ApiModelProperty("图片") - private String imgUrl; - - @TableField("multiple") - @ApiModelProperty("倍数") - private Integer multiple; - - @TableField("status") - private Byte status; - - @TableField("create_time") - private Date createTime; - - @TableField("update_time") - private Date updateTime; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaItemGroup.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaItemGroup.java deleted file mode 100644 index 5f111cca4..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaItemGroup.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.accompany.business.model.activity.luckysea; - -import com.accompany.core.mybatis.typehandler.LongListTypeHandler; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; -import java.util.List; - -/** - *
类描述: 深海奇缘活动奖项item - *
功能详细描述: - * - * @author H1 - * @date [2020/12/30] - */ -@Data -@ApiModel -@TableName(value = "lucky_sea_item_group",autoResultMap = true) -public class LuckySeaItemGroup { - - @TableId(value = "id", type = IdType.AUTO) - @ApiModelProperty("id") - private Long id; - - @TableField(value = "itemIds", typeHandler = LongListTypeHandler.class) - @ApiModelProperty("itemIds") - private List itemIds; - - @TableField("name") - @ApiModelProperty("名称") - private String name; - - @TableField("status") - private Byte status; - - @TableField("create_time") - private Date createTime; - - @TableField("update_time") - private Date updateTime; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaRoomTipConfig.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaRoomTipConfig.java deleted file mode 100644 index e05203812..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaRoomTipConfig.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.accompany.business.model.activity.luckysea; - -import lombok.Data; - -@Data -public class LuckySeaRoomTipConfig { - private Boolean singleRoomTipSwitch; - private Long singleRoomGoldNum; - private Boolean allRoomTipSwitch; - private Long allRoomGoldNum; - private Boolean allServerTipSwitch; - private Long allServerGoldNum; - private String normalFloatUrl; - private String specialFloatUrl; - - public boolean isClose(){ - return (Boolean.FALSE.equals(singleRoomTipSwitch) && null == singleRoomGoldNum) - || (Boolean.FALSE.equals(allRoomTipSwitch) && null == allRoomGoldNum) - || (Boolean.FALSE.equals(allServerTipSwitch) && null == allServerGoldNum); - } - - public boolean needTip(long goldNum) { - return needAllRoomTip(goldNum) || needSingleRoomTip(goldNum) || needAllServerTip(goldNum); - } - - public boolean needSingleRoomTip(long goldNum) { - return Boolean.TRUE.equals(singleRoomTipSwitch) && null != singleRoomGoldNum && goldNum >= singleRoomGoldNum; - } - - public boolean needAllRoomTip(long goldNum) { - return Boolean.TRUE.equals(allRoomTipSwitch) && null != allRoomGoldNum && goldNum >= allRoomGoldNum; - } - - public boolean needAllServerTip(long goldNum) { - return Boolean.TRUE.equals(allServerTipSwitch) && null != allServerGoldNum && goldNum >= allServerGoldNum; - } -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaUserDrawRecord.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaUserDrawRecord.java deleted file mode 100644 index d2733355e..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaUserDrawRecord.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * 文 件 名: LuckySeaUserDrawRecord - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/4 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.model.activity.luckysea; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -/** - *
类描述: 深海奇缘活动用户抽奖记录 - *
功能详细描述: - * - * @author H1 - * @date [2021/1/4] - */ -@Data -@ApiModel -@TableName("lucky_sea_user_draw_record") -public class LuckySeaUserDrawRecord { - @TableId(value = "id", type = IdType.AUTO) - @ApiModelProperty(value = "id") - private Long id; - - @TableField(value = "uid") - @ApiModelProperty(value = "uid") - private Long uid; - - @TableField(value = "round_id") - @ApiModelProperty(value = "轮次") - private String roundId; - - @TableField(value = "room_uid") - @ApiModelProperty(value = "roomUid") - private Long roomUid; - - @TableField(value = "item_id") - @ApiModelProperty(value = "itemId") - private Long itemId; - - @TableField(value = "item_name") - @ApiModelProperty(value = "配置项名称") - private String itemName; - - @TableField(value = "item_url") - @ApiModelProperty(value = "配置项图片url") - private String itemUrl; - - @TableField(value = "item_multiple") - @ApiModelProperty(value = "配置项倍数") - private Integer itemMultiple; - - @TableField(value = "cost_piece_num") - @ApiModelProperty(value = "投入的碎片数量") - private Long costPriceNum; - - @TableField(value = "draw_status") - @ApiModelProperty(value = "中奖状态") - private Byte drawStatus; - - @TableField(value = "create_time") - @ApiModelProperty(value = "创建时间") - private Date createTime; - - @TableField(value = "update_time") - @ApiModelProperty(value = "更新时间") - private Date updateTime; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaUserDrawResult.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaUserDrawResult.java deleted file mode 100644 index 272c7c750..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaUserDrawResult.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.accompany.business.model.activity.luckysea; - -import com.accompany.business.mybatis.typehandler.LuckySeaDrawItemListTypeHandler; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.util.Date; -import java.util.List; - -/** - *
类描述: 深海奇缘活动用户抽奖结果 - *
功能详细描述: - * - * @author H1 - * @date [2021/1/5] - */ -@Data -@TableName(value = "lucky_sea_user_draw_result", autoResultMap = true) -public class LuckySeaUserDrawResult { - - @TableId(value = "id", type = IdType.AUTO) - private Long id; - - @TableField(value = "uid") - private Long uid; - - @TableField(value = "round_id") - private String roundId; - - @TableField("item_type") - private Byte itemType; - - @TableField("item_name") - private String itemName; - - @TableField(value = "result") - private String result; - - @TableField(value = "draw_time") - private Date drawTime; - - @TableField(value = "draw_item_list", typeHandler = LuckySeaDrawItemListTypeHandler.class) - private List drawItemList; - - @TableField(value = "draw_status") - private Byte drawStatus; - - @TableField(value = "create_time") - private Date createTime; - - @TableField(value = "update_time") - private Date updateTime; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/callbattle/ActCallBattleInfo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/callbattle/ActCallBattleInfo.java deleted file mode 100644 index 16356bd0d..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/callbattle/ActCallBattleInfo.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * 文 件 名: LuckySeaActInfo - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2020/12/30 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.model.callbattle; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -/** - *
类描述: 召唤战斗活动信息 - *
功能详细描述: - * - * @author H1 - * @date [2020/12/30] - */ -@Data -@ApiModel -@TableName("act_call_battle_info") -public class ActCallBattleInfo { - - @TableId(value = "round_id") - @ApiModelProperty("轮次") - private String roundId; - - @TableField(value = "start_time") - @ApiModelProperty("开始时间") - private Date startTime; - - @TableField(value = "end_time") - @ApiModelProperty("结束时间") - private Date endTime; - - @TableField(value = "draw_stage_start_time") - @ApiModelProperty("进入开奖阶段时间") - private Date drawStageStartTime; - - @TableField(value = "show_result_stage_start_time") - @ApiModelProperty("进入开奖结果展示阶段时间") - private Date showResultStageStartTime; - - @TableField(value = "status") - @ApiModelProperty("活动状态(1: 选择阶段 2:正在开奖 3:已经开奖)") - private Byte status; - - @TableField(value = "ticket") - @ApiModelProperty("门票数") - private Double ticket; - - @TableField(value = "draw_id") - @ApiModelProperty("中奖id") - private Long drawId; - - @TableField(value = "draw_multiple") - @ApiModelProperty("中奖倍数") - private Integer drawMultiple; - - @TableField(value = "draw_name") - @ApiModelProperty("中奖配置名称") - private String drawName; - - @TableField(value = "draw_image_url") - @ApiModelProperty("中奖配置图片") - private String drawImageUrl; - - @TableField("draw_restraint_name") - @ApiModelProperty("中奖召唤物名称") - private String drawRestraintName; - - @TableField("draw_restraint_image_url") - @ApiModelProperty("中奖召唤物图片链接") - private String drawRestraintImageUrl; - - @TableField(value = "create_time") - @ApiModelProperty("创建时间") - private Date createTime; - - @TableField(value = "update_time") - @ApiModelProperty("更新时间") - private Date updateTime; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/callbattle/ActCallBattleItem.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/callbattle/ActCallBattleItem.java deleted file mode 100644 index d15e37763..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/callbattle/ActCallBattleItem.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * 文 件 名: LuckySeaItem - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2020/12/30 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.model.callbattle; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -/** - *
类描述: 召唤战斗活动奖项item - *
功能详细描述: - * - * @author H1 - * @date [2020/12/30] - */ -@Data -@ApiModel -@TableName("act_call_battle_item") -public class ActCallBattleItem { - - @TableId(value = "id", type = IdType.AUTO) - @ApiModelProperty("id") - private Long id; - - @TableField("name") - @ApiModelProperty("召唤物名称") - private String name; - - @TableField("image_url") - @ApiModelProperty("召唤物图片链接") - private String imgUrl; - - @TableField("multiple") - @ApiModelProperty("倍数") - private Integer multiple; - - @TableField("status") - private Byte status; - - @TableField("restraint_name") - @ApiModelProperty("克制物名称") - private String restraintName; - - @TableField("restraint_image_url") - @ApiModelProperty("克制物图片链接") - private String restraintImageUrl; - - @TableField("create_time") - private Date createTime; - - @TableField("update_time") - private Date updateTime; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/callbattle/ActCallBattleUserDrawRecord.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/callbattle/ActCallBattleUserDrawRecord.java deleted file mode 100644 index 55a2e8764..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/callbattle/ActCallBattleUserDrawRecord.java +++ /dev/null @@ -1,85 +0,0 @@ -/* - * 文 件 名: LuckySeaUserDrawRecord - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/4 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.model.callbattle; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -/** - *
类描述: 深海奇缘活动用户抽奖记录 - *
功能详细描述: - * - * @author H1 - * @date [2021/1/4] - */ -@Data -@ApiModel -@TableName("act_call_battle_draw_record") -public class ActCallBattleUserDrawRecord { - @TableId(value = "id", type = IdType.AUTO) - @ApiModelProperty(value = "id") - private Long id; - - @TableField(value = "uid") - @ApiModelProperty(value = "uid") - private Long uid; - - @TableField(value = "round_id") - @ApiModelProperty(value = "轮次") - private String roundId; - - @TableField(value = "item_id") - @ApiModelProperty(value = "itemId") - private Long itemId; - - @TableField(value = "item_name") - @ApiModelProperty(value = "配置项名称") - private String itemName; - - @TableField(value = "item_url") - @ApiModelProperty(value = "配置项图片url") - private String itemUrl; - - @TableField(value = "item_multiple") - @ApiModelProperty(value = "配置项倍数") - private Integer itemMultiple; - - @TableField(value = "cost_piece_num") - @ApiModelProperty(value = "投入的碎片数量") - private Long costPriceNum; - - @TableField("restraint_name") - @ApiModelProperty("克制物名称") - private String restraintName; - - @TableField("restraint_image_url") - @ApiModelProperty("克制物图片链接") - private String restraintImageUrl; - - @TableField(value = "draw_status") - @ApiModelProperty(value = "中奖状态") - private Byte drawStatus; - - @TableField(value = "create_time") - @ApiModelProperty(value = "创建时间") - private Date createTime; - - @TableField(value = "update_time") - @ApiModelProperty(value = "更新时间") - private Date updateTime; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/callbattle/ActCallBattleUserDrawResult.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/callbattle/ActCallBattleUserDrawResult.java deleted file mode 100644 index c3e763c62..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/callbattle/ActCallBattleUserDrawResult.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * 文 件 名: LuckySeaUserDrawResult - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/5 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.model.callbattle; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.util.Date; - -/** - *
类描述: 召唤战斗活动用户抽奖结果 - *
功能详细描述: - * - * @author H1 - * @date [2021/1/5] - */ -@Data -@TableName(value = "act_call_battle_user_draw_result") -public class ActCallBattleUserDrawResult { - - @TableId(value = "id", type = IdType.AUTO) - private Long id; - - @TableField(value = "uid") - private Long uid; - - @TableField(value = "round_id") - private String roundId; - - @TableField(value = "result") - private String result; - - @TableField(value = "draw_time") - private Date drawTime; - - @TableField(value = "draw_id") - private Long drawId; - - @TableField(value = "draw_status") - private Byte drawStatus; - - @TableField(value = "create_time") - private Date createTime; - - @TableField(value = "update_time") - private Date updateTime; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/chat/PublicChatTopRecord.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/chat/PublicChatTopRecord.java deleted file mode 100644 index 3a6819543..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/chat/PublicChatTopRecord.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.accompany.business.model.chat; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -/** - * @author: liaozetao - * @date: 2024/5/6 14:13 - * @description: - */ -@Data -@TableName("public_chat_top_record") -public class PublicChatTopRecord { - - /** - * 主键 - */ - @TableId(type = IdType.AUTO) - @ApiModelProperty("主键") - private Long id; - - /** - * 公聊大厅UID - */ - @ApiModelProperty("公聊大厅UID") - private Long roomUid; - - /** - * 用户UID - */ - @ApiModelProperty("用户UID") - private Long uid; - - /** - * 昵称 - */ - @ApiModelProperty("昵称") - private String nick; - - /** - * 内容 - */ - @ApiModelProperty("内容") - private String content; - - /** - * 是否置顶 - */ - @ApiModelProperty("是否置顶") - private Integer isTop; - - /** - * 开始时间 - */ - @ApiModelProperty("开始时间") - private Date startTime; - - /** - * 结束时间 - */ - @ApiModelProperty("结束时间") - private Date endTime; - - /** - * 记录状态 - */ - @ApiModelProperty("记录状态") - private Integer recordStatus; - - /** - * 分区ID - */ - @ApiModelProperty("分区ID") - private Integer partitionId; - - /** - * 支付金额 - */ - @ApiModelProperty("支付金额") - private Integer payMoneyNum; - - /** - * 创建时间 - */ - @ApiModelProperty("创建时间") - private Date createTime; - - /** - * 更新时间 - */ - @ApiModelProperty("更新时间") - private Date updateTime; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/gamepartner/GamePartnerInfo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/gamepartner/GamePartnerInfo.java deleted file mode 100644 index 3232f4fc6..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/gamepartner/GamePartnerInfo.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.accompany.business.model.gamepartner; - -import com.accompany.business.mybatis.typehandler.GamePartnerInfoTagListTypeHandler; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.util.List; - -@Data -@TableName(value = "game_partner_info" , autoResultMap = true) -public class GamePartnerInfo { - - @TableId(type = IdType.AUTO) - private Integer gameId; - private String gameName; - - @TableField(typeHandler = GamePartnerInfoTagListTypeHandler.class) - private List tags; - - private String logo; - private String background; - private String pic; - -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/gamepartner/GamePartnerInfoTag.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/gamepartner/GamePartnerInfoTag.java deleted file mode 100644 index 8b10352b6..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/gamepartner/GamePartnerInfoTag.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.accompany.business.model.gamepartner; - -import lombok.Data; - -@Data -public class GamePartnerInfoTag { - - private String tagName; - private Integer seq; - -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/gamepartner/GamePartnerOrder.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/gamepartner/GamePartnerOrder.java deleted file mode 100644 index 47e6d983d..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/gamepartner/GamePartnerOrder.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.accompany.business.model.gamepartner; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * @author: liaozetao - * @date: 2023/8/21 14:24 - * @description: - */ -@Data -@TableName("game_partner_order") -public class GamePartnerOrder { - - /** - * 主键 - */ - @TableId(type = IdType.AUTO) - @ApiModelProperty("主键") - private Long id; - - /** - * 订单单号 - */ - @ApiModelProperty("订单单号") - private String orderNo; - - /** - * 下单用户UID - */ - @ApiModelProperty("下单用户UID") - private Long fromUid; - - /** - * 接单用户UID - */ - @ApiModelProperty("接单用户UID") - private Long toUid; - - /** - * 游戏ID - */ - @ApiModelProperty("游戏ID") - private Integer gameId; - - /** - * 局数 - */ - @ApiModelProperty("局数") - private Integer inning; - - /** - * 单价 - */ - @ApiModelProperty("单价") - private Long price; - - /** - * 金额 - */ - @ApiModelProperty("金额") - private BigDecimal amount; - - /** - * 收益 - */ - @ApiModelProperty("收益") - private BigDecimal income; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Integer status; - - /** - * 创建时间 - */ - @ApiModelProperty("创建时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date createTime; - - /** - * 修改时间 - */ - @ApiModelProperty("修改时间") - private Date updateTime; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/gamepartner/UserGamePartner.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/gamepartner/UserGamePartner.java deleted file mode 100644 index a56b1965c..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/gamepartner/UserGamePartner.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.accompany.business.model.gamepartner; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.util.Date; - -@Data -@TableName(value = "user_game_partner" , autoResultMap = true) -public class UserGamePartner { - - @TableId - private Long uid; - private Byte status; - private Date updateTime; - private Integer adminId; - -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/gamepartner/UserGamePartnerInfo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/gamepartner/UserGamePartnerInfo.java deleted file mode 100644 index 9d2d5e2bc..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/gamepartner/UserGamePartnerInfo.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.accompany.business.model.gamepartner; - -import com.accompany.business.mybatis.typehandler.UserGamePartnerInfoTagListTypeHandler; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.util.List; - -@Data -@TableName(value = "user_game_partner_info" , autoResultMap = true) -public class UserGamePartnerInfo { - - private Long uid; - private Integer gameId; - - private Long price; - private String proficiency; - @TableField(typeHandler = UserGamePartnerInfoTagListTypeHandler.class) - private List tags; - - private Integer finishNum; - private Integer seq; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/gamepartner/UserGamePartnerInfoTag.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/gamepartner/UserGamePartnerInfoTag.java deleted file mode 100644 index 7724e178c..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/gamepartner/UserGamePartnerInfoTag.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.accompany.business.model.gamepartner; - -import lombok.Data; - -@Data -public class UserGamePartnerInfoTag { - - private String tagName; - private String tagVal; - private Integer seq; - -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/newUserStart/NewUserSayHelloChannel.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/newUserStart/NewUserSayHelloChannel.java deleted file mode 100644 index bdff84b96..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/newUserStart/NewUserSayHelloChannel.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.accompany.business.model.newUserStart; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -/** - * @author guojicong - * @date 2022/5/31 - */ -@Data -@ApiModel -@TableName("new_user_say_hello_channel") -public class NewUserSayHelloChannel { - @TableId(value = "id", type = IdType.AUTO) - @ApiModelProperty("id") - private Integer id; - - @TableField("channel") - @ApiModelProperty("渠道来源") - private String channel; - - @TableField("erban_Nos") - @ApiModelProperty("厅号，仅作冗余用于展示") - private String erbanNos; - - @TableField("uids") - @ApiModelProperty("厅号对应room所有者uid集合") - private String uids; - - @TableField("index_popup") - @ApiModelProperty("是否首页弹窗") - private Boolean indexPopup; - - @TableField("index_popup_user_index") - @ApiModelProperty("首页弹窗展示用户麦位") - private Integer indexPopupUserIndex; - - @TableField("room_popup") - @ApiModelProperty("是否房间弹窗") - private Boolean roomPopup; - - @TableField("send_message_number") - @ApiModelProperty("发送消息数量") - private Integer sendMessageNumber; - - @TableField("create_time") - @ApiModelProperty("创建时间") - private Date createTime; - - @TableField("update_time") - @ApiModelProperty("修改时间") - private Date updateTime; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/newbie/NewbieMessage.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/newbie/NewbieMessage.java deleted file mode 100644 index c904ed7ac..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/newbie/NewbieMessage.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.accompany.business.model.newbie; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import lombok.Data; - -@Data -public class NewbieMessage { - @TableId(type= IdType.AUTO) - private Long id; // id - private String message; // 招呼 -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/newbie/NewbieMessageRecord.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/newbie/NewbieMessageRecord.java deleted file mode 100644 index 62f67d4ad..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/newbie/NewbieMessageRecord.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.accompany.business.model.newbie; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import lombok.Data; - -import java.util.Date; - -@Data -public class NewbieMessageRecord { - @TableId(type= IdType.AUTO) - private Long id; // id - private Long uid; // uid - private Long helloUid; // helloUid - private String message; // 招呼 - private Date createTime; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/newuser/NewUserInRoomGift.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/newuser/NewUserInRoomGift.java deleted file mode 100644 index 570163db7..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/newuser/NewUserInRoomGift.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.accompany.business.model.newuser; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @author guojicong - * @description - * @date 2022-07-25 - */ -@Data -@NoArgsConstructor -public class NewUserInRoomGift { - @TableId(value = "id", type = IdType.AUTO) - private Long id; - private Integer giftId; - private Integer giftNum; - private String channel; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/newuser/NewUserInRoomGiftRecord.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/newuser/NewUserInRoomGiftRecord.java deleted file mode 100644 index a616732e3..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/newuser/NewUserInRoomGiftRecord.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.accompany.business.model.newuser; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.Date; - -/** - * @author guojicong - * @description - * @date 2022-07-26 - */ -@Data -@NoArgsConstructor -public class NewUserInRoomGiftRecord { - @TableId(value = "id", type = IdType.AUTO) - private Long id; - private Long uid; - private String deviceId; - private Long roomUid; - private Long giftId; - private Integer giftNum; - private String channel; - private Date createTime; - private Date updateTime; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/official/OfficialBrowseRecord.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/official/OfficialBrowseRecord.java deleted file mode 100644 index a11be8338..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/official/OfficialBrowseRecord.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.accompany.business.model.official; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -/** - * @author: liaozetao - * @date: 2024/1/17 10:35 - * @description: - */ -@TableName("official_browse_record") -@Data -public class OfficialBrowseRecord { - - /** - * 主键 - */ - @ApiModelProperty("主键") - @TableId(type = IdType.AUTO) - private Long id; - - /** - * ua - */ - @ApiModelProperty("ua") - private String userAgent; - - /** - * 系统 - */ - @ApiModelProperty("系统") - private String os; - - /** - * 系统版本 - */ - @ApiModelProperty("系统版本") - private String osVersion; - - /** - * 设备 - */ - @ApiModelProperty("设备") - private String model; - - /** - * IP - */ - @ApiModelProperty("IP") - private String clientIp; - - /** - * 创建时间 - */ - @ApiModelProperty("创建时间") - private Date createTime; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/official/OfficialClickRecord.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/official/OfficialClickRecord.java deleted file mode 100644 index 4ff48ecee..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/official/OfficialClickRecord.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.accompany.business.model.official; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -/** - * @author: liaozetao - * @date: 2024/1/18 10:26 - * @description: - */ -@TableName("official_click_record") -@Data -public class OfficialClickRecord { - - - /** - * 主键 - */ - @ApiModelProperty("主键") - @TableId(type = IdType.AUTO) - private Long id; - - /** - * 下载类型 - */ - @ApiModelProperty("下载类型") - private Integer downloadType; - - /** - * 下载链接 - */ - @ApiModelProperty("下载链接") - private String downloadUrl; - - /** - * ua - */ - @ApiModelProperty("ua") - private String userAgent; - - /** - * 系统 - */ - @ApiModelProperty("系统") - private String os; - - /** - * 系统版本 - */ - @ApiModelProperty("系统版本") - private String osVersion; - - /** - * 设备 - */ - @ApiModelProperty("设备") - private String model; - - /** - * IP - */ - @ApiModelProperty("IP") - private String clientIp; - - /** - * 创建时间 - */ - @ApiModelProperty("创建时间") - private Date createTime; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/official/OfficialConfig.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/official/OfficialConfig.java deleted file mode 100644 index 84b5caabd..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/official/OfficialConfig.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.accompany.business.model.official; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -/** - * @author: liaozetao - * @date: 2024/1/16 17:25 - * @description: - */ -@TableName("official_config") -@Data -public class OfficialConfig { - - /** - * 主键 - */ - @ApiModelProperty("主键") - @TableId(type = IdType.AUTO) - private Long id; - - /** - * iOS版本号 - */ - @ApiModelProperty("iOS版本号") - private String iosVersion; - - /** - * iOS跳转类型 - */ - @ApiModelProperty("iOS跳转类型") - private Integer iosSkipType; - - /** - * iOS跳转链接 - */ - @ApiModelProperty("iOS跳转链接") - private String iosSkipUrl; - - /** - * android版本号 - */ - @ApiModelProperty("android版本号") - private String androidVersion; - - /** - * android跳转类型 - */ - @ApiModelProperty("android跳转类型") - private Integer androidSkipType; - - /** - * android跳转链接 - */ - @ApiModelProperty("android跳转链接") - private String androidSkipUrl; - - /** - * android常规包 - */ - @ApiModelProperty("android常规包") - private String androidNormalUrl; - - /** - * android备用包 - */ - @ApiModelProperty("android备用包") - private String androidReserveUrl; - - /** - * 联系方式1 - */ - @ApiModelProperty("联系方式1") - private String contact0; - - /** - * 联系方式2 - */ - @ApiModelProperty("联系方式2") - private String contact1; - - /** - * 联系方式3 - */ - @ApiModelProperty("联系方式3") - private String contact2; - - /** - * 创建时间 - */ - @ApiModelProperty("创建时间") - private Date createTime; - - /** - * 更新时间 - */ - @ApiModelProperty("更新时间") - private Date updateTime; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/room/RoomSearchLog.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/room/RoomSearchLog.java deleted file mode 100644 index e6edb3e93..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/room/RoomSearchLog.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.accompany.business.model.room; - -import com.accompany.core.mybatis.typehandler.LongListTypeHandler; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.util.Date; -import java.util.List; - -@Data -@TableName(autoResultMap = true) -public class RoomSearchLog { - - @TableId(type = IdType.AUTO) - private Long id; - private Date createTime; - private Long uid; - private String appVersion; - private String appChannel; - private String searchKey; - private Integer searchType; - private Integer page; - private Integer pageSize; - @TableField(typeHandler = LongListTypeHandler.class) - private List resultUids; - -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/withdraw/ExchangeRate.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/withdraw/ExchangeRate.java deleted file mode 100644 index 939199a06..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/withdraw/ExchangeRate.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.accompany.business.model.withdraw; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * @author: liaozetao - * @date: 2023/7/7 14:02 - * @description: - */ -@Data -@ApiModel -@TableName("exchange_rate") -public class ExchangeRate { - - /** - * 主键 - */ - @ApiModelProperty("主键") - @TableId(type = IdType.AUTO) - private Long id; - - /** - * 币种 - */ - @ApiModelProperty("币种") - private String currency; - - /** - * 汇率 - */ - @ApiModelProperty("汇率") - private BigDecimal rate; - - /** - * 创建时间 - */ - @ApiModelProperty("创建时间") - private Date createTime; - - /** - * 更新时间 - */ - @ApiModelProperty("更新时间") - private Date updateTime; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/withdraw/WithdrawAccountDtl.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/withdraw/WithdrawAccountDtl.java deleted file mode 100644 index 77d65b64b..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/withdraw/WithdrawAccountDtl.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.accompany.business.model.withdraw; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -/** - * @author: liaozetao - * @date: 2023/7/7 11:07 - * @description: - */ -@Data -@ApiModel -@TableName("withdraw_account_dtl") -public class WithdrawAccountDtl { - - /** - * 主键 - */ - @ApiModelProperty("主键") - @TableId(type = IdType.AUTO) - private Long id; - - /** - * 账户名称 - */ - @ApiModelProperty("账户名称") - private String accountName; - - /** - * 币种类型 - */ - @ApiModelProperty("币种类型") - private String currencyType; - - /** - * 账户类型 - */ - @ApiModelProperty("账户类型") - private Integer accountType; - - /** - * 创建时间 - */ - @ApiModelProperty("创建时间") - private Date createTime; - - /** - * 更新时间 - */ - @ApiModelProperty("更新时间") - private Date updateTime; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/withdraw/WithdrawConfig.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/withdraw/WithdrawConfig.java deleted file mode 100644 index 893e9d998..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/withdraw/WithdrawConfig.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.accompany.business.model.withdraw; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * @author: liaozetao - * @date: 2023/7/7 11:00 - * @description: - */ -@Data -@ApiModel -@TableName("withdraw_config") -public class WithdrawConfig { - - /** - * 主键 - */ - @ApiModelProperty("主键") - @TableId(type = IdType.AUTO) - private Long id; - - /** - * 最小提现金币 - */ - @ApiModelProperty("最小提现金币") - private Long minValue; - - /** - * 周提现上限 - */ - @ApiModelProperty("周提现上限") - private Long weekMaxValue; - - /** - * 周提现次数 - */ - @ApiModelProperty("周提现次数") - private Integer weekLimitCount; - - /** - * 提现手续费率 - */ - @ApiModelProperty("提现手续费率") - private BigDecimal chargeRate; - - /** - * 是否启用 - */ - @ApiModelProperty("是否启用") - private Byte isEnabled; - - /** - * 创建时间 - */ - @ApiModelProperty("创建时间") - private Date createTime; - - /** - * 更新时间 - */ - @ApiModelProperty("更新时间") - private Date updateTime; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/withdraw/WithdrawUser.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/withdraw/WithdrawUser.java deleted file mode 100644 index d90c0e906..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/withdraw/WithdrawUser.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.accompany.business.model.withdraw; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -/** - * @author: liaozetao - * @date: 2023/7/7 14:39 - * @description: - */ -@Data -@ApiModel -@TableName("withdraw_user") -public class WithdrawUser { - - /** - * 主键 - */ - @ApiModelProperty("主键") - @TableId(type = IdType.AUTO) - private Long id; - - /** - * 用户ID - */ - @ApiModelProperty("用户ID") - private Long uid; - - /** - * 账户标识 - */ - @ApiModelProperty("账户标识") - private Integer accountFlag; - - /** - * 创建时间 - */ - @ApiModelProperty("创建时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date createTime; - - /** - * 更新时间 - */ - @ApiModelProperty("更新时间") - private Date updateTime; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/withdraw/WithdrawUserAccount.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/withdraw/WithdrawUserAccount.java deleted file mode 100644 index 5a5d32b10..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/withdraw/WithdrawUserAccount.java +++ /dev/null @@ -1,155 +0,0 @@ -package com.accompany.business.model.withdraw; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -/** - * @author: liaozetao - * @date: 2023/7/7 14:41 - * @description: - */ -@Data -@ApiModel -@TableName("withdraw_user_account") -public class WithdrawUserAccount { - - /** - * 主键 - */ - @ApiModelProperty("主键") - @TableId(type = IdType.AUTO) - private Long id; - - /** - * 用户ID - */ - @ApiModelProperty("用户ID") - private Long uid; - - /** - * 姓 - */ - @ApiModelProperty("姓") - private String surname; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 身份证 - */ - @ApiModelProperty("身份证") - private String idCardNo; - - /** - * 省 - */ - @ApiModelProperty("省") - private String province; - - /** - * 城市 - */ - @ApiModelProperty("城市") - private String city; - - /** - * 街道 - */ - @ApiModelProperty("街道") - private String street; - - /** - * 邮政编码 - */ - @ApiModelProperty("邮政编码") - private String postCode; - - /** - * 账户 - */ - @ApiModelProperty("账户") - private String accountNo; - - /** - * 第三方账户 - */ - @ApiModelProperty("第三方账户") - private String thirdAccountNo; - - /** - * 银行名称 - */ - @ApiModelProperty("银行名称") - private String bankName; - - /** - * 个人地址 - */ - @ApiModelProperty("个人地址") - private String address; - - /** - * 银行代码 - */ - @ApiModelProperty("银行代码") - private String swiftCode; - - /** - * 联系方式 - */ - @ApiModelProperty("联系方式") - private String contact; - - /** - * 正面照片 - */ - @ApiModelProperty("正面照片") - private String frontPhoto; - - /** - * 反面照片 - */ - @ApiModelProperty("反面照片") - private String backPhoto; - - /** - * 账户类型 - */ - @ApiModelProperty("账户类型") - private Integer accountType; - - /** - * 创建时间 - */ - @ApiModelProperty("创建时间") - private Date createTime; - - /** - * 更新时间 - */ - @ApiModelProperty("更新时间") - private Date updateTime; - - /** - * 是否实名认证 - */ - @ApiModelProperty("是否实名认证") - private Integer isRealCertify = 0; - - /** - * 修改次数 - */ - @ApiModelProperty("修改次数") - private Integer updateNum = 0; - -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/withdraw/WithdrawUserLimit.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/withdraw/WithdrawUserLimit.java deleted file mode 100644 index e674a5681..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/withdraw/WithdrawUserLimit.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.accompany.business.model.withdraw; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -/** - * @author: liaozetao - * @date: 2023/7/10 14:28 - * @description: - */ -@Data -@ApiModel -@TableName("withdraw_user_limit") -public class WithdrawUserLimit { - - /** - * 主键 - */ - @ApiModelProperty("主键") - @TableId(type = IdType.AUTO) - private Long id; - - /** - * 用户ID - */ - @ApiModelProperty("用户ID") - private Long uid; - - /** - * 限制方式 - */ - @ApiModelProperty("限制方式") - private Integer limitType; - - /** - * 限制时间 - */ - @ApiModelProperty("限制时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date limitTime; - - /** - * 创建时间 - */ - @ApiModelProperty("创建时间") - private Date createTime; - - /** - * 更新时间 - */ - @ApiModelProperty("更新时间") - private Date updateTime; - -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/withdraw/WithdrawUserRecord.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/withdraw/WithdrawUserRecord.java deleted file mode 100644 index 1098f18b6..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/withdraw/WithdrawUserRecord.java +++ /dev/null @@ -1,208 +0,0 @@ -package com.accompany.business.model.withdraw; - -import com.alibaba.excel.annotation.ExcelProperty; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * @author: liaozetao - * @date: 2023/7/10 14:22 - * @description: - */ -@Data -@ApiModel -@TableName("withdraw_user_record") -public class WithdrawUserRecord { - - /** - * 主键 - */ - @ApiModelProperty("主键") - @TableId(type = IdType.AUTO) - private Long id; - - /** - * 用户ID - */ - @ApiModelProperty("用户ID") - private Long uid; - - /** - * 提现账户 - */ - @ApiModelProperty("提现账户") - private String accountName; - - /** - * 姓 - */ - @ApiModelProperty("姓") - private String surname; - - /** - * 名称 - */ - @ApiModelProperty("名称") - private String name; - - /** - * 身份证 - */ - @ApiModelProperty("身份证") - private String idCardNo; - - /** - * 省 - */ - @ApiModelProperty("省") - private String province; - - /** - * 城市 - */ - @ApiModelProperty("城市") - private String city; - - /** - * 街道 - */ - @ApiModelProperty("街道") - private String street; - - /** - * 邮政编码 - */ - @ApiModelProperty("邮政编码") - private String postCode; - - /** - * 账户 - */ - @ApiModelProperty("账户") - private String accountNo; - - /** - * 第三方账户 - */ - @ApiModelProperty("第三方账户") - private String thirdAccountNo; - - /** - * 银行名称 - */ - @ApiModelProperty("银行名称") - private String bankName; - - /** - * 个人地址 - */ - @ApiModelProperty("个人地址") - private String address; - - /** - * 银行代码 - */ - @ApiModelProperty("银行代码") - private String swiftCode; - - /** - * 联系方式 - */ - @ApiModelProperty("联系方式") - private String contact; - - /** - * 正面照片 - */ - @ApiModelProperty("正面照片") - private String frontPhoto; - - /** - * 反面照片 - */ - @ApiModelProperty("反面照片") - private String backPhoto; - - /** - * 账户类型 - */ - @ApiModelProperty("账户类型") - private Integer accountType; - - /** - * 金币数量 - */ - @ExcelProperty("核销金币") - @ApiModelProperty("金币数量") - private Integer goldNum; - - /** - * 提现金额 - */ - @ApiModelProperty("提现金额") - private BigDecimal cashAmount; - - /** - * 币种类型 - */ - @ApiModelProperty("币种类型") - private String currency; - - /** - * 币种金额 - */ - @ApiModelProperty("币种金额") - private BigDecimal currencyAmount; - - /** - * 手续费 - */ - @ApiModelProperty("手续费") - private BigDecimal handlingRate; - - /** - * 汇率 - */ - @ApiModelProperty("汇率") - private BigDecimal exchangeRate; - - /** - * 记录状态 - */ - @ApiModelProperty("记录状态") - private Byte recordStatus; - - /** - * 发放时间 - */ - @ApiModelProperty("发放时间") - private Date grantTime; - - /** - * 操作人ID - */ - @ApiModelProperty("操作人ID") - private Long operatorId; - - /** - * 创建时间 - */ - @ApiModelProperty("创建时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date createTime; - - /** - * 更新时间 - */ - @ApiModelProperty("更新时间") - private Date updateTime; - -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/mybatis/typehandler/GamePartnerInfoTagListTypeHandler.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/mybatis/typehandler/GamePartnerInfoTagListTypeHandler.java deleted file mode 100644 index e87b6555e..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/mybatis/typehandler/GamePartnerInfoTagListTypeHandler.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.accompany.business.mybatis.typehandler; - -import com.accompany.business.model.gamepartner.GamePartnerInfoTag; -import com.accompany.core.mybatis.typehandler.ListTypeHandler; -import com.alibaba.fastjson.TypeReference; - -import java.util.List; - -/** - * Created by 恒仔 on 2023/3/5. - */ -public class GamePartnerInfoTagListTypeHandler extends ListTypeHandler { - // 将ListTypeHandler（T为任意对象），具体为特定的对象String - @Override - protected TypeReference> specificType() { - return new TypeReference>() {}; - } -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/mybatis/typehandler/LuckySeaDrawItemListTypeHandler.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/mybatis/typehandler/LuckySeaDrawItemListTypeHandler.java deleted file mode 100644 index 643ad776c..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/mybatis/typehandler/LuckySeaDrawItemListTypeHandler.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.accompany.business.mybatis.typehandler; - -import com.accompany.business.model.activity.luckysea.LuckySeaDrawItem; -import com.accompany.core.mybatis.typehandler.ListTypeHandler; -import com.alibaba.fastjson.TypeReference; - -import java.util.List; - -/** - * Created by 恒仔 on 2023/3/5. - */ -public class LuckySeaDrawItemListTypeHandler extends ListTypeHandler { - // 将ListTypeHandler（T为任意对象），具体为特定的对象String - @Override - protected TypeReference> specificType() { - return new TypeReference>() {}; - } -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/mybatis/typehandler/UserGamePartnerInfoTagListTypeHandler.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/mybatis/typehandler/UserGamePartnerInfoTagListTypeHandler.java deleted file mode 100644 index d2edad444..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/mybatis/typehandler/UserGamePartnerInfoTagListTypeHandler.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.accompany.business.mybatis.typehandler; - -import com.accompany.business.model.gamepartner.UserGamePartnerInfoTag; -import com.accompany.core.mybatis.typehandler.ListTypeHandler; -import com.alibaba.fastjson.TypeReference; - -import java.util.List; - -/** - * Created by 恒仔 on 2023/3/5. - */ -public class UserGamePartnerInfoTagListTypeHandler extends ListTypeHandler { - // 将ListTypeHandler（T为任意对象），具体为特定的对象String - @Override - protected TypeReference> specificType() { - return new TypeReference>() {}; - } -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/param/ad/AdPlatfromTrackActiveReqParams.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/param/ad/AdPlatfromTrackActiveReqParams.java deleted file mode 100644 index f25ac4c9c..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/param/ad/AdPlatfromTrackActiveReqParams.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.accompany.business.param.ad; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -@ApiModel -public class AdPlatfromTrackActiveReqParams { - - @ApiModelProperty("ios 手机的 idfa 原值") - private String idfa; - - @ApiModelProperty("安卓手机 imei 的 md5 摘要") - private String imei; - - @ApiModelProperty(value = "安卓：imei号取md5sum摘要；IOS：取idfa原值") - private String muid; - - @ApiModelProperty("Android Q 版本的 oaid 原值") - private String oaId; - - @ApiModelProperty("Android Q 版本的 oaid 原值的md5摘要") - private String oaIdMd5; - - @ApiModelProperty("设备类型 0 是安卓 1 是 IOS 3 其他") - private Integer platOs; - - @ApiModelProperty("安卓设备 id 原值") - private String androidId; - - @ApiModelProperty("IP 原值") - private String ip; - - @ApiModelProperty("用户设备 UA") - private String ua; - - @ApiModelProperty("事件类型 0: 激活") - private Byte evenType; - - @ApiModelProperty("用户uid") - private Long uid; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/param/callbattle/ActCallBattleDrawParams.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/param/callbattle/ActCallBattleDrawParams.java deleted file mode 100644 index 41666f7e2..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/param/callbattle/ActCallBattleDrawParams.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * 文 件 名: LuckySeaActDrawParams - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/4 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.param.callbattle; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *
类描述: 召唤战斗活动抽奖请求参数 - *
功能详细描述: - * - * @author H1 - * @date [2021/1/4] - */ -@Data -@ApiModel -public class ActCallBattleDrawParams { - - @ApiModelProperty(value = "选择的itemId") - private Long itemId; - @ApiModelProperty(value = "选择的数量") - private Long num; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/param/kuaishou/AdKuaishouTrackActiveReqParams.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/param/kuaishou/AdKuaishouTrackActiveReqParams.java deleted file mode 100644 index 1997f9a9e..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/param/kuaishou/AdKuaishouTrackActiveReqParams.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.accompany.business.param.kuaishou; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -@ApiModel -public class AdKuaishouTrackActiveReqParams { - @ApiModelProperty("用户uid") - private Long uid; - @ApiModelProperty("ios 设备 id") - private String idfa; - @ApiModelProperty("imei值") - private String imei; - @ApiModelProperty("安卓oaid") - private String oaid; - @ApiModelProperty("安卓androidId") - private String androidId; - @ApiModelProperty("Android设备mac") - private String mac; - @ApiModelProperty("用户代理") - private String ua; - @ApiModelProperty("事件类型：-1-点击，1-激活，2-注册，3-付费，7-次留") - private Integer evenType; - @ApiModelProperty("金额，当event_type为{3,12,13,14,15}，必须同时回传消费金额参数，单位元，最多保留两位小数") - private Double purchaseAmount; - -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activities/DoubleElevenGiftVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activities/DoubleElevenGiftVo.java deleted file mode 100644 index d01697a04..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activities/DoubleElevenGiftVo.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.accompany.business.vo.activities; - -import com.accompany.common.annotation.ReplaceAppDomain; - -/** - * Created By LeeNana on 2019/10/31. - */ -public class DoubleElevenGiftVo { - private Integer giftId; - - private String giftName; - - @ReplaceAppDomain - private String picUrl; - - @ReplaceAppDomain - private String vggUrl; - - private Long goldPrice; - - private Integer seqNo; - - public Integer getSeqNo() { - return seqNo; - } - - public void setSeqNo(Integer seqNo) { - this.seqNo = seqNo; - } - - public Integer getGiftId() { - return giftId; - } - - public void setGiftId(Integer giftId) { - this.giftId = giftId; - } - - public String getGiftName() { - return giftName; - } - - public void setGiftName(String giftName) { - this.giftName = giftName; - } - - public String getPicUrl() { - return picUrl; - } - - public void setPicUrl(String picUrl) { - this.picUrl = picUrl; - } - - public String getVggUrl() { - return vggUrl; - } - - public void setVggUrl(String vggUrl) { - this.vggUrl = vggUrl; - } - - public Long getGoldPrice() { - return goldPrice; - } - - public void setGoldPrice(Long goldPrice) { - this.goldPrice = goldPrice; - } -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activities/LuckySeaActInfoVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activities/LuckySeaActInfoVo.java deleted file mode 100644 index c83af9c08..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activities/LuckySeaActInfoVo.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * 文 件 名: LuckySeaActInfoVo - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/5 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.vo.activities; - -import com.accompany.business.model.activity.luckysea.LuckySeaActInfo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - *
类描述: - *
功能详细描述: - * - * @author H1 - * @date [2021/1/5] - */ -@Data -@ApiModel -public class LuckySeaActInfoVo extends LuckySeaActInfo { - /** - * 该轮抽奖排行榜 - */ - @ApiModelProperty(value = "该轮抽奖排行榜") - private List rankUserList; - - @ApiModelProperty(value = "用户此轮中奖信息") - private LuckySeaActUserOneRoundDrawResult userDrawResult; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activities/LuckySeaActRoundRankUserVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activities/LuckySeaActRoundRankUserVo.java deleted file mode 100644 index 56429df3f..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activities/LuckySeaActRoundRankUserVo.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * 文 件 名: LuckySeaActRoundStatVo - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/6 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.vo.activities; - -import com.accompany.common.annotation.ReplaceAppDomain; -import lombok.Data; - -@Data -public class LuckySeaActRoundRankUserVo { - private Long uid; - private Long erbanNo; - private String nick; - @ReplaceAppDomain - private String avatar; - private Long prizeDiamonds; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activities/LuckySeaActUserDrawItemVO.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activities/LuckySeaActUserDrawItemVO.java deleted file mode 100644 index 65d64735d..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activities/LuckySeaActUserDrawItemVO.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.accompany.business.vo.activities; - -import com.accompany.core.annotation.I18n; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *
类描述: - *
功能详细描述: - * - * @author H1 - * @date [2021/1/12] - */ -@Data -@ApiModel -public class LuckySeaActUserDrawItemVO { - - @ApiModelProperty("id") - private Long id; - - @I18n(className = "LuckySeaActUserDrawItem") - @ApiModelProperty("名称") - private String name; - - @ApiModelProperty("图片") - private String imgUrl; - - @ApiModelProperty("倍数") - private Integer multiple; - - @ApiModelProperty(value = "用户此轮投的碎片数") - private Integer costPieceNum; - -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activities/LuckySeaActUserOneRoundDrawResult.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activities/LuckySeaActUserOneRoundDrawResult.java deleted file mode 100644 index ec4f63f45..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activities/LuckySeaActUserOneRoundDrawResult.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * 文 件 名: LuckySeaActUserOneRoundDrawResult - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/13 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.vo.activities; - -import com.accompany.core.annotation.I18n; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - *
类描述: - *
功能详细描述: - * - * @author H1 - * @date [2021/1/13] - */ -@Data -@ApiModel -public class LuckySeaActUserOneRoundDrawResult { - - @ApiModelProperty(value = "中奖状态 1:中奖 2:未中奖 3:未参与") - private Byte drawStatus; - @ApiModelProperty(value = "中奖钻石数") - private Long prizeDiamonds; - @ApiModelProperty(value = "奖品单价") - private Long prizePrice; - @ApiModelProperty(value = "奖品数量") - private Long prizeCount; - @ApiModelProperty(value = "奖品名称") - @I18n(className = "LuckySeaActUserDrawItem") - private String prizeName; - @ApiModelProperty(value = "本轮下注情况") - private List drawRecords; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activities/LuckySeaPushMsg.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activities/LuckySeaPushMsg.java deleted file mode 100644 index e3b5ed952..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activities/LuckySeaPushMsg.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.accompany.business.vo.activities; - -import lombok.Data; - -@Data -public class LuckySeaPushMsg { - - private Long uid; - private String nick; - private Long roomUid; - private Long itemId; - private Integer itemMultiple; - private Long diamonds; - private Integer bannerId; - private String skipUrl; - -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activities/LuckySeaUserDrawResultVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activities/LuckySeaUserDrawResultVo.java deleted file mode 100644 index 86ca74e00..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activities/LuckySeaUserDrawResultVo.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * 文 件 名: LuckySeaUserDrawResultVo - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/5 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.vo.activities; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *
类描述: - *
功能详细描述: - * - * @author H1 - * @date [2021/1/5] - */ -@Data -@ApiModel -public class LuckySeaUserDrawResultVo { - - @ApiModelProperty(value = "配置项的图片url") - private String itemUrl; - @ApiModelProperty(value = "投入碎片数") - private Long costPiece; - @ApiModelProperty(value = "配置id") - private Long itemId; - @ApiModelProperty("倍数") - private Integer multiple; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activities/PageActivityVO.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activities/PageActivityVO.java deleted file mode 100644 index 8c2a447da..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activities/PageActivityVO.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.accompany.business.vo.activities; - -import lombok.Data; - -/** - * @author linuxea - * @date 2019/9/29 17:54 - */ -@Data -public class PageActivityVO { - - /** id 标识 */ - private Long id; - - /** 活动代码 */ - private String code; - - /** 活动页面标题 */ - private String title; - - /** 活动二级标题 */ - private String secondTitle; - - /** 页面活动图片地址 */ - private String imgUrl; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/ActSigningUpVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/ActSigningUpVo.java deleted file mode 100644 index 265790b73..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/ActSigningUpVo.java +++ /dev/null @@ -1,130 +0,0 @@ -package com.accompany.business.vo.activity; - -import com.accompany.common.annotation.ReplaceAppDomain; - -import java.util.Date; - -/** - * Created by yuanyi on 2019/2/1. - */ -public class ActSigningUpVo { - private RankActVo me; - - private Long uid; - - private String tag; - - @ReplaceAppDomain - private String soundUrl; - - private Byte actStatus; - - private Long likeCount;//点赞数 - - private Integer todayLikeCount;//当天自己所使用的点赞数 - - private Long rank;//排名 - - private Boolean signBol; // 是否报名 - - private Date createTime; - - private Date updateTime; - - public Boolean getSignBol() { - return signBol; - } - - public void setSignBol(Boolean signBol) { - this.signBol = signBol; - } - - public Byte getActStatus() { - return actStatus; - } - - public void setActStatus(Byte actStatus) { - this.actStatus = actStatus; - } - - public RankActVo getMe() { - return me; - } - - public void setMe(RankActVo me) { - this.me = me; - } - - public Long getUid() { - return uid; - } - - public void setUid(Long uid) { - this.uid = uid; - } - - public String getTag() { - return tag; - } - - public void setTag(String tag) { - this.tag = tag; - } - - public String getSoundUrl() { - return soundUrl; - } - - public void setSoundUrl(String soundUrl) { - this.soundUrl = soundUrl; - } - - public Long getLikeCount() { - return likeCount; - } - - public void setLikeCount(Long likeCount) { - this.likeCount = likeCount; - } - - public Long getRank() { - return rank; - } - - public void setRank(Long rank) { - this.rank = rank; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Date getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } - - public Integer getTodayLikeCount() { - return todayLikeCount; - } - - public void setTodayLikeCount(Integer todayLikeCount) { - this.todayLikeCount = todayLikeCount; - } - - @Override - public boolean equals(Object obj) { - ActSigningUpVo actSigningUpVo = (ActSigningUpVo) obj; - if (actSigningUpVo.getUid().longValue() == getUid().longValue()) - return true; - else - return false; - } -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/ActivitySingleRoomRankAward.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/ActivitySingleRoomRankAward.java deleted file mode 100644 index 620ed9f92..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/ActivitySingleRoomRankAward.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.accompany.business.vo.activity; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -@Data -@ApiModel -public class ActivitySingleRoomRankAward { - - @ApiModelProperty("第一名奖励") - private List firstAward; - - @ApiModelProperty("第二名奖励") - private List secondAward; - - @ApiModelProperty("第三名奖励") - private List thirdAward; - -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/ActivitySingleRoomRankConfig.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/ActivitySingleRoomRankConfig.java deleted file mode 100644 index ba40a7054..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/ActivitySingleRoomRankConfig.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.accompany.business.vo.activity; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - - -@Data -@ApiModel -public class ActivitySingleRoomRankConfig { - - @ApiModelProperty("闪耀主播奖励") - private ActivitySingleRoomRankAward newUserSendGiftAward; - - @ApiModelProperty("人气主播奖励") - private ActivitySingleRoomRankAward joinFansUser; - - @ApiModelProperty("勤奋主播奖励") - private ActivitySingleRoomRankAward openTime; - -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/ActivitySingleRoomRankVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/ActivitySingleRoomRankVo.java deleted file mode 100644 index c1d923cca..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/ActivitySingleRoomRankVo.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.accompany.business.vo.activity; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -@Data -@ApiModel -public class ActivitySingleRoomRankVo { - - @ApiModelProperty("榜单列表") - private List rankVoList; - - @ApiModelProperty("榜单开始时间") - private String beginTimeWeek; - - @ApiModelProperty("榜单结束时间") - private String endTimeWeek; - -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/ActivityVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/ActivityVo.java deleted file mode 100644 index 0c6f23deb..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/ActivityVo.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.accompany.business.vo.activity; - -import com.alibaba.fastjson.JSON; - -import java.util.List; - -public class ActivityVo { - private Long ranking; - - private Long score; - - private List actUserVos; - - public Long getRanking() { - return ranking; - } - - public void setRanking(Long ranking) { - this.ranking = ranking; - } - - public Long getScore() { - return score; - } - - public void setScore(Long score) { - this.score = score; - } - - public List getActUserVos() { - return actUserVos; - } - - public void setActUserVos(List actUserVos) { - this.actUserVos = actUserVos; - } - - @Override - public String toString() { - return JSON.toJSONString(this); - } -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/AnnualCpRankVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/AnnualCpRankVo.java deleted file mode 100644 index a55369745..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/AnnualCpRankVo.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.accompany.business.vo.activity; - -import java.util.List; - -/** - * 2 * @Author: zhuct - * 3 * @Date: 2018/12/5 15:07 - * 4 - */ -public class AnnualCpRankVo implements Comparable{ - private Long ranking; - - private Long score; - - private List users; - - public Long getRanking() { - return ranking; - } - - public void setRanking(Long ranking) { - this.ranking = ranking; - } - - public Long getScore() { - return score; - } - - public void setScore(Long score) { - this.score = score; - } - - public List getUsers() { - return users; - } - - public void setUsers(List users) { - this.users = users; - } - - @Override - public int compareTo(AnnualCpRankVo vo) { - Long score = vo.getScore(); - Long ranking = vo.getRanking(); - Long rankingThis = this.ranking; - long scoreThis = this.score; - if(ranking == null || rankingThis == null){ - return score.compareTo(scoreThis); - }else { - return rankingThis.compareTo(ranking); - } - } -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/AnnualRankParentVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/AnnualRankParentVo.java deleted file mode 100644 index 650674dbd..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/AnnualRankParentVo.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.accompany.business.vo.activity; - -import java.util.List; - -/** - * 2 * @Author: zhuct - * 3 * @Date: 2018/12/5 12:03 - * 4 - */ -public class AnnualRankParentVo { - private List ranks; - private AnnualRankVo meRank; - - public List getRanks() { - return ranks; - } - - public void setRanks(List ranks) { - this.ranks = ranks; - } - - public AnnualRankVo getMeRank() { - return meRank; - } - - public void setMeRank(AnnualRankVo meRank) { - this.meRank = meRank; - } -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/AnnualRankVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/AnnualRankVo.java deleted file mode 100644 index 374f70ef0..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/AnnualRankVo.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.accompany.business.vo.activity; - -import com.accompany.common.annotation.ReplaceAppDomain; - -/** - * 2 * @Author: zhuct - * 3 * @Date: 2018/12/5 15:07 - * 4 - */ -public class AnnualRankVo { - private Long ranking; - - private Long score; - - private Long uid; - - private Long erbanNo; - - private String nick; - - @ReplaceAppDomain - private String avatar; - - private Byte gender; - - public Byte getGender() { - return gender; - } - - public void setGender(Byte gender) { - this.gender = gender; - } - - public Long getRanking() { - return ranking; - } - - public void setRanking(Long ranking) { - this.ranking = ranking; - } - - public Long getScore() { - return score; - } - - public void setScore(Long score) { - this.score = score; - } - - public Long getUid() { - return uid; - } - - public void setUid(Long uid) { - this.uid = uid; - } - - public Long getErbanNo() { - return erbanNo; - } - - public void setErbanNo(Long erbanNo) { - this.erbanNo = erbanNo; - } - - public String getNick() { - return nick; - } - - public void setNick(String nick) { - this.nick = nick; - } - - public String getAvatar() { - return avatar; - } - - public void setAvatar(String avatar) { - this.avatar = avatar; - } -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/AnnualRoomRankParentVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/AnnualRoomRankParentVo.java deleted file mode 100644 index 360305309..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/AnnualRoomRankParentVo.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.accompany.business.vo.activity; - -import java.util.List; - -/** - * 2 * @Author: zhuct - * 3 * @Date: 2018/12/5 12:03 - * 4 - */ -public class AnnualRoomRankParentVo { - private List roomRanks; - private AnnualRoomRankVo meRoomRank; - - public List getRoomRanks() { - return roomRanks; - } - - public void setRoomRanks(List roomRanks) { - this.roomRanks = roomRanks; - } - - public AnnualRoomRankVo getMeRoomRank() { - return meRoomRank; - } - - public void setMeRoomRank(AnnualRoomRankVo meRoomRank) { - this.meRoomRank = meRoomRank; - } -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/AnnualRoomRankVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/AnnualRoomRankVo.java deleted file mode 100644 index 60b63dc38..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/AnnualRoomRankVo.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.accompany.business.vo.activity; - -import com.accompany.common.annotation.ReplaceAppDomain; - -/** - * 2 * @Author: zhuct - * 3 * @Date: 2018/12/5 12:00 - * 4 - */ -public class AnnualRoomRankVo { - private Long ranking; - - private Long score; - - private Long roomId; - - private Long familyId; - - private String familyName; - - private Long uid; - - private Long erbanNo; - - private String nick; - - @ReplaceAppDomain - private String avatar; - - public Long getRanking() { - return ranking; - } - - public void setRanking(Long ranking) { - this.ranking = ranking; - } - - public Long getScore() { - return score; - } - - public void setScore(Long score) { - this.score = score; - } - - public Long getRoomId() { - return roomId; - } - - public void setRoomId(Long roomId) { - this.roomId = roomId; - } - - public Long getFamilyId() { - return familyId; - } - - public void setFamilyId(Long familyId) { - this.familyId = familyId; - } - - public String getFamilyName() { - return familyName; - } - - public void setFamilyName(String familyName) { - this.familyName = familyName; - } - - public Long getUid() { - return uid; - } - - public void setUid(Long uid) { - this.uid = uid; - } - - public Long getErbanNo() { - return erbanNo; - } - - public void setErbanNo(Long erbanNo) { - this.erbanNo = erbanNo; - } - - public String getNick() { - return nick; - } - - public void setNick(String nick) { - this.nick = nick; - } - - public String getAvatar() { - return avatar; - } - - public void setAvatar(String avatar) { - this.avatar = avatar; - } -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/ChristmasTreeActConfigVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/ChristmasTreeActConfigVo.java deleted file mode 100644 index a7c0c63d2..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/ChristmasTreeActConfigVo.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.accompany.business.vo.activity; - -/** - * 2 * @Author: zhuct - * 3 * @Date: 2018/12/4 17:29 - * 4 - */ -public class ChristmasTreeActConfigVo { - private Long shareCount; - private Long familyCharm; - private Integer giftV1Id; - private Long giftV1Count; - private Integer giftV2Id; - private Long giftV2Count; - private Integer giftV3Id; - private Long giftV3Count; - - public Long getShareCount() { - return shareCount; - } - - public void setShareCount(Long shareCount) { - this.shareCount = shareCount; - } - - public Long getFamilyCharm() { - return familyCharm; - } - - public void setFamilyCharm(Long familyCharm) { - this.familyCharm = familyCharm; - } - - public Integer getGiftV1Id() { - return giftV1Id; - } - - public void setGiftV1Id(Integer giftV1Id) { - this.giftV1Id = giftV1Id; - } - - public Long getGiftV1Count() { - return giftV1Count; - } - - public void setGiftV1Count(Long giftV1Count) { - this.giftV1Count = giftV1Count; - } - - public Integer getGiftV2Id() { - return giftV2Id; - } - - public void setGiftV2Id(Integer giftV2Id) { - this.giftV2Id = giftV2Id; - } - - public Long getGiftV2Count() { - return giftV2Count; - } - - public void setGiftV2Count(Long giftV2Count) { - this.giftV2Count = giftV2Count; - } - - public Integer getGiftV3Id() { - return giftV3Id; - } - - public void setGiftV3Id(Integer giftV3Id) { - this.giftV3Id = giftV3Id; - } - - public Long getGiftV3Count() { - return giftV3Count; - } - - public void setGiftV3Count(Long giftV3Count) { - this.giftV3Count = giftV3Count; - } -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/ChristmasTreeInfoVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/ChristmasTreeInfoVo.java deleted file mode 100644 index 0466c39ac..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/ChristmasTreeInfoVo.java +++ /dev/null @@ -1,129 +0,0 @@ -package com.accompany.business.vo.activity; - -import com.accompany.common.annotation.ReplaceAppDomain; - -/** - * 2 * @Author: zhuct - * 3 * @Date: 2018/12/4 17:29 - * 4 - */ -public class ChristmasTreeInfoVo { - private Long shareCount; - private Long shareCountMax; - private Long familyCharm; - private Long familyCharmMax; - private Long giftV1Num; - private Long giftV1NumMax; - private Long giftV2Num; - private Long giftV2NumMax; - private Long giftV3Num; - private Long giftV3NumMax; - private Boolean receiveStatus; - @ReplaceAppDomain - private String avatar; - private String familyName; - - public String getAvatar() { - return avatar; - } - - public void setAvatar(String avatar) { - this.avatar = avatar; - } - - public String getFamilyName() { - return familyName; - } - - public void setFamilyName(String familyName) { - this.familyName = familyName; - } - - public Long getShareCountMax() { - return shareCountMax; - } - - public void setShareCountMax(Long shareCountMax) { - this.shareCountMax = shareCountMax; - } - - public Long getFamilyCharmMax() { - return familyCharmMax; - } - - public void setFamilyCharmMax(Long familyCharmMax) { - this.familyCharmMax = familyCharmMax; - } - - public Long getGiftV1NumMax() { - return giftV1NumMax; - } - - public void setGiftV1NumMax(Long giftV1NumMax) { - this.giftV1NumMax = giftV1NumMax; - } - - public Long getGiftV2NumMax() { - return giftV2NumMax; - } - - public void setGiftV2NumMax(Long giftV2NumMax) { - this.giftV2NumMax = giftV2NumMax; - } - - public Long getGiftV3NumMax() { - return giftV3NumMax; - } - - public void setGiftV3NumMax(Long giftV3NumMax) { - this.giftV3NumMax = giftV3NumMax; - } - - public Boolean getReceiveStatus() { - return receiveStatus; - } - - public void setReceiveStatus(Boolean receiveStatus) { - this.receiveStatus = receiveStatus; - } - - public Long getShareCount() { - return shareCount; - } - - public void setShareCount(Long shareCount) { - this.shareCount = shareCount; - } - - public Long getFamilyCharm() { - return familyCharm; - } - - public void setFamilyCharm(Long familyCharm) { - this.familyCharm = familyCharm; - } - - public Long getGiftV1Num() { - return giftV1Num; - } - - public void setGiftV1Num(Long giftV1Num) { - this.giftV1Num = giftV1Num; - } - - public Long getGiftV2Num() { - return giftV2Num; - } - - public void setGiftV2Num(Long giftV2Num) { - this.giftV2Num = giftV2Num; - } - - public Long getGiftV3Num() { - return giftV3Num; - } - - public void setGiftV3Num(Long giftV3Num) { - this.giftV3Num = giftV3Num; - } -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/NationalActivityVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/NationalActivityVo.java deleted file mode 100644 index f4c271132..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/NationalActivityVo.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.accompany.business.vo.activity; - -import java.util.List; - -/** - * Created By LeeNana on 2019/9/18. - */ -public class NationalActivityVo { - private List usersList; - - private RankActVo me; - - private Long total; - - private Long showNum; - - public List getUsersList() { - return usersList; - } - - public void setUsersList(List usersList) { - this.usersList = usersList; - } - - public RankActVo getMe() { - return me; - } - - public void setMe(RankActVo me) { - this.me = me; - } - - public Long getTotal() { - return total; - } - - public void setTotal(Long total) { - this.total = total; - } - - public Long getShowNum() { - return showNum; - } - - public void setShowNum(Long showNum) { - this.showNum = showNum; - } -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/PlayMyTeamHonorRankVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/PlayMyTeamHonorRankVo.java deleted file mode 100644 index efa4630b1..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/PlayMyTeamHonorRankVo.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.accompany.business.vo.activity; - -/** - * Created By LeeNana on 2019/6/12. - */ -public class PlayMyTeamHonorRankVo { - private AnnualRankVo MyRank; // 个人荣誉值排行 - - private PlayTeamHonorRankVo teamRank; //战队排名 - - public AnnualRankVo getMyRank() { - return MyRank; - } - - public void setMyRank(AnnualRankVo myRank) { - MyRank = myRank; - } - - public PlayTeamHonorRankVo getTeamRank() { - return teamRank; - } - - public void setTeamRank(PlayTeamHonorRankVo teamRank) { - this.teamRank = teamRank; - } -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/PlayTeamHonorRankVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/PlayTeamHonorRankVo.java deleted file mode 100644 index 22376048b..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/PlayTeamHonorRankVo.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.accompany.business.vo.activity; - -import com.accompany.common.annotation.ReplaceAppDomain; - -import java.util.List; - -/** - * 战队荣耀值排行榜 - * Created By LeeNana on 2019/5/27. - */ -public class PlayTeamHonorRankVo { - private Long ranking; - - private Long score; - - private String teamName; - - private Long teamUid; - - private String teamNo; - - @ReplaceAppDomain - private String portrait; // 头像 - - private List ranks; // 个人荣誉值排行 - - public Long getRanking() { - return ranking; - } - - public void setRanking(Long ranking) { - this.ranking = ranking; - } - - public Long getScore() { - return score; - } - - public void setScore(Long score) { - this.score = score; - } - - public String getTeamName() { - return teamName; - } - - public void setTeamName(String teamName) { - this.teamName = teamName; - } - - public Long getTeamUid() { - return teamUid; - } - - public void setTeamUid(Long teamUid) { - this.teamUid = teamUid; - } - - public String getPortrait() { - return portrait; - } - - public void setPortrait(String portrait) { - this.portrait = portrait; - } - - public List getRanks() { - return ranks; - } - - public void setRanks(List ranks) { - this.ranks = ranks; - } - - public String getTeamNo() { - return teamNo; - } - - public void setTeamNo(String teamNo) { - this.teamNo = teamNo; - } -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/RegisterActivityStatusVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/RegisterActivityStatusVo.java deleted file mode 100644 index 363d971eb..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/RegisterActivityStatusVo.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.accompany.business.vo.activity; - -/** - * Created By LeeNana on 2019/8/14. - * 任务状态 - */ -public class RegisterActivityStatusVo { - - private Byte status; - - private Integer receiveNum; - - public Byte getStatus() { - return status; - } - - public void setStatus(Byte status) { - this.status = status; - } - - public Integer getReceiveNum() { - return receiveNum; - } - - public void setReceiveNum(Integer receiveNum) { - this.receiveNum = receiveNum; - } -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/SpecialGiftRulesVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/SpecialGiftRulesVo.java deleted file mode 100644 index 72023cde1..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/SpecialGiftRulesVo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.accompany.business.vo.activity; - -import java.util.List; -import java.util.Map; - -/** - * Created by yuanyi on 2019/1/16. - */ -public class SpecialGiftRulesVo { - private Integer giftId; - private List> effectTimeList; - private Integer regularTimes; - - public Integer getGiftId() { - return giftId; - } - - public void setGiftId(Integer giftId) { - this.giftId = giftId; - } - - public List> getEffectTimeList() { - return effectTimeList; - } - - public void setEffectTimeList(List> effectTimeList) { - this.effectTimeList = effectTimeList; - } - - public Integer getRegularTimes() { - return regularTimes; - } - - public void setRegularTimes(Integer regularTimes) { - this.regularTimes = regularTimes; - } -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/VkissPrizeVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/VkissPrizeVo.java deleted file mode 100644 index ed0077155..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/VkissPrizeVo.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.accompany.business.vo.activity; - - - -public class VkissPrizeVo { - private Integer giftId; - - private Integer days; - - private Long goldNum; - - private String type; - - public Integer getGiftId() { - return giftId; - } - - public void setGiftId(Integer giftId) { - this.giftId = giftId; - } - - public Integer getDays() { - return days; - } - - public void setDays(Integer days) { - this.days = days; - } - - public Long getGoldNum() { - return goldNum; - } - - public void setGoldNum(Long goldNum) { - this.goldNum = goldNum; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/callbattle/ActCallBattleInfoVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/callbattle/ActCallBattleInfoVo.java deleted file mode 100644 index c141a2bf1..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/callbattle/ActCallBattleInfoVo.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * 文 件 名: LuckySeaActInfoVo - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/5 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.vo.callbattle; - -import com.accompany.business.model.callbattle.ActCallBattleInfo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - *
类描述: - *
功能详细描述: - * - * @author H1 - * @date [2021/1/5] - */ -@Data -@ApiModel -public class ActCallBattleInfoVo extends ActCallBattleInfo { - /** - * 该轮抽奖排行榜 - */ - @ApiModelProperty(value = "该轮抽奖排行榜") - private List rankUserList; - - @ApiModelProperty(value = "用户此轮中奖信息") - private ActCallBattleUserOneRoundDrawResult userDrawResult; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/callbattle/ActCallBattleRankListVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/callbattle/ActCallBattleRankListVo.java deleted file mode 100644 index dfe0ed95d..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/callbattle/ActCallBattleRankListVo.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * 文 件 名: LuckySeaRankListVo - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/4 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.vo.callbattle; - -import com.accompany.common.annotation.ReplaceAppDomain; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *
类描述: 召唤战斗榜单列表vo - *
功能详细描述: - * - * @author H1 - * @date [2021/1/4] - */ -@Data -@ApiModel -public class ActCallBattleRankListVo { - @ApiModelProperty(value = "头像") - @ReplaceAppDomain - private String avatar; - @ApiModelProperty(value = "昵称") - private String nick; - @ApiModelProperty(value = "66号") - private Long erbanNo; - @ApiModelProperty(value = "数值") - private Double num; - @ApiModelProperty(value = "我的排名") - private Integer myRanking; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/callbattle/ActCallBattleRankVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/callbattle/ActCallBattleRankVo.java deleted file mode 100644 index 5a2966616..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/callbattle/ActCallBattleRankVo.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * 文 件 名: LuckySeaRankVo - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/4 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.vo.callbattle; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - *
类描述: 召唤活动榜单 - *
功能详细描述: - * - * @author H1 - * @date [2021/1/4] - */ -@Data -@ApiModel -public class ActCallBattleRankVo { - - @ApiModelProperty(value = "排行榜信息") - private List rankList; - - @ApiModelProperty(value = "用户排行榜信息") - private ActCallBattleRankListVo myRankInfo; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/callbattle/ActCallBattleRoundStatVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/callbattle/ActCallBattleRoundStatVo.java deleted file mode 100644 index 3c368f181..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/callbattle/ActCallBattleRoundStatVo.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * 文 件 名: LuckySeaActRoundStatVo - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/6 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.vo.callbattle; - -import lombok.Data; - -/** - *
类描述: 召唤战斗活动单轮用户投入统计 - *
功能详细描述: - * - * @author H1 - * @date [2021/1/6] - */ -@Data -public class ActCallBattleRoundStatVo { - /** - * 用户选择的配置id - */ - private Long itemId; - /** - * 用户选择的配置倍数 - */ - private Integer itemMultiple; - private Long uid; - /** - * 用户投入的碎片总数 - */ - private Long totalPiece; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/callbattle/ActCallBattleUserDrawItemVO.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/callbattle/ActCallBattleUserDrawItemVO.java deleted file mode 100644 index d43d89264..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/callbattle/ActCallBattleUserDrawItemVO.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 文 件 名: LuckySeaActUserDrawItemVO - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/12 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.vo.callbattle; - -import com.accompany.business.model.callbattle.ActCallBattleItem; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *
类描述: - *
功能详细描述: - * - * @author H1 - * @date [2021/1/12] - */ -@Data -@ApiModel -public class ActCallBattleUserDrawItemVO extends ActCallBattleItem { - - @ApiModelProperty(value = "用户此轮投的碎片数") - private Integer costPieceNum; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/callbattle/ActCallBattleUserDrawRecordVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/callbattle/ActCallBattleUserDrawRecordVo.java deleted file mode 100644 index 1652a6266..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/callbattle/ActCallBattleUserDrawRecordVo.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * 文 件 名: LuckySeaActUserDrawRecordVo - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/5 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.vo.callbattle; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; -import java.util.List; - -/** - *
类描述: 召唤战斗活动用户抽奖记录信息 - *
功能详细描述: - * - * @author H1 - * @date [2021/1/5] - */ -@Data -@ApiModel -public class ActCallBattleUserDrawRecordVo { - - @ApiModelProperty(value = "轮次id") - private String roundId; - - @ApiModelProperty(value = "轮次开奖时间") - private Date drawTime; - - @ApiModelProperty(value = "中奖状态") - private Byte drawStatus; - - @ApiModelProperty(value = "中奖详情") - private List results; - - @ApiModelProperty(value = "游戏奖励") - private Long reward; - - @ApiModelProperty(value = "中奖id") - private Long drawId; - - @ApiModelProperty("克制物名称") - private String restraintName; - - @ApiModelProperty("克制物图片链接") - private String restraintImageUrl; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/callbattle/ActCallBattleUserDrawResultVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/callbattle/ActCallBattleUserDrawResultVo.java deleted file mode 100644 index 50fe11e69..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/callbattle/ActCallBattleUserDrawResultVo.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * 文 件 名: LuckySeaUserDrawResultVo - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/5 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.vo.callbattle; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *
类描述: - *
功能详细描述: - * - * @author H1 - * @date [2021/1/5] - */ -@Data -@ApiModel -public class ActCallBattleUserDrawResultVo { - - @ApiModelProperty(value = "配置项的图片url") - private String itemUrl; - @ApiModelProperty(value = "投入碎片数") - private Long costPiece; - @ApiModelProperty(value = "配置id") - private Long itemId; - @ApiModelProperty("倍数") - private Integer multiple; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/callbattle/ActCallBattleUserInfo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/callbattle/ActCallBattleUserInfo.java deleted file mode 100644 index a0ae635fc..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/callbattle/ActCallBattleUserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * 文 件 名: LuckySeaActUserInfo - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2020/12/30 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.vo.callbattle; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *
类描述: 用户活动信息 - *
功能详细描述: - * - * @author H1 - * @date [2020/12/30] - */ -@Data -@ApiModel -public class ActCallBattleUserInfo { - @ApiModelProperty(value = "头像") - private String avatar; - @ApiModelProperty(value = "昵称") - private String nick; - @ApiModelProperty(value = "当前碎片数") - private Long pieceNum; - @ApiModelProperty(value = "当前钻石数") - private Double diamonds; - @ApiModelProperty(value = "今日奖励") - private Double todayReward; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/callbattle/ActCallBattleUserOneRoundDrawResult.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/callbattle/ActCallBattleUserOneRoundDrawResult.java deleted file mode 100644 index b72cdb312..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/callbattle/ActCallBattleUserOneRoundDrawResult.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * 文 件 名: LuckySeaActUserOneRoundDrawResult - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/13 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.vo.callbattle; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *
类描述: - *
功能详细描述: - * - * @author H1 - * @date [2021/1/13] - */ -@Data -@ApiModel -public class ActCallBattleUserOneRoundDrawResult { - - @ApiModelProperty(value = "中奖状态 1:中奖 2:未中奖 3:未参与") - private Byte drawStatus; - @ApiModelProperty(value = "中奖钻石数") - private Long prizeDiamonds; - @ApiModelProperty(value = "奖品单价") - private Long prizePrice; - @ApiModelProperty(value = "奖品数量") - private Long prizeCount; - @ApiModelProperty(value = "奖品名称") - private String prizeName; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/chat/PublicChatTopRecordVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/chat/PublicChatTopRecordVo.java deleted file mode 100644 index 725903499..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/chat/PublicChatTopRecordVo.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.accompany.business.vo.chat; - -import com.accompany.business.model.chat.PublicChatTopRecord; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author: liaozetao - * @date: 2024/7/3 11:05 - * @description: - */ -@Data -@ApiModel -public class PublicChatTopRecordVo extends PublicChatTopRecord { - - /** - * 用户ID - */ - @ApiModelProperty("用户ID") - private Long erbanNo; - - /** - * 昵称 - */ - @ApiModelProperty("昵称") - private String nick; - - /** - * 头像 - */ - @ApiModelProperty("头像") - private String avatar; -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/exchange/WithdrawAccountVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/exchange/WithdrawAccountVo.java deleted file mode 100644 index b39ef2428..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/exchange/WithdrawAccountVo.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.accompany.business.vo.exchange; - -import com.accompany.business.model.WithdrawAccount; -import lombok.Data; - -@Data -public class WithdrawAccountVo { - - private WithdrawAccount account; - private Double golds; - private Integer remainTimes; - private Double fee;//手续费 - private Double minGolds; - private Double maxGolds; - private Boolean hasPayPwd; - -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/gamepartner/GamePartnerOrderVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/gamepartner/GamePartnerOrderVo.java deleted file mode 100644 index 66aa8dfe9..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/gamepartner/GamePartnerOrderVo.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.accompany.business.vo.gamepartner; - -import com.accompany.business.model.gamepartner.GamePartnerOrder; -import com.accompany.business.model.gamepartner.UserGamePartnerInfoTag; -import com.accompany.common.annotation.ReplaceAppDomain; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @author: liaozetao - * @date: 2023/8/21 14:33 - * @description: - */ -@Data -public class GamePartnerOrderVo extends GamePartnerOrder { - - /** - * 下单平台号 - */ - @ApiModelProperty("下单平台号") - private Long fromErBanNo; - - /** - * 下单昵称 - */ - @ApiModelProperty("下单昵称") - private String fromNick; - - /** - * 下单头像 - */ - @ApiModelProperty("下单头像") - @ReplaceAppDomain - private String fromAvatar; - - /** - * 接单平台号 - */ - @ApiModelProperty("接单平台号") - private Long toErBanNo; - - /** - * 接单昵称 - */ - @ApiModelProperty("接单昵称") - private String toNick; - - /** - * 接单头像 - */ - @ApiModelProperty("接单头像") - @ReplaceAppDomain - private String toAvatar; - - /** - * 游戏icon - */ - @ApiModelProperty("游戏logo") - @ReplaceAppDomain - private String gameLogo; - - /** - * 游戏icon - */ - @ApiModelProperty("游戏background") - @ReplaceAppDomain - private String gameBackground; - - /** - * 游戏icon - */ - @ApiModelProperty("游戏大图") - @ReplaceAppDomain - private String gamePic; - - /** - * 游戏名称 - */ - @ApiModelProperty("游戏名称") - private String gameName; - - /** - * 下单时间 - */ - @ApiModelProperty("下单时间") - private String orderTime; - - /** - * 用户自定义游戏标签 - */ - @ApiModelProperty("用户自定义游戏标签") - private List tags; - -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/gamepartner/GamePartnerUserInfoVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/gamepartner/GamePartnerUserInfoVo.java deleted file mode 100644 index 37fcee3ae..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/gamepartner/GamePartnerUserInfoVo.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.accompany.business.vo.gamepartner; - -import com.accompany.business.vo.SimpleUserVo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -@ApiModel -@Data -public class GamePartnerUserInfoVo extends SimpleUserVo { - - @ApiModelProperty("游戏属性") - List gamePartnerInfoList; - -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/gamepartner/UserGamePartnerInfoVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/gamepartner/UserGamePartnerInfoVo.java deleted file mode 100644 index a3ea62ba9..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/gamepartner/UserGamePartnerInfoVo.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.accompany.business.vo.gamepartner; - -import com.accompany.business.model.gamepartner.GamePartnerInfo; -import com.accompany.business.model.gamepartner.UserGamePartnerInfo; -import com.accompany.business.model.gamepartner.UserGamePartnerInfoTag; -import com.accompany.business.mybatis.typehandler.UserGamePartnerInfoTagListTypeHandler; -import com.accompany.common.annotation.ReplaceAppDomain; -import com.accompany.core.annotation.I18n; -import com.baomidou.mybatisplus.annotation.TableField; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -@ApiModel -@Data -public class UserGamePartnerInfoVo { - - private Long uid; - @ApiModelProperty("游戏id") - private Integer gameId; - @ApiModelProperty("游戏名") - private String gameName; - @ApiModelProperty("logo") - @ReplaceAppDomain - private String logo; - @ApiModelProperty("背景图") - @ReplaceAppDomain - private String background; - @ApiModelProperty("详细大图") - @ReplaceAppDomain - private String pic; - @ApiModelProperty("价格") - private Long price; - @ApiModelProperty("熟练度") - @I18n(className = "UserGamePartnerInfo", adminSwitch = false) - private String proficiency; - @ApiModelProperty("游戏标签属性") - @TableField(typeHandler = UserGamePartnerInfoTagListTypeHandler.class) - private List tags; - @ApiModelProperty("完成订单数") - private Integer finishNum; - @ApiModelProperty("排序号") - private Integer seq; - - public UserGamePartnerInfoVo() { - } - - public UserGamePartnerInfoVo(UserGamePartnerInfo userInfo, GamePartnerInfo info) { - this.uid = userInfo.getUid(); - this.gameId = userInfo.getGameId(); - if (null != info){ - this.gameName = info.getGameName(); - this.logo = info.getLogo(); - this.background = info.getBackground(); - this.pic = info.getPic(); - } - this.price = userInfo.getPrice(); - this.proficiency = userInfo.getProficiency(); - this.tags = userInfo.getTags(); - this.finishNum = userInfo.getFinishNum(); - this.seq = userInfo.getSeq(); - } -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/gift/NewUserGift.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/gift/NewUserGift.java deleted file mode 100644 index 38753ee91..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/gift/NewUserGift.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.accompany.business.vo.gift; - -import com.accompany.business.vo.GiftVo; -import com.accompany.core.annotation.I18n; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @author guojicong - * @description - * @date 2022-07-26 - */ -@Data -@NoArgsConstructor -public class NewUserGift { - private Integer giftId; - /** - * 礼物名称 - */ - @I18n(className = "Gift") - private String giftName; - /** - *礼物图片 - */ - private String giftUrl; - /** - * 礼物数量 - */ - private Integer count; - - public NewUserGift(GiftVo vo,Integer giftNum){ - this.giftId = vo.getGiftId(); - this.giftName = vo.getGiftName(); - this.giftUrl = vo.getGiftUrl(); - this.count = giftNum; - } -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/gift/NewUserGiftVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/gift/NewUserGiftVo.java deleted file mode 100644 index 2f3a6488d..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/gift/NewUserGiftVo.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.accompany.business.vo.gift; - -import com.accompany.business.model.newuser.NewUserInRoomGift; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @author guojicong - * @description - * @date 2022-07-25 - */ -@Data -@NoArgsConstructor -public class NewUserGiftVo { - private Long id; - private Integer giftId; - private Integer giftNum = 1; - private String giftName; - private String channel; - - public NewUserGiftVo(NewUserInRoomGift entity, String giftName) { - this.id = entity.getId(); - this.giftId = entity.getGiftId(); - this.giftNum = entity.getGiftNum(); - this.giftName = giftName; - this.channel = entity.getChannel(); - } -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/helper/AliyunToken.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/helper/AliyunToken.java deleted file mode 100644 index 235a71c83..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/helper/AliyunToken.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.accompany.business.vo.helper; - -public class AliyunToken { - - private String accessKeyId; - private String accessKeySecret; - private String securityToken; - private String expiration; - - @Override - public String toString() { - return "AliyunToken{" + - "accessKeyId='" + accessKeyId + '\'' + - ", accessKeySecret='" + accessKeySecret + '\'' + - ", securityToken='" + securityToken + '\'' + - ", expiration='" + expiration + '\'' + - '}'; - } - - public String getAccessKeyId() { - return accessKeyId; - } - - public void setAccessKeyId(String accessKeyId) { - this.accessKeyId = accessKeyId; - } - - public String getAccessKeySecret() { - return accessKeySecret; - } - - public void setAccessKeySecret(String accessKeySecret) { - this.accessKeySecret = accessKeySecret; - } - - public String getSecurityToken() { - return securityToken; - } - - public void setSecurityToken(String securityToken) { - this.securityToken = securityToken; - } - - public String getExpiration() { - return expiration; - } - - public void setExpiration(String expiration) { - this.expiration = expiration; - } -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/user/UserDetailsVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/user/UserDetailsVo.java index f40609e0f..563632dca 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/user/UserDetailsVo.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/user/UserDetailsVo.java @@ -2,7 +2,6 @@ package com.accompany.business.vo.user; import com.accompany.business.model.UserGiftWall; import com.accompany.business.model.dress.PersonalBackground; -import com.accompany.business.vo.gamepartner.UserGamePartnerInfoVo; import com.accompany.business.vo.guild.AgencyOwnerVo; import com.accompany.business.vo.medal.UserDetailMedalVo; import com.accompany.business.vo.relation.RelationUserVO; @@ -86,8 +85,6 @@ public class UserDetailsVo { @ApiModelProperty("分区ID") private Integer partitionId; - @ApiModelProperty("点单游戏列表") - private List userGamePartner; //勋章 private UserDetailMedalVo medals; diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/user/UserYearReportVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/user/UserYearReportVo.java deleted file mode 100644 index 21b601b71..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/user/UserYearReportVo.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.accompany.business.vo.user; - -import com.accompany.business.vo.SimpleUserVo; -import com.accompany.core.annotation.I18n; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class UserYearReportVo { - - private Long uid; - @ApiModelProperty("自己") - private SimpleUserVo me; - - @ApiModelProperty("注册时间") - private String createTime; - @ApiModelProperty("天数") - private Integer createDays; - - @ApiModelProperty("财富值") - private Long experienceValue; - @ApiModelProperty("财富等级") - private Integer experienceLevel; - @I18n(className = "UserYearReport") - private String experienceTitle; - @ApiModelProperty("魅力值") - private Long charmValue; - @ApiModelProperty("魅力等级") - private Integer charmLevel; - @I18n(className = "UserYearReport") - private String charmTitle; - - private Long cpUid; - private String cpCreateTime; - @ApiModelProperty("cp天数") - private Integer cpCreateDays; - private Double cpValue; - @ApiModelProperty("cp") - private SimpleUserVo cp; - - @ApiModelProperty("礼物数") - private Integer giftWallCount; - private Integer giftId; - @ApiModelProperty("最多的礼物") - @I18n(className = "Gift") - private String giftName; - - @ApiModelProperty("累计转赠") - private Long giveDiamond; - -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/withdraw/WithdrawAccountDtlVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/withdraw/WithdrawAccountDtlVo.java deleted file mode 100644 index f224cbb6a..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/withdraw/WithdrawAccountDtlVo.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.accompany.business.vo.withdraw; - -import com.accompany.business.model.withdraw.WithdrawUserAccount; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author: liaozetao - * @date: 2023/7/11 12:01 - * @description: - */ -@Data -@ApiModel -public class WithdrawAccountDtlVo extends WithdrawUserAccount { - - /** - * 账户名称 - */ - @ApiModelProperty("账户名称") - private String accountName; - - /** - * 是否绑定 0 否 1 是 - */ - @ApiModelProperty("是否绑定 0 否 1 是") - private Integer isBind = 0; - - /** - * 是否为上次使用 0 否 1 是 - */ - @ApiModelProperty("是否为上次使用 0 否 1 是") - private Integer isPrev = 0; - -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/withdraw/WithdrawUserAccountVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/withdraw/WithdrawUserAccountVo.java deleted file mode 100644 index e313c660e..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/withdraw/WithdrawUserAccountVo.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.accompany.business.vo.withdraw; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author: liaozetao - * @date: 2023/7/11 16:59 - * @description: - */ -@Data -@ApiModel -public class WithdrawUserAccountVo { - - /** - * 主键 - */ - @ApiModelProperty("主键") - private Long id; - - /** - * 账户名称 - */ - @ApiModelProperty("账户名称") - private String accountName; - - /** - * 币种 - */ - @ApiModelProperty("币种") - private String currencyType; - - /** - * 账户类型 - */ - @ApiModelProperty("账户类型") - private Integer accountType; - - /** - * 是否实名认证 - */ - @ApiModelProperty("是否实名认证") - private Integer isRealCertify; - -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/withdraw/WithdrawUserRecordVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/withdraw/WithdrawUserRecordVo.java deleted file mode 100644 index 18c60684e..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/withdraw/WithdrawUserRecordVo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.accompany.business.vo.withdraw; - -import com.accompany.business.model.withdraw.WithdrawUserRecord; -import com.alibaba.excel.annotation.ExcelProperty; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author: liaozetao - * @date: 2023/7/10 15:23 - * @description: - */ -@Data -@ApiModel -public class WithdrawUserRecordVo extends WithdrawUserRecord { - - /** - * 平台号 - */ - @ApiModelProperty("平台号") - private String erbanNo; - - /** - * 昵称 - */ - @ExcelProperty("昵称") - @ApiModelProperty("昵称") - private String nick; - - /** - * 用户状态 - */ - @ApiModelProperty("用户状态") - private Integer blockStatus; - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/GiftNotifyListener.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/GiftNotifyListener.java index 9ecde1cda..11bc607c8 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/GiftNotifyListener.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/GiftNotifyListener.java @@ -19,7 +19,6 @@ import com.accompany.business.service.user.UsersService; import com.accompany.business.util.VipUtil; import com.accompany.business.vo.GiftNotifyVo; import com.accompany.common.constant.Constant; -import com.accompany.common.constant.GiftConstant; import com.accompany.common.redis.RedisKey; import com.accompany.common.utils.StringUtils; import com.accompany.core.base.SpringContextHolder; @@ -267,7 +266,7 @@ public class GiftNotifyListener implements ApplicationListener } Integer giftId = giftMessage.getGiftId(); Gift gift = giftService.getGiftById(giftId); - if (gift.getNotifyFull() == null || GiftConstant.GiftNotifyFull.notifyAll != gift.getNotifyFull()) {//发送全服房间 + if (gift.getNotifyFull() == null || Constant.Yes1No0.YES != gift.getNotifyFull()) {//发送全服房间 return; } GiftNotifyVo giftNotifyVo = new GiftNotifyVo(); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/charge/MyCardChargeListener.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/charge/MyCardChargeListener.java deleted file mode 100644 index bd976147c..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/charge/MyCardChargeListener.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.accompany.business.event.listener.charge; - -import com.accompany.mq.constant.MqConstant; -import com.accompany.mq.model.ChargeMqMessage; -import com.accompany.mq.producer.MQMessageProducer; -import com.accompany.payment.event.ChargeEvent; -import com.accompany.payment.model.ChargeRecord; -import com.alibaba.fastjson.JSONObject; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.stereotype.Component; - -/** - * @author: liaozetao - * @date: 2024/1/24 11:19 - * @description: - */ -@Slf4j -@Component -public class MyCardChargeListener implements ApplicationListener { - - @Autowired - private MQMessageProducer mqMessageProducer; - - @Override - public void onApplicationEvent(ChargeEvent chargeEvent) { - Object source = chargeEvent.getSource(); - if (source == null) { - return; - } - ChargeRecord chargeRecord = (ChargeRecord) source; - log.info("发起充值 chargeRecord : {}", JSONObject.toJSONString(chargeRecord)); - ChargeMqMessage message = new ChargeMqMessage(); - message.setChargeRecordId(chargeRecord.getChargeRecordId()); - mqMessageProducer.send(MqConstant.CHANGE_TOPIC, message, 9); - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/gamepartner/GamePartnerFinishListener.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/gamepartner/GamePartnerFinishListener.java deleted file mode 100644 index bfdc20f14..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/gamepartner/GamePartnerFinishListener.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.accompany.business.event.listener.gamepartner; - -import com.accompany.business.event.gamepartner.GamePartnerFinishEvent; -import com.accompany.business.model.gamepartner.GamePartnerOrder; -import com.accompany.business.service.gamepartner.GamePartnerOrderService; -import com.accompany.business.service.gamepartner.UserGamePartnerInfoService; -import com.accompany.business.service.purse.UserPurseService; -import com.accompany.business.service.record.BillRecordService; -import com.accompany.core.enumeration.BillObjTypeEnum; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.stereotype.Component; - -import java.math.BigDecimal; - -/** - * @author: liaozetao - * @date: 2023/8/22 16:17 - * @description: - */ -@Slf4j -@Component -public class GamePartnerFinishListener implements ApplicationListener { - - @Autowired - private UserPurseService userPurseService; - - @Autowired - private BillRecordService billRecordService; - - @Autowired - private GamePartnerOrderService gamePartnerOrderService; - - @Autowired - private UserGamePartnerInfoService userGamePartnerInfoService; - - @Override - public void onApplicationEvent(GamePartnerFinishEvent event) { - Object source = event.getSource(); - log.info("GamePartner source : {}.", source); - if (source == null) { - return; - } - GamePartnerOrder order = (GamePartnerOrder) source; - Long fromUid = order.getFromUid(); - Long toUid = order.getToUid(); - Integer gameId = order.getGameId(); - userGamePartnerInfoService.updateFinishNum(toUid, gameId); - BigDecimal amount = order.getAmount(); - if (amount == null || amount.compareTo(BigDecimal.ZERO) <= 0) { - return; - } - //接单用户 - log.info("gamePartnerOrder toUid : {}, gamePartnerIncome : {}", toUid, amount); - //增加金币 - userPurseService.addGold(toUid, amount.doubleValue(), BillObjTypeEnum.GAME_PARTNER_GOLD_IN, - (userPurse)-> billRecordService.insertGeneralBillRecord(toUid, fromUid, null, - String.valueOf(order.getId()), BillObjTypeEnum.GAME_PARTNER_GOLD_IN, amount.doubleValue(), userPurse)); - //更新收益 - order.setIncome(amount); - gamePartnerOrderService.updateById(order); - log.info("GamePartner income end..."); - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/gamepartner/GamePartnerInviteListener.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/gamepartner/GamePartnerInviteListener.java deleted file mode 100644 index ee790b73c..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/gamepartner/GamePartnerInviteListener.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.accompany.business.event.listener.gamepartner; - -import cn.hutool.core.util.StrUtil; -import com.accompany.business.event.gamepartner.GamePartnerInviteEvent; -import com.accompany.business.model.gamepartner.GamePartnerOrder; -import com.accompany.business.service.SendSysMsgService; -import com.accompany.business.service.gamepartner.UserGamePartnerInfoService; -import com.accompany.business.vo.gamepartner.GamePartnerOrderVo; -import com.accompany.business.vo.gamepartner.UserGamePartnerInfoVo; -import com.accompany.common.constant.Constant; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.model.Users; -import com.accompany.core.service.user.UsersBaseService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.stereotype.Component; - -/** - * @author: liaozetao - * @date: 2023/8/23 11:04 - * @description: - */ -@Slf4j -@Component -public class GamePartnerInviteListener implements ApplicationListener { - - @Autowired - private UsersBaseService usersBaseService; - - @Autowired - private SendSysMsgService sendSysMsgService; - - @Autowired - private UserGamePartnerInfoService userGamePartnerInfoService; - - @Override - public void onApplicationEvent(GamePartnerInviteEvent event) { - Object source = event.getSource(); - if (source == null) { - return; - } - GamePartnerOrder order = (GamePartnerOrder) source; - //发起用户 - Long fromUid = order.getFromUid(); - //接单用户 - Long toUid = order.getToUid(); - //游戏ID - Integer gameId = order.getGameId(); - //获取用户关系信息 - UserGamePartnerInfoVo gameInfo = userGamePartnerInfoService.getUserGamePartnerInfo(toUid, gameId); - GamePartnerOrderVo gameOrder = new GamePartnerOrderVo(); - BeanUtils.copyProperties(order, gameOrder); - gameOrder.setOrderTime(DateTimeUtil.convertDate(order.getCreateTime())); - if (gameInfo != null) { - gameOrder.setGameName(gameInfo.getGameName()); - String logo = gameInfo.getLogo(); - if (StrUtil.isEmpty(logo)) { - logo = StrUtil.EMPTY; - } - gameOrder.setGameLogo(logo); - gameOrder.setGameBackground(gameInfo.getBackground()); - gameOrder.setGamePic(gameInfo.getPic()); - gameOrder.setTags(gameInfo.getTags()); - } - //发起用户 - Users fromUser = usersBaseService.getUsersByUid(fromUid); - if (fromUser != null) { - gameOrder.setFromErBanNo(fromUser.getErbanNo()); - gameOrder.setFromNick(fromUser.getNick()); - gameOrder.setFromAvatar(fromUser.getAvatar()); - } - //接单用户 - Users toUser = usersBaseService.getUsersByUid(toUid); - if (toUser != null) { - gameOrder.setToErBanNo(toUser.getErbanNo()); - gameOrder.setToNick(toUser.getNick()); - gameOrder.setToAvatar(toUser.getAvatar()); - } - //私聊消息 - sendSysMsgService.sendCustomMsg(fromUid, toUid, Constant.DefineProtocol.CUSTOM_MSG_GAME_PARTNER_ORDER, Constant.DefineProtocol.CUSTOM_MSG_GAME_PARTNER_ORDER_OWNER_INVITE, gameOrder); - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ActSingleRoomRankMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ActSingleRoomRankMapper.java deleted file mode 100644 index 717ecb5b7..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ActSingleRoomRankMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.vo.activity.ActivityRankVo; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; - -public interface ActSingleRoomRankMapper { - - List selectNewUserSendGift(@Param("beginTimeWeek") Date beginTimeWeek, @Param("endTimeWeek") Date endTimeWeek); - - List selectJoinFansUser(@Param("beginTimeWeek") Date beginTimeWeek, @Param("endTimeWeek") Date endTimeWeek); - - List selectSignleRoomOpenTime(@Param("beginTimeWeek") Date beginTimeWeek, @Param("endTimeWeek") Date endTimeWeek); -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ActivityConfigMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ActivityConfigMapper.java deleted file mode 100644 index 358c10167..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ActivityConfigMapper.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.ActivityConfig; -import com.accompany.business.model.ActivityConfigExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface ActivityConfigMapper { - int countByExample(ActivityConfigExample example); - - int deleteByExample(ActivityConfigExample example); - - int insert(ActivityConfig record); - - int insertSelective(ActivityConfig record); - - List selectByExample(ActivityConfigExample example); - - int updateByExampleSelective(@Param("record") ActivityConfig record, @Param("example") ActivityConfigExample example); - - int updateByExample(@Param("record") ActivityConfig record, @Param("example") ActivityConfigExample example); -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/AdminPictureMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/AdminPictureMapper.java deleted file mode 100644 index e306995d0..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/AdminPictureMapper.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.AdminPicture; -import com.accompany.business.model.AdminPictureExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface AdminPictureMapper { - long countByExample(AdminPictureExample example); - - int deleteByExample(AdminPictureExample example); - - int deleteByPrimaryKey(Integer picId); - - int insert(AdminPicture record); - - int insertSelective(AdminPicture record); - - List selectByExample(AdminPictureExample example); - - AdminPicture selectByPrimaryKey(Integer picId); - - int updateByExampleSelective(@Param("record") AdminPicture record, @Param("example") AdminPictureExample example); - - int updateByExample(@Param("record") AdminPicture record, @Param("example") AdminPictureExample example); - - int updateByPrimaryKeySelective(AdminPicture record); - - int updateByPrimaryKey(AdminPicture record); -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ChannelDistributeMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ChannelDistributeMapper.java deleted file mode 100644 index 07ca754dc..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ChannelDistributeMapper.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.ChannelDistribute; -import com.accompany.business.model.ChannelDistributeExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface ChannelDistributeMapper { - int countByExample(ChannelDistributeExample example); - - int deleteByExample(ChannelDistributeExample example); - - int deleteByPrimaryKey(Long id); - - int insert(ChannelDistribute record); - - int insertSelective(ChannelDistribute record); - - List selectByExample(ChannelDistributeExample example); - - ChannelDistribute selectByPrimaryKey(Long id); - - int updateByExampleSelective(@Param("record") ChannelDistribute record, @Param("example") ChannelDistributeExample example); - - int updateByExample(@Param("record") ChannelDistribute record, @Param("example") ChannelDistributeExample example); - - int updateByPrimaryKeySelective(ChannelDistribute record); - - int updateByPrimaryKey(ChannelDistribute record); -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ChannelDistributeMapperExpand.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ChannelDistributeMapperExpand.java deleted file mode 100644 index 9ac3c30ed..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ChannelDistributeMapperExpand.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.ChannelDistribute; - -import java.util.List; - -/** - * ｛这里添加描述｝ - * - * @author fangchengyan - * @date 2020-02-20 4:09 下午 - */ -public interface ChannelDistributeMapperExpand { - - /** - * 插入或更新一条记录 - * @param record - * @return - */ - int insertOrUpdate(ChannelDistribute record); - - /** - * 批量插入或更新一条记录 - * @param list - * @return - */ - int insertOrUpdateBatch(List list); - - /** - * 修改数据 - * @param record - * @return - */ - int updateValue(ChannelDistribute record); - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ChargeActivityVisitLogMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ChargeActivityVisitLogMapper.java deleted file mode 100644 index 51315899d..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ChargeActivityVisitLogMapper.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.ChargeActivityVisitLog; -import com.accompany.business.model.ChargeActivityVisitLogExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface ChargeActivityVisitLogMapper { - int countByExample(ChargeActivityVisitLogExample example); - - int deleteByExample(ChargeActivityVisitLogExample example); - - int deleteByPrimaryKey(Long id); - - int insert(ChargeActivityVisitLog record); - - int insertSelective(ChargeActivityVisitLog record); - - List selectByExample(ChargeActivityVisitLogExample example); - - ChargeActivityVisitLog selectByPrimaryKey(Long id); - - int updateByExampleSelective(@Param("record") ChargeActivityVisitLog record, @Param("example") ChargeActivityVisitLogExample example); - - int updateByExample(@Param("record") ChargeActivityVisitLog record, @Param("example") ChargeActivityVisitLogExample example); - - int updateByPrimaryKeySelective(ChargeActivityVisitLog record); - - int updateByPrimaryKey(ChargeActivityVisitLog record); -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/FinanceGoldDiamondDetailMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/FinanceGoldDiamondDetailMapper.java deleted file mode 100644 index 032e8a58b..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/FinanceGoldDiamondDetailMapper.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.FinanceGoldDiamondDetail; -import com.accompany.business.model.FinanceGoldDiamondDetailExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface FinanceGoldDiamondDetailMapper { - int countByExample(FinanceGoldDiamondDetailExample example); - - int deleteByExample(FinanceGoldDiamondDetailExample example); - - int deleteByPrimaryKey(Long id); - - int insert(FinanceGoldDiamondDetail record); - - int insertSelective(FinanceGoldDiamondDetail record); - - List selectByExample(FinanceGoldDiamondDetailExample example); - - FinanceGoldDiamondDetail selectByPrimaryKey(Long id); - - int updateByExampleSelective(@Param("record") FinanceGoldDiamondDetail record, @Param("example") FinanceGoldDiamondDetailExample example); - - int updateByExample(@Param("record") FinanceGoldDiamondDetail record, @Param("example") FinanceGoldDiamondDetailExample example); - - int updateByPrimaryKeySelective(FinanceGoldDiamondDetail record); - - int updateByPrimaryKey(FinanceGoldDiamondDetail record); -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/FinanceGoldDiamondDetailMapperExpand.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/FinanceGoldDiamondDetailMapperExpand.java deleted file mode 100644 index b644efc16..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/FinanceGoldDiamondDetailMapperExpand.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.FinanceGoldDiamondDetail; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface FinanceGoldDiamondDetailMapperExpand { - - int insertList(@Param("list") List financeGoldDiamondDetailList); -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/FinanceGoldDiamondMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/FinanceGoldDiamondMapper.java deleted file mode 100644 index cb1c063d4..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/FinanceGoldDiamondMapper.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.FinanceGoldDiamond; -import com.accompany.business.model.FinanceGoldDiamondExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface FinanceGoldDiamondMapper { - int countByExample(FinanceGoldDiamondExample example); - - int deleteByExample(FinanceGoldDiamondExample example); - - int deleteByPrimaryKey(Long id); - - int insert(FinanceGoldDiamond record); - - int insertSelective(FinanceGoldDiamond record); - - List selectByExample(FinanceGoldDiamondExample example); - - FinanceGoldDiamond selectByPrimaryKey(Long id); - - int updateByExampleSelective(@Param("record") FinanceGoldDiamond record, @Param("example") FinanceGoldDiamondExample example); - - int updateByExample(@Param("record") FinanceGoldDiamond record, @Param("example") FinanceGoldDiamondExample example); - - int updateByPrimaryKeySelective(FinanceGoldDiamond record); - - int updateByPrimaryKey(FinanceGoldDiamond record); -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/FinanceTypeConfigMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/FinanceTypeConfigMapper.java deleted file mode 100644 index c63f75d31..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/FinanceTypeConfigMapper.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.FinanceTypeConfig; -import com.accompany.business.model.FinanceTypeConfigExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface FinanceTypeConfigMapper { - int countByExample(FinanceTypeConfigExample example); - - int deleteByExample(FinanceTypeConfigExample example); - - int deleteByPrimaryKey(Byte objType); - - int insert(FinanceTypeConfig record); - - int insertSelective(FinanceTypeConfig record); - - List selectByExample(FinanceTypeConfigExample example); - - FinanceTypeConfig selectByPrimaryKey(Byte objType); - - int updateByExampleSelective(@Param("record") FinanceTypeConfig record, @Param("example") FinanceTypeConfigExample example); - - int updateByExample(@Param("record") FinanceTypeConfig record, @Param("example") FinanceTypeConfigExample example); - - int updateByPrimaryKeySelective(FinanceTypeConfig record); - - int updateByPrimaryKey(FinanceTypeConfig record); -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/GetLostUserMapperExpand.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/GetLostUserMapperExpand.java deleted file mode 100644 index a1f852e22..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/GetLostUserMapperExpand.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.core.model.Account; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; - -/** - * @author yangming - * @date 2018-10-30 - * @description 获取流失用户 - */ -public interface GetLostUserMapperExpand { - - /** - * 在指定时间登录过并且七天没有活跃的用户 - * @param startDate - * @param endDate - * @param activityDate - * @param beforeActDate - * @return - */ - List getAccountLoginUser(@Param("startDate") Date startDate, @Param("endDate") Date endDate,@Param("activityDate") Date activityDate,@Param("beforeActDate") Date beforeActDate); - - /** - * 获取用户充值次数 - * @param uid - * @return - */ - Long getChargeCount(@Param("uid") Long uid); - - /** - * 给IOS用户重新发送消息 - * @param os - * @return - */ - List getNotifyIOSUser(@Param("os")String os); -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/GreetMsgMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/GreetMsgMapper.java deleted file mode 100644 index 63a59099a..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/GreetMsgMapper.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.GreetMsg; -import com.accompany.business.model.GreetMsgExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface GreetMsgMapper { - int countByExample(GreetMsgExample example); - - int deleteByPrimaryKey(Integer id); - - int insert(GreetMsg record); - - int insertSelective(GreetMsg record); - - List selectByExampleWithBLOBs(GreetMsgExample example); - - List selectByExample(GreetMsgExample example); - - GreetMsg selectByPrimaryKey(Integer id); - - int updateByExampleSelective(@Param("record") GreetMsg record, @Param("example") GreetMsgExample example); - - int updateByExampleWithBLOBs(@Param("record") GreetMsg record, @Param("example") GreetMsgExample example); - - int updateByExample(@Param("record") GreetMsg record, @Param("example") GreetMsgExample example); - - int updateByPrimaryKeySelective(GreetMsg record); - - int updateByPrimaryKeyWithBLOBs(GreetMsg record); - - int updateByPrimaryKey(GreetMsg record); -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/GreetMsgMapperExpand.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/GreetMsgMapperExpand.java deleted file mode 100644 index dc8d3dd89..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/GreetMsgMapperExpand.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.GreetMsg; - -public interface GreetMsgMapperExpand { - - /** - * 随机获取一条记录 - * @return - */ - GreetMsg getOnByRandom(); -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HomeRoomFlowPeriodMapperMgr.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HomeRoomFlowPeriodMapperMgr.java deleted file mode 100644 index a3cc469c6..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HomeRoomFlowPeriodMapperMgr.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.accompany.business.mybatismapper; - - -import com.accompany.business.model.beanmap.HomeRoomFlowPeriod; - -import java.util.List; - -/** - * Created by liuguofu on 2017/10/6. - */ -public interface HomeRoomFlowPeriodMapperMgr { - - List getHotHomePermitRoomList(); -// List getHotHomeRoomForRecomOneTwoList(); -// List getHotHomeRoomForRecomThirdForthList(List uids); -// List getHotHomeRoomForGameList(List uids); -// List getHotHomeRoomForRadioList(List uids); -// -// List getGameHomeRoomList(); -// List getRadioHomeRoomList(); - - List getGameHomeRoomPeriodList(); - List getGameHomeRoomPeriodListOthers(); - List getRadioHomeRoomPrriodList(); - - - List getHomeHotManualRecommList(); - - - - - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/LostUserMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/LostUserMapper.java deleted file mode 100644 index 58c37813a..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/LostUserMapper.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.LostUser; -import com.accompany.business.model.LostUserExample; - -import java.util.List; - -public interface LostUserMapper { - int deleteByPrimaryKey(Integer id); - - int insert(LostUser record); - - int insertSelective(LostUser record); - - List selectByExample(LostUserExample example); - - LostUser selectByPrimaryKey(Integer id); - - int updateByPrimaryKeySelective(LostUser record); - - int updateByPrimaryKey(LostUser record); - -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/OperationActMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/OperationActMapper.java deleted file mode 100644 index 6b4db1507..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/OperationActMapper.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.OperationAct; -import com.accompany.business.model.OperationActExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface OperationActMapper { - int countByExample(OperationActExample example); - - int deleteByExample(OperationActExample example); - - int deleteByPrimaryKey(Integer id); - - int insert(OperationAct record); - - int insertSelective(OperationAct record); - - List selectByExample(OperationActExample example); - - OperationAct selectByPrimaryKey(Integer id); - - int updateByExampleSelective(@Param("record") OperationAct record, @Param("example") OperationActExample example); - - int updateByExample(@Param("record") OperationAct record, @Param("example") OperationActExample example); - - int updateByPrimaryKeySelective(OperationAct record); - - int updateByPrimaryKey(OperationAct record); -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/OperationSmsRecordMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/OperationSmsRecordMapper.java deleted file mode 100644 index cea226d35..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/OperationSmsRecordMapper.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.OperationSmsRecord; -import com.accompany.business.model.OperationSmsRecordExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface OperationSmsRecordMapper { - int countByExample(OperationSmsRecordExample example); - - int deleteByExample(OperationSmsRecordExample example); - - int deleteByPrimaryKey(Long recordId); - - int insert(OperationSmsRecord record); - - int insertSelective(OperationSmsRecord record); - - List selectByExample(OperationSmsRecordExample example); - - OperationSmsRecord selectByPrimaryKey(Long recordId); - - int updateByExampleSelective(@Param("record") OperationSmsRecord record, @Param("example") OperationSmsRecordExample example); - - int updateByExample(@Param("record") OperationSmsRecord record, @Param("example") OperationSmsRecordExample example); - - int updateByPrimaryKeySelective(OperationSmsRecord record); - - int updateByPrimaryKey(OperationSmsRecord record); -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/PkActRecordMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/PkActRecordMapper.java deleted file mode 100644 index 75a6100db..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/PkActRecordMapper.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.PkActRecord; -import com.accompany.business.model.PkActRecordExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface PkActRecordMapper { - int countByExample(PkActRecordExample example); - - int deleteByPrimaryKey(Integer recordId); - - int insert(PkActRecord record); - - int insertSelective(PkActRecord record); - - List selectByExample(PkActRecordExample example); - - PkActRecord selectByPrimaryKey(Integer recordId); - - int updateByExampleSelective(@Param("record") PkActRecord record, @Param("example") PkActRecordExample example); - - int updateByExample(@Param("record") PkActRecord record, @Param("example") PkActRecordExample example); - - int updateByPrimaryKeySelective(PkActRecord record); - - int updateByPrimaryKey(PkActRecord record); -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/PkActRecordMapperMgr.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/PkActRecordMapperMgr.java deleted file mode 100644 index 0edb642f8..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/PkActRecordMapperMgr.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.accompany.business.mybatismapper; - -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -public interface PkActRecordMapperMgr { - List> selectTotalRank(@Param("beginTime") Date beginTime, @Param("endTime") Date endTime); - - Integer countUsersTimes(@Param("beginTime") Date beginTime, @Param("endTime") Date endTime, @Param("uid") Long uid); -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/RoomSearchLogMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/RoomSearchLogMapper.java deleted file mode 100644 index d6627c064..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/RoomSearchLogMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.room.RoomSearchLog; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface RoomSearchLogMapper extends BaseMapper { - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/SmsTemplateMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/SmsTemplateMapper.java deleted file mode 100644 index e11633180..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/SmsTemplateMapper.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.SmsTemplate; -import com.accompany.business.model.SmsTemplateExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface SmsTemplateMapper { - int countByExample(SmsTemplateExample example); - - int deleteByPrimaryKey(Integer templateId); - - int insert(SmsTemplate record); - - int insertSelective(SmsTemplate record); - - List selectByExample(SmsTemplateExample example); - - SmsTemplate selectByPrimaryKey(Integer templateId); - - int updateByExampleSelective(@Param("record") SmsTemplate record, @Param("example") SmsTemplateExample example); - - int updateByExample(@Param("record") SmsTemplate record, @Param("example") SmsTemplateExample example); - - int updateByPrimaryKeySelective(SmsTemplate record); - - int updateByPrimaryKey(SmsTemplate record); -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/TitleMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/TitleMapper.java deleted file mode 100644 index 02563a840..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/TitleMapper.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.Title; -import com.accompany.business.model.TitleExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface TitleMapper { - int countByExample(TitleExample example); - - int deleteByPrimaryKey(Long id); - - int insert(Title record); - - int insertSelective(Title record); - - List selectByExample(TitleExample example); - - Title selectByPrimaryKey(Long id); - - int updateByExampleSelective(@Param("record") Title record, @Param("example") TitleExample example); - - int updateByExample(@Param("record") Title record, @Param("example") TitleExample example); - - int updateByPrimaryKeySelective(Title record); - - int updateByPrimaryKey(Title record); -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/TopicBoxItemMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/TopicBoxItemMapper.java deleted file mode 100644 index d89b8a34e..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/TopicBoxItemMapper.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.TopicBoxItem; -import com.accompany.business.model.TopicBoxItemExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface TopicBoxItemMapper { - int countByExample(TopicBoxItemExample example); - - int deleteByPrimaryKey(Integer id); - - int insert(TopicBoxItem record); - - int insertSelective(TopicBoxItem record); - - List<TopicBoxItem> selectByExample(TopicBoxItemExample example); - - TopicBoxItem selectByPrimaryKey(Integer id); - - int updateByExampleSelective(@Param("record") TopicBoxItem record, @Param("example") TopicBoxItemExample example); - - int updateByExample(@Param("record") TopicBoxItem record, @Param("example") TopicBoxItemExample example); - - int updateByPrimaryKeySelective(TopicBoxItem record); - - int updateByPrimaryKey(TopicBoxItem record); -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/TopicBoxMsgMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/TopicBoxMsgMapper.java deleted file mode 100644 index f75afde6f..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/TopicBoxMsgMapper.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.TopicBoxMsg; -import com.accompany.business.model.TopicBoxMsgExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface TopicBoxMsgMapper { - int countByExample(TopicBoxMsgExample example); - - int deleteByPrimaryKey(Long id); - - int insert(TopicBoxMsg record); - - int insertSelective(TopicBoxMsg record); - - List<TopicBoxMsg> selectByExample(TopicBoxMsgExample example); - - TopicBoxMsg selectByPrimaryKey(Long id); - - int updateByExampleSelective(@Param("record") TopicBoxMsg record, @Param("example") TopicBoxMsgExample example); - - int updateByExample(@Param("record") TopicBoxMsg record, @Param("example") TopicBoxMsgExample example); - - int updateByPrimaryKeySelective(TopicBoxMsg record); - - int updateByPrimaryKey(TopicBoxMsg record); -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserCertifyRecordMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserCertifyRecordMapper.java deleted file mode 100644 index 095417b00..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserCertifyRecordMapper.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.UserCertifyRecord; -import com.accompany.business.model.UserCertifyRecordExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface UserCertifyRecordMapper { - int countByExample(UserCertifyRecordExample example); - - int deleteByPrimaryKey(Long recordId); - - int insert(UserCertifyRecord record); - - int insertSelective(UserCertifyRecord record); - - List<UserCertifyRecord> selectByExample(UserCertifyRecordExample example); - - UserCertifyRecord selectByPrimaryKey(Long recordId); - - int updateByExampleSelective(@Param("record") UserCertifyRecord record, @Param("example") UserCertifyRecordExample example); - - int updateByExample(@Param("record") UserCertifyRecord record, @Param("example") UserCertifyRecordExample example); - - int updateByPrimaryKeySelective(UserCertifyRecord record); - - int updateByPrimaryKey(UserCertifyRecord record); -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserCertifyRecordMapperExpand.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserCertifyRecordMapperExpand.java deleted file mode 100644 index 3d59f2a34..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserCertifyRecordMapperExpand.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.UserCertifyRecord; -import org.apache.ibatis.annotations.Param; - -/** - * @author: liaozetao - * @date: 2024/1/12 18:45 - * @description: - */ -public interface UserCertifyRecordMapperExpand { - - UserCertifyRecord getLatestRecord(@Param("uid") Long uid); -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserYearReportMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserYearReportMapper.java deleted file mode 100644 index a6ba13dbb..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserYearReportMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.UserYearReport; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -public interface UserYearReportMapper extends BaseMapper<UserYearReport> { -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/WebConfigMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/WebConfigMapper.java deleted file mode 100644 index 38a69bfa4..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/WebConfigMapper.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.WebConfig; -import com.accompany.business.model.WebConfigExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface WebConfigMapper { - int countByExample(WebConfigExample example); - - int insert(WebConfig record); - - int insertSelective(WebConfig record); - - List<WebConfig> selectByExample(WebConfigExample example); - - int updateByExampleSelective(@Param("record") WebConfig record, @Param("example") WebConfigExample example); - - int updateByExample(@Param("record") WebConfig record, @Param("example") WebConfigExample example); -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/WithDrawPacketCashProdMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/WithDrawPacketCashProdMapper.java deleted file mode 100644 index 3f82d9a48..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/WithDrawPacketCashProdMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.WithDrawPacketCashProd; -import com.accompany.business.model.WithDrawPacketCashProdExample; - -import java.util.List; - -public interface WithDrawPacketCashProdMapper { - int deleteByPrimaryKey(Integer packetProdCashId); - - int insert(WithDrawPacketCashProd record); - - int insertSelective(WithDrawPacketCashProd record); - - List<WithDrawPacketCashProd> selectByExample(WithDrawPacketCashProdExample example); - - WithDrawPacketCashProd selectByPrimaryKey(Integer packetProdCashId); - - int updateByPrimaryKeySelective(WithDrawPacketCashProd record); - - int updateByPrimaryKey(WithDrawPacketCashProd record); -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/WithdrawAccountMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/WithdrawAccountMapper.java deleted file mode 100644 index e25732a3c..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/WithdrawAccountMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.WithdrawAccount; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -public interface WithdrawAccountMapper extends BaseMapper<WithdrawAccount> { -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/WithdrawRecordMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/WithdrawRecordMapper.java deleted file mode 100644 index 3c757c55e..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/WithdrawRecordMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.WithdrawRecord; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -public interface WithdrawRecordMapper extends BaseMapper<WithdrawRecord> { -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaActInfoMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaActInfoMapper.java deleted file mode 100644 index a54b426cf..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaActInfoMapper.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 文 件 名: LuckySeaActInfoMapper - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2020/12/31 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.mybatismapper.activity; - -import com.accompany.business.model.activity.luckysea.LuckySeaActInfo; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * <br>接口描述: - * <br>功能详细描述: - * - * @author H1 - * @date [2020/12/31] - */ -public interface LuckySeaActInfoMapper extends BaseMapper<LuckySeaActInfo> { - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaActMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaActMapper.java deleted file mode 100644 index 050d33a28..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaActMapper.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.accompany.business.mybatismapper.activity; - -import com.accompany.business.dto.activity.luckysea.LuckySeaActUserRoundStatDTO; -import com.accompany.business.service.activities.vo.LuckySeaRankListVo; -import com.accompany.business.vo.activities.LuckySeaActRoundRankUserVo; -import com.accompany.business.vo.activities.LuckySeaActUserDrawItemVO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -@Mapper -public interface LuckySeaActMapper { - /** - * 获取深海奇缘活动钻石榜单 - * @return - * @param start - * @param pageSize - * @param startTime - * @param endTime - */ - List<LuckySeaRankListVo> listDiamondRank(@Param("start") Integer start, - @Param("pageSize") Integer pageSize, - @Param("startTime") Date startTime, - @Param("endTime") Date endTime); - - /** - * 获取深海奇缘活动欧皇榜 - * @return - */ - List<LuckySeaRankListVo> listLuckyManRank(@Param("start") Integer start, - @Param("pageSize")Integer pageSize, - @Param("startTime") Date startTime, - @Param("endTime") Date endTime); - - - /** - * 获取用户深海奇缘活动钻石榜单 - * @return - */ - LuckySeaRankListVo listUserDiamondRank(@Param("uid") Long uid, @Param("startTime") Date startTime, @Param("endTime") Date endTime); - - /** - * 获取用户深海奇缘活动欧皇榜 - * @return - */ - LuckySeaRankListVo listUserLuckyManRank(@Param("uid")Long uid, @Param("startTime") Date startTime, @Param("endTime") Date endTime); - - /** - * 获取用户指定时间段内的钻石收益 - * @param startTime - * @param endTime - * @return - */ - List<Map<String, Object>> groupByUserDiamondIncome(@Param("startTime") String startTime, @Param("endTime") String endTime); - - - /** - * 获取轮次下的收益前三名用户 - * @param roundId - * @return - */ - List<LuckySeaActRoundRankUserVo> listTopThreeInOneRound(String roundId); - - /** - * 获取用户指定伦的投注情况 - * @param roundId - * @param uid - * @return - */ - List<LuckySeaActUserDrawItemVO> listUserDrawItemInfo(@Param("roundId") String roundId, @Param("uid") Long uid ); - - /** - * 获取用户指定轮的投注情况 - * @param roundId - * @return - */ - List<LuckySeaActUserRoundStatDTO> listUserDrawStatDtoOneRound(String roundId); - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaItemGroupMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaItemGroupMapper.java deleted file mode 100644 index 06e1c9858..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaItemGroupMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.accompany.business.mybatismapper.activity; - -import com.accompany.business.model.activity.luckysea.LuckySeaItemGroup; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * <br>接口描述: - * <br>功能详细描述: - * - * @author H1 - * @date [2020/12/31] - */ -public interface LuckySeaItemGroupMapper extends BaseMapper<LuckySeaItemGroup> { - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaItemMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaItemMapper.java deleted file mode 100644 index 2cbae08e5..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaItemMapper.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 文 件 名: LuckySeaItemMapper - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2020/12/31 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.mybatismapper.activity; - -import com.accompany.business.model.activity.luckysea.LuckySeaItem; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * <br>接口描述: - * <br>功能详细描述: - * - * @author H1 - * @date [2020/12/31] - */ -public interface LuckySeaItemMapper extends BaseMapper<LuckySeaItem> { - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaPreWarningMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaPreWarningMapper.java deleted file mode 100644 index f5296c857..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaPreWarningMapper.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.accompany.business.mybatismapper.activity; - -import com.accompany.business.dto.luckysea.LuckySeaBroadCastDTO; -import com.accompany.business.dto.luckysea.LuckySeaGoldPreWarningDTO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -/** - * <br>接口描述: - * <br>功能详细描述: - * - * @author H1 - * @date [2021/9/22] - */ -@Mapper -public interface LuckySeaPreWarningMapper { - - LuckySeaBroadCastDTO getStatByRoundId(String roundId); - - /** - * 统计前N轮的活动in和out - * @param roundNum 统计活动轮数 - * @return - */ - LuckySeaGoldPreWarningDTO getPreRoundStat(Integer roundNum); - - /** - * 获取轮播广播统计信息 - * @return - * @param startTime - * @param endTime - */ - LuckySeaBroadCastDTO getBroadCastStat(@Param("startTime") String startTime, @Param("endTime") String endTime); -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaUserDrawRecordMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaUserDrawRecordMapper.java deleted file mode 100644 index 80ba0e4b5..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaUserDrawRecordMapper.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 文 件 名: LuckySeaUserDrawRecordMapper - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/4 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.mybatismapper.activity; - -import com.accompany.business.model.activity.luckysea.LuckySeaUserDrawRecord; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * <br>接口描述: - * <br>功能详细描述: - * - * @author H1 - * @date [2021/1/4] - */ -public interface LuckySeaUserDrawRecordMapper extends BaseMapper<LuckySeaUserDrawRecord> { - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaUserDrawResultMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaUserDrawResultMapper.java deleted file mode 100644 index f4fadf890..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaUserDrawResultMapper.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 文 件 名: LuckySeaUserDrawResultMapper - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/5 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.mybatismapper.activity; - -import com.accompany.business.model.activity.luckysea.LuckySeaUserDrawResult; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * <br>接口描述: - * <br>功能详细描述: - * - * @author H1 - * @date [2021/1/5] - */ -public interface LuckySeaUserDrawResultMapper extends BaseMapper<LuckySeaUserDrawResult> { - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/PageActivityMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/PageActivityMapper.java deleted file mode 100644 index 07945215e..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/PageActivityMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.accompany.business.mybatismapper.activity; - -import com.accompany.business.model.activity.PageActivity; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Author: yangming - * @Date: 2020/5/13 20:14 - * @Description: 页面活动 - **/ -public interface PageActivityMapper extends BaseMapper<PageActivity> { -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/callbattle/ActCallBattleInfoMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/callbattle/ActCallBattleInfoMapper.java deleted file mode 100644 index b8a2b33b9..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/callbattle/ActCallBattleInfoMapper.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 文 件 名: LuckySeaActInfoMapper - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2020/12/31 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.mybatismapper.callbattle; - -import com.accompany.business.model.callbattle.ActCallBattleInfo; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * <br>接口描述: - * <br>功能详细描述: - * - * @author H1 - * @date [2020/12/31] - */ -public interface ActCallBattleInfoMapper extends BaseMapper<ActCallBattleInfo> { - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/callbattle/ActCallBattleItemMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/callbattle/ActCallBattleItemMapper.java deleted file mode 100644 index 0eb5df6d0..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/callbattle/ActCallBattleItemMapper.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 文 件 名: LuckySeaItemMapper - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2020/12/31 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.mybatismapper.callbattle; - -import com.accompany.business.model.callbattle.ActCallBattleItem; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * <br>接口描述: - * <br>功能详细描述: - * - * @author H1 - * @date [2020/12/31] - */ -public interface ActCallBattleItemMapper extends BaseMapper<ActCallBattleItem> { - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/callbattle/ActCallBattleMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/callbattle/ActCallBattleMapper.java deleted file mode 100644 index ce8545191..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/callbattle/ActCallBattleMapper.java +++ /dev/null @@ -1,119 +0,0 @@ -/* - * 文 件 名: ActCallBattleActMapper - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/4 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.mybatismapper.callbattle; - -import com.accompany.business.dto.callbattle.ActCallBattleUserRoundStatDTO; -import com.accompany.business.vo.callbattle.ActCallBattleRankListVo; -import com.accompany.business.vo.callbattle.ActCallBattleRoundStatVo; -import com.accompany.business.vo.callbattle.ActCallBattleUserDrawItemVO; -import com.accompany.business.vo.callbattle.ActCallBattleUserOneRoundDrawResult; -import org.apache.ibatis.annotations.Param; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * <br>接口描述: - * <br>功能详细描述: - * - * @author H1 - * @date [2021/1/4] - */ -public interface ActCallBattleMapper { - /** - * 获取深海奇缘活动钻石榜单 - * @return - * @param start - * @param pageSize - * @param startTime - * @param endTime - */ - List<ActCallBattleRankListVo> listDiamondRank(@Param("start") Integer start, @Param("pageSize") Integer pageSize, - @Param("startTime") Date startTime, @Param("endTime") Date endTime); - - /** - * 获取深海奇缘活动欧皇榜 - * @return - */ - List<ActCallBattleRankListVo> listLuckyManRank(@Param("start") Integer start, @Param("pageSize")Integer pageSize, - @Param("startTime") Date startTime, @Param("endTime") Date endTime); - - - /** - * 获取用户深海奇缘活动钻石榜单 - * @return - */ - ActCallBattleRankListVo listUserDiamondRank(@Param("uid") Long uid, @Param("startTime") Date startTime, @Param("endTime") Date endTime); - - /** - * 获取用户深海奇缘活动欧皇榜 - * @return - */ - ActCallBattleRankListVo listUserLuckyManRank(@Param("uid")Long uid, @Param("startTime") Date startTime, @Param("endTime") Date endTime); - - /** - * 获取用户指定时间段内的钻石收益 - * @param startTime - * @param endTime - * @return - */ - Double countUserDiamondIncome(@Param("uid") Long uid, @Param("startTime") String startTime, @Param("endTime") String endTime); - - /** - * 获取轮次下的收益前三名用户 - * @param roundId - * @return - */ - List<String> listTopThreeInOneRound(String roundId); - - /** - * 统计用户投入碎片总数 - * @param roundId - * @return - */ - BigDecimal countUserInputPiece(String roundId); - - /** - * 获取用户轮次的投入碎片统计列表 - * @param roundId - * @return - */ - List<ActCallBattleRoundStatVo> listUserRoundStat(String roundId); - - /** - * 批量更新用户抽奖记录 - * @param roundId - * @param drawId - */ - void batchUpdateUserDrawRecord(@Param("roundId") String roundId, @Param("drawId") Long drawId); - - /** - * 获取用户指定伦的投注情况 - * @param roundId - * @param uid - * @return - */ - List<ActCallBattleUserDrawItemVO> listUserDrawItemInfo(@Param("roundId") String roundId, @Param("uid") Long uid ); - - /** - * 获取用户指定轮的投注情况 - * @param roundId - * @return - */ - List<ActCallBattleUserRoundStatDTO> listUserDrawStatDtoOneRound(String roundId); - - /** - * 获取用户单轮活动状态 - * @return - */ - List<ActCallBattleUserOneRoundDrawResult> getUserActStatus(@Param("roundId") String roundId, @Param("uid") Long uid); -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/callbattle/ActCallBattlePreWarningMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/callbattle/ActCallBattlePreWarningMapper.java deleted file mode 100644 index c947a1d50..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/callbattle/ActCallBattlePreWarningMapper.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * 文 件 名: LuckySeaPreWarningMapper - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/9/22 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.mybatismapper.callbattle; - -import com.accompany.business.dto.callbattle.ActCallBattleBroadCastDTO; -import com.accompany.business.dto.callbattle.ActCallBattleGoldPreWarningDTO; -import org.apache.ibatis.annotations.Param; - -/** - * <br>接口描述: - * <br>功能详细描述: - * - * @author H1 - * @date [2021/9/22] - */ -public interface ActCallBattlePreWarningMapper { - /** - * 统计前N轮的活动in和out - * @param roundNum 统计活动轮数 - * @return - */ - ActCallBattleGoldPreWarningDTO getPreRoundStat(Integer roundNum); - - /** - * 获取轮播广播统计信息 - * @return - * @param startTime - * @param endTime - */ - ActCallBattleBroadCastDTO getBroadCastStat(@Param("startTime") String startTime, @Param("endTime") String endTime); -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/callbattle/ActCallBattleUserDrawRecordMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/callbattle/ActCallBattleUserDrawRecordMapper.java deleted file mode 100644 index 7c653ab06..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/callbattle/ActCallBattleUserDrawRecordMapper.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 文 件 名: LuckySeaUserDrawRecordMapper - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/4 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.mybatismapper.callbattle; - -import com.accompany.business.model.callbattle.ActCallBattleUserDrawRecord; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * <br>接口描述: - * <br>功能详细描述: - * - * @author H1 - * @date [2021/1/4] - */ -public interface ActCallBattleUserDrawRecordMapper extends BaseMapper<ActCallBattleUserDrawRecord> { - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/callbattle/ActCallBattleUserDrawResultMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/callbattle/ActCallBattleUserDrawResultMapper.java deleted file mode 100644 index 8687237e7..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/callbattle/ActCallBattleUserDrawResultMapper.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 文 件 名: LuckySeaUserDrawResultMapper - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/5 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.mybatismapper.callbattle; - -import com.accompany.business.model.callbattle.ActCallBattleUserDrawResult; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * <br>接口描述: - * <br>功能详细描述: - * - * @author H1 - * @date [2021/1/5] - */ -public interface ActCallBattleUserDrawResultMapper extends BaseMapper<ActCallBattleUserDrawResult> { - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/chat/PublicChatTopRecordMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/chat/PublicChatTopRecordMapper.java deleted file mode 100644 index 5efb1322b..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/chat/PublicChatTopRecordMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.accompany.business.mybatismapper.chat; - -import com.accompany.business.model.chat.PublicChatTopRecord; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @author: liaozetao - * @date: 2024/5/6 14:26 - * @description: - */ -public interface PublicChatTopRecordMapper extends BaseMapper<PublicChatTopRecord> { -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/flow/FlowTeamMemberBaseMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/flow/FlowTeamMemberBaseMapper.java deleted file mode 100644 index 6bdc5037e..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/flow/FlowTeamMemberBaseMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.accompany.business.mybatismapper.flow; - -import com.accompany.business.dto.flow.FlowTeamMemberBaseDto; -import com.accompany.business.model.flow.FlowTeamMemberBase; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface FlowTeamMemberBaseMapper extends BaseMapper<FlowTeamMemberBase> { - - List<FlowTeamMemberBaseDto> queryInviteCodeAndTeam(@Param("inviteCodeList") List<String> inviteCodeList); - -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/gamepartner/GamePartnerInfoMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/gamepartner/GamePartnerInfoMapper.java deleted file mode 100644 index 923ec4d23..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/gamepartner/GamePartnerInfoMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.accompany.business.mybatismapper.gamepartner; - -import com.accompany.business.model.gamepartner.GamePartnerInfo; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @author: liaozetao - * @date: 2023/8/21 14:29 - * @description: - */ -public interface GamePartnerInfoMapper extends BaseMapper<GamePartnerInfo> { -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/gamepartner/GamePartnerOrderMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/gamepartner/GamePartnerOrderMapper.java deleted file mode 100644 index a312e3732..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/gamepartner/GamePartnerOrderMapper.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.accompany.business.mybatismapper.gamepartner; - -import com.accompany.business.dto.gamepartner.GameOrderAmountDto; -import com.accompany.business.model.gamepartner.GamePartnerOrder; -import com.accompany.business.vo.gamepartner.GamePartnerOrderVo; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author: liaozetao - * @date: 2023/8/21 14:29 - * @description: - */ -public interface GamePartnerOrderMapper extends BaseMapper<GamePartnerOrder> { - - /** - * 分页记录 - * - * @param page - * @param uid - * @param searchType - * @return - */ - Page<GamePartnerOrderVo> record(Page<GamePartnerOrderVo> page, @Param("uid") Long uid, @Param("searchType") Integer searchType); - - /** - * 点单流水 - * - * @param uidList - * @param startTime - * @param endTime - * @return - */ - List<GameOrderAmountDto> getGameOrderAmountByUid(@Param("uidList") List<Long> uidList, @Param("startTime") String startTime, @Param("endTime") String endTime); - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/gamepartner/UserGamePartnerInfoMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/gamepartner/UserGamePartnerInfoMapper.java deleted file mode 100644 index ba676af32..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/gamepartner/UserGamePartnerInfoMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.accompany.business.mybatismapper.gamepartner; - -import com.accompany.business.model.gamepartner.UserGamePartnerInfo; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; - -/** - * @author: liaozetao - * @date: 2023/8/22 14:07 - * @description: - */ -public interface UserGamePartnerInfoMapper extends BaseMapper<UserGamePartnerInfo> { - int updateFinishNum(@Param("uid") Long uid, @Param("gameId") Integer gameId); - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/gamepartner/UserGamePartnerMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/gamepartner/UserGamePartnerMapper.java deleted file mode 100644 index b1f1ae561..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/gamepartner/UserGamePartnerMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.accompany.business.mybatismapper.gamepartner; - -import com.accompany.business.model.gamepartner.UserGamePartner; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; - -/** - * @author: liaozetao - * @date: 2023/8/22 14:07 - * @description: - */ -public interface UserGamePartnerMapper extends BaseMapper<UserGamePartner> { - - IPage<UserGamePartner> selectPageByPartitionId(IPage<UserGamePartner> poPageInfo, Integer partitionId); -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/newUserStart/NewUserSayHelloChannelMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/newUserStart/NewUserSayHelloChannelMapper.java deleted file mode 100644 index f3e842c76..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/newUserStart/NewUserSayHelloChannelMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.accompany.business.mybatismapper.newUserStart; - -import com.accompany.business.model.newUserStart.NewUserSayHelloChannel; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author guojicong - * @date 2022/5/31 - */ -@Mapper -public interface NewUserSayHelloChannelMapper extends BaseMapper<NewUserSayHelloChannel> { -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/newbie/NewbieMessageMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/newbie/NewbieMessageMapper.java deleted file mode 100644 index 98d4e058f..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/newbie/NewbieMessageMapper.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.accompany.business.mybatismapper.newbie; - -import com.accompany.business.model.newbie.NewbieMessage; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -public interface NewbieMessageMapper extends BaseMapper<NewbieMessage> { - Long randomId(); -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/newbie/NewbieMessageRecordMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/newbie/NewbieMessageRecordMapper.java deleted file mode 100644 index e9dc36a7f..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/newbie/NewbieMessageRecordMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.accompany.business.mybatismapper.newbie; - -import com.accompany.business.model.newbie.NewbieMessageRecord; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -public interface NewbieMessageRecordMapper extends BaseMapper<NewbieMessageRecord> { -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/newbie/NewbiePoolMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/newbie/NewbiePoolMapper.java deleted file mode 100644 index a095bb3d8..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/newbie/NewbiePoolMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.accompany.business.mybatismapper.newbie; - -import com.accompany.business.model.newbie.NewbiePool; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface NewbiePoolMapper extends BaseMapper<NewbiePool> { - - Long randomId(); - List<NewbiePool> newbiePoolByUid(@Param("uids") List<Long> uids); -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/newuser/NewUserInRoomGiftMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/newuser/NewUserInRoomGiftMapper.java deleted file mode 100644 index 33606caff..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/newuser/NewUserInRoomGiftMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.accompany.business.mybatismapper.newuser; - -import com.accompany.business.model.newuser.NewUserInRoomGift; -import com.accompany.business.vo.gift.NewUserGiftVo; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -@Mapper -public interface NewUserInRoomGiftMapper extends BaseMapper<NewUserInRoomGift> { - List<NewUserGiftVo> getList(); -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/newuser/NewUserInRoomGiftRecordMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/newuser/NewUserInRoomGiftRecordMapper.java deleted file mode 100644 index 3daba2779..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/newuser/NewUserInRoomGiftRecordMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.accompany.business.mybatismapper.newuser; - -import com.accompany.business.model.newuser.NewUserInRoomGiftRecord; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @author guojicong - * @description - * @date 2022-07-26 - */ -public interface NewUserInRoomGiftRecordMapper extends BaseMapper<NewUserInRoomGiftRecord> { -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/official/OfficialBrowseRecordMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/official/OfficialBrowseRecordMapper.java deleted file mode 100644 index 42c7d6583..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/official/OfficialBrowseRecordMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.accompany.business.mybatismapper.official; - -import com.accompany.business.model.official.OfficialBrowseRecord; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @author: liaozetao - * @date: 2024/1/17 10:37 - * @description: - */ -public interface OfficialBrowseRecordMapper extends BaseMapper<OfficialBrowseRecord> { -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/official/OfficialClickRecordMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/official/OfficialClickRecordMapper.java deleted file mode 100644 index cb37892e2..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/official/OfficialClickRecordMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.accompany.business.mybatismapper.official; - -import com.accompany.business.model.official.OfficialClickRecord; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @author: liaozetao - * @date: 2024/1/18 10:43 - * @description: - */ -public interface OfficialClickRecordMapper extends BaseMapper<OfficialClickRecord> { -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/official/OfficialConfigMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/official/OfficialConfigMapper.java deleted file mode 100644 index 54be17ed0..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/official/OfficialConfigMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.accompany.business.mybatismapper.official; - -import com.accompany.business.model.official.OfficialConfig; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @author: liaozetao - * @date: 2024/1/16 17:36 - * @description: - */ -public interface OfficialConfigMapper extends BaseMapper<OfficialConfig> { -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/withdraw/ExchangeRateMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/withdraw/ExchangeRateMapper.java deleted file mode 100644 index 82f6cbfe2..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/withdraw/ExchangeRateMapper.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.accompany.business.mybatismapper.withdraw; - -import com.accompany.business.model.withdraw.ExchangeRate; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -import java.util.Date; - -/** - * @author: liaozetao - * @date: 2023/7/7 14:05 - * @description: - */ -public interface ExchangeRateMapper extends BaseMapper<ExchangeRate> { - - /** - * 获取上次更新汇率时间 - * - * @return - */ - Date getLastRateTime(); -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/withdraw/WithdrawAccountDtlMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/withdraw/WithdrawAccountDtlMapper.java deleted file mode 100644 index ffd4e9c5e..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/withdraw/WithdrawAccountDtlMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.accompany.business.mybatismapper.withdraw; - -import com.accompany.business.model.withdraw.WithdrawAccountDtl; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @author: liaozetao - * @date: 2023/7/7 11:11 - * @description: - */ -public interface WithdrawAccountDtlMapper extends BaseMapper<WithdrawAccountDtl> { -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/withdraw/WithdrawConfigMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/withdraw/WithdrawConfigMapper.java deleted file mode 100644 index a1c3e5812..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/withdraw/WithdrawConfigMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.accompany.business.mybatismapper.withdraw; - -import com.accompany.business.model.withdraw.WithdrawConfig; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @author: liaozetao - * @date: 2023/7/7 11:10 - * @description: - */ -public interface WithdrawConfigMapper extends BaseMapper<WithdrawConfig> { -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/withdraw/WithdrawUserAccountMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/withdraw/WithdrawUserAccountMapper.java deleted file mode 100644 index 1fcfc2c5e..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/withdraw/WithdrawUserAccountMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.accompany.business.mybatismapper.withdraw; - -import com.accompany.business.model.withdraw.WithdrawUserAccount; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @author: liaozetao - * @date: 2023/7/7 14:50 - * @description: - */ -public interface WithdrawUserAccountMapper extends BaseMapper<WithdrawUserAccount> { -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/withdraw/WithdrawUserLimitMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/withdraw/WithdrawUserLimitMapper.java deleted file mode 100644 index ea51ee084..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/withdraw/WithdrawUserLimitMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.accompany.business.mybatismapper.withdraw; - -import com.accompany.business.model.withdraw.WithdrawUserLimit; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @author: liaozetao - * @date: 2023/7/10 14:30 - * @description: - */ -public interface WithdrawUserLimitMapper extends BaseMapper<WithdrawUserLimit> { -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/withdraw/WithdrawUserMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/withdraw/WithdrawUserMapper.java deleted file mode 100644 index 3cef4cb4a..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/withdraw/WithdrawUserMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.accompany.business.mybatismapper.withdraw; - -import com.accompany.business.model.withdraw.WithdrawUser; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @author: liaozetao - * @date: 2023/7/7 14:50 - * @description: - */ -public interface WithdrawUserMapper extends BaseMapper<WithdrawUser> { - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/withdraw/WithdrawUserRecordMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/withdraw/WithdrawUserRecordMapper.java deleted file mode 100644 index 8c81a64d3..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/withdraw/WithdrawUserRecordMapper.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.accompany.business.mybatismapper.withdraw; - -import com.accompany.business.model.withdraw.WithdrawUserRecord; -import com.accompany.business.vo.withdraw.WithdrawUserRecordVo; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; - -/** - * @author: liaozetao - * @date: 2023/7/10 14:29 - * @description: - */ -public interface WithdrawUserRecordMapper extends BaseMapper<WithdrawUserRecord> { - - /** - * 分页 - * - * @param page - * @param recordStatus - * @param erbanNo - * @param accountType - * @param applyStartTime - * @param applyEndTime - * @return - */ - List<WithdrawUserRecordVo> page(Page<WithdrawUserRecord> page, @Param("recordStatus") Integer recordStatus, @Param("erbanNo") String erbanNo, @Param("accountType") Integer accountType, @Param("applyStartTime") Date applyStartTime, @Param("applyEndTime") Date applyEndTime); - - /** - * 统计 - * - * @param recordStatus - * @param erbanNo - * @param accountType - * @param applyStartTime - * @param applyEndTime - * @return - */ - Long totalCount(@Param("recordStatus") Integer recordStatus, @Param("erbanNo") String erbanNo, @Param("accountType") Integer accountType, @Param("applyStartTime") Date applyStartTime, @Param("applyEndTime") Date applyEndTime); -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/AppStoreService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/AppStoreService.java deleted file mode 100644 index cb1937d88..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/AppStoreService.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.accompany.business.service; - -import com.accompany.common.redis.RedisKey; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.service.common.JedisService; -import com.accompany.core.util.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -/** - * Created by liuguofu on 2017/7/10. - */ -@Service -public class AppStoreService { - @Autowired - private JedisService jedisService; - - @Deprecated - public BusiResult<Boolean> checkVersion(String version) { - Boolean result=false; - BusiResult busiResult=new BusiResult(BusiStatus.SUCCESS); - String auditingVersion=jedisService.read(RedisKey.auditing_iosversion.getKey()); - if(version.equals(auditingVersion)){ - result=true; - } - busiResult.setData(result); - return busiResult; - } - - public boolean checkVersionBy(String version){ - boolean result=false; - if(StringUtils.isEmpty(version)){ - return result; - } - String auditingVersion=jedisService.read(RedisKey.auditing_iosversion.getKey()); - if(version.equals(auditingVersion)){ - result=true; - } - return result; - } - - public BusiResult<Boolean> checkIsNeedForceUpdate(String version) { - Boolean result=false; - BusiResult busiResult=new BusiResult(BusiStatus.SUCCESS); - String forceupdateVersion=jedisService.read(RedisKey.forceupdate_iosversion.getKey()); - if(StringUtils.isBlank(forceupdateVersion)){//数据为空，没有强制更新版本，不需要强制更新，直接返回false - result= false; - }else{ - if(version.equals(forceupdateVersion)){//有需要强制更新版本，当前版本与强制版本一致，不需要更新 - result=false; - }else{//有需要强制更新版本，当前版本与强制版本不一直，需要强制更新，返回false - result=true; - } - } - busiResult.setData(result); - return busiResult; - } - - - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/ChannelDistributeService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/ChannelDistributeService.java deleted file mode 100644 index 814bb470d..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/ChannelDistributeService.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.accompany.business.service; - -import com.accompany.business.model.ChannelDistribute; -import com.accompany.business.model.ChannelDistributeExample; -import com.accompany.business.mybatismapper.ChannelDistributeMapper; -import com.accompany.core.service.base.BaseService; -import org.apache.commons.collections.CollectionUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * ｛这里添加描述｝ - * - * @author fangchengyan - * @date 2020-02-20 2:20 下午 - */ -@Service -public class ChannelDistributeService extends BaseService { - - @Autowired - private ChannelDistributeMapper channelDistributeMapper; - - /** - * 获取一条唯一的记录 - * @param appId - * @param channel - * @return - */ - public ChannelDistribute getUniqueOne(String appId, String channel) { - ChannelDistributeExample example = new ChannelDistributeExample(); - ChannelDistributeExample.Criteria criteria = example.createCriteria(); - criteria.andAppIdEqualTo(appId); - criteria.andChannelEqualTo(channel); - List<ChannelDistribute> list = channelDistributeMapper.selectByExample(example); - return CollectionUtils.isEmpty(list) ? null : list.get(0); - } - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/ChargeService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/ChargeService.java index 4629d4fbb..a7bd4b543 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/ChargeService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/ChargeService.java @@ -310,7 +310,6 @@ public class ChargeService extends BaseService { public int handleAppPayGoldBuss(ChargeRecord chargeRecord) { log.info("handleAppPayGoldBuss: {}", JSON.toJSONString(chargeRecord)); List<String> h5PayChannels = Arrays.asList(Constant.ChargeChannel.payermax, - Constant.ChargeChannel.my_card, Constant.ChargeChannel.start_pay, Constant.ChargeChannel.razer, Constant.ChargeChannel.v5pay); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/GreetMsgService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/GreetMsgService.java deleted file mode 100644 index c3a13d3ca..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/GreetMsgService.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.accompany.business.service; - -import com.accompany.business.model.GreetMsg; -import com.accompany.business.mybatismapper.GreetMsgMapperExpand; -import com.accompany.core.service.base.BaseService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -/** - * ｛这里添加描述｝ - * - * @author fangchengyan - * @date 2019-11-08 3:06 下午 - */ -@Service -public class GreetMsgService extends BaseService { - - @Autowired - private GreetMsgMapperExpand greetMsgMapperExpand; - - public String getOneByRandom(Long uid, Long toUid) { - GreetMsg greetMsg = greetMsgMapperExpand.getOnByRandom(); - if(null != greetMsg) { - return greetMsg.getContent(); - } - return ""; - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/LuckySeaPreWarningService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/LuckySeaPreWarningService.java deleted file mode 100644 index 163f114f1..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/LuckySeaPreWarningService.java +++ /dev/null @@ -1,267 +0,0 @@ -/* - * 文 件 名: LuckySeaPreWarningService - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/9/22 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.service; - -import com.accompany.business.dto.luckysea.LuckySeaBroadCastDTO; -import com.accompany.business.dto.luckysea.LuckySeaGoldPreWarningDTO; -import com.accompany.business.dto.luckysea.LuckySeaPreWarningConfig; -import com.accompany.business.model.activity.luckysea.LuckySeaActInfo; -import com.accompany.business.model.activity.luckysea.LuckySeaDrawItem; -import com.accompany.business.mybatismapper.activity.LuckySeaPreWarningMapper; -import com.accompany.business.service.activities.luckySea.LuckySeaActInfoService; -import com.accompany.business.service.activities.luckySea.LuckySeaStockService; -import com.accompany.common.config.WebSecurityConfig; -import com.accompany.common.constant.Constant; -import com.accompany.common.push.MarkdownMessage; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.common.utils.StringUtils; -import com.accompany.core.service.SysConfService; -import com.accompany.core.service.message.MessageRobotPushService; -import com.alibaba.fastjson.JSON; -import com.google.common.collect.ImmutableMap; -import lombok.extern.slf4j.Slf4j; -import org.joda.time.DateTime; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -/** - * <br>类描述: - * <br>功能详细描述: - * - * @author H1 - * @date [2021/9/22] - */ -@Service -@Slf4j -public class LuckySeaPreWarningService { - - @Autowired - private SysConfService sysConfService; - @Autowired - private LuckySeaPreWarningMapper luckySeaPreWarningMapper; - @Autowired - private WebSecurityConfig webSecurityConfig; - @Autowired - private LuckySeaActInfoService actInfoService; - @Autowired - private LuckySeaStockService stockService; - @Autowired - private MessageRobotPushService messageRobotPushService; - - private static final String START_TIME_KEY = "startTime"; - private static final String END_TIME_KEY = "endTime"; - - /** - * 获取预警配置 - * @return - */ - private LuckySeaPreWarningConfig getConfig() { - String configVal = sysConfService.getSysConfValueById(Constant.SysConfId.LUCKY_SEA_PREWARNING_CONFIG); - return StringUtils.isBlank(configVal) ? null : JSON.parseObject(configVal, LuckySeaPreWarningConfig.class); - } - - /** - * 处理金币预警 - * @param config - */ - private void handleGoldPreWarning(LuckySeaPreWarningConfig config) { - LuckySeaPreWarningConfig.GoldPreWarning goldPreWarning = config.getGoldPreWarning(); - if (null == goldPreWarning || !goldPreWarning.getOpen()) { - log.info("[handleGoldPreWarning] 开关未开启"); - return; - } - List<LuckySeaPreWarningConfig.GoldPreWarningItem> itemList = goldPreWarning.getItemList(); - if (CollectionUtils.isEmpty(itemList)) { - log.info("[handleGoldPreWarning] 未配置监测项"); - return; - } - for (LuckySeaPreWarningConfig.GoldPreWarningItem item : itemList) { - LuckySeaGoldPreWarningDTO stat = luckySeaPreWarningMapper.getPreRoundStat(item.getRoundNum()); - if (stat.getGoldIn() > 0) { - BigDecimal stock = stockService.getStock(); - double rate = BigDecimal.valueOf(stat.getGoldOut()).divide(BigDecimal.valueOf(stat.getGoldIn()), 2, RoundingMode.HALF_UP).doubleValue(); - log.info("[handleGoldPreWarning] 前{}轮 out{} in{} rate{}", item.getRoundNum(), stat.getGoldOut(), stat.getGoldIn(), rate); - if (rate >= item.getWarnRate() || stock.compareTo(BigDecimal.valueOf(item.getWarnStock())) <= 0) { - sendGoldPreWarningEnterpriseWechatMsg(config, stat, item.getRoundNum(), rate); - } - } - } - } - - /** - * 发送金币预警企业微信消息 - * - * @param config - * @param stat - * @param roundNum - * @param rate - */ - private void sendGoldPreWarningEnterpriseWechatMsg(LuckySeaPreWarningConfig config, LuckySeaGoldPreWarningDTO stat, Integer roundNum, Double rate) { - BigDecimal stockStr = stockService.getStock(); - - MarkdownMessage msg = new MarkdownMessage(); - String appName = config.getAppName(); - String actName = config.getActName(); - msg.addTitle(MarkdownMessage.getHeaderText(3, actName + "库存预警")); - msg.add(MarkdownMessage.getReferenceText("["+ appName + "]" + "[" + actName + "]在前" + roundNum + "轮的产出/投入=" + "[" + rate + "]，具体：")); - msg.add(MarkdownMessage.getReferenceText("前"+ roundNum + "轮投入:" + stat.getGoldIn())); - msg.add(MarkdownMessage.getReferenceText("前"+ roundNum + "轮产出:" + stat.getGoldOut())); - msg.add(MarkdownMessage.getReferenceText("当前库存数:" + stockStr.toString())); - msg.add(MarkdownMessage.getReferenceText("请判断是否需要前往后台查看")); - String key = webSecurityConfig.getLuckySeaDingPushKey(); - messageRobotPushService.pushMessageByKey(key,msg, true); - } - - /** - * 处理信息轮播 - */ - public void handleBroadcast() { - log.info("[handleBroadcast] =========== start ==========="); - LuckySeaPreWarningConfig config = getConfig(); - if (null == config) { - log.info("[handleBroadcast] config is null"); - return; - } - LuckySeaPreWarningConfig.Broadcast broadcast = config.getBroadcast(); - if (!broadcast.getOpen()) { - log.info("[handleBroadcast] 开关未开启"); - return; - } - // 校验是否处在开启时间 - if (!checkIsOpeningTime(broadcast)) { - log.info("[handleBroadcast] 不处于播报时间段"); - return; - } - Date now = new Date(); - String endTime = DateTimeUtil.convertDate(now, DateTimeUtil.DEFAULT_DATETIME_PATTERN); - String startTime = DateTimeUtil.convertDate(DateTimeUtil.addHours(now, -1), DateTimeUtil.DEFAULT_DATETIME_PATTERN); - LuckySeaBroadCastDTO broadCastStat = luckySeaPreWarningMapper.getBroadCastStat(startTime, endTime); - sendBroadcastEnterpriseWechatMsg(config, broadCastStat, startTime, endTime); - log.info("[handleBroadcast] =========== end ==========="); - } - - /** - * 检查是否处于轮播时段 - * @param broadcast - * @return - */ - private boolean checkIsOpeningTime(LuckySeaPreWarningConfig.Broadcast broadcast) { - String timesConfig = broadcast.getOpenTime(); - if (StringUtils.isBlank(timesConfig)) { - return false; - } - String[] times = timesConfig.split("-"); - Map<String, String> openTimeMap = ImmutableMap.of(START_TIME_KEY, times[0], END_TIME_KEY, times[1]); - String startTime = openTimeMap.get(START_TIME_KEY); - String endTime = openTimeMap.get(END_TIME_KEY); - String[] startHourAndMinutes = startTime.split(":"); - String[] endHourAndMinutes = endTime.split(":"); - DateTime now = DateTime.now(); - DateTime startDateTime = - now.withTime( - Integer.valueOf(startHourAndMinutes[0]), Integer.valueOf(startHourAndMinutes[1]), 0, 0); - DateTime endDateTime = - now.withTime( - Integer.valueOf(endHourAndMinutes[0]), Integer.valueOf(endHourAndMinutes[1]), 0, 0); - // 如果结束时间小于开始时间，则结束日期往后延一天。因为存在跨天的情况 - if (endDateTime.compareTo(startDateTime) < 0) { - if (now.getHourOfDay() > endDateTime.getHourOfDay()) { - endDateTime = endDateTime.plusDays(1); - } else { - startDateTime = startDateTime.minusDays(1); - } - } - return now.compareTo(startDateTime) >= 0 && now.compareTo(endDateTime) <= 0; - } - - /** - * 发送定时轮播企业微信 - * @param config - * @param broadCastStat - * @param startTime - * @param endTime - */ - private void sendBroadcastEnterpriseWechatMsg(LuckySeaPreWarningConfig config, LuckySeaBroadCastDTO broadCastStat, String startTime, String endTime) { - BigDecimal stock = stockService.getStock(); - - MarkdownMessage msg = new MarkdownMessage(); - String appName = config.getAppName(); - String actName = config.getActName(); - msg.addTitle(MarkdownMessage.getHeaderText(3, actName + "定时播报")); - msg.add(MarkdownMessage.getReferenceText("["+ appName + "]" + "[" + actName + "]在" + startTime + "-" + endTime + "期间内情况如下：")); - msg.add(MarkdownMessage.getReferenceText("参与用户数:" + broadCastStat.getPeopleNum())); - msg.add(MarkdownMessage.getReferenceText("用户参与总值:" + broadCastStat.getGoldIn())); - msg.add(MarkdownMessage.getReferenceText("用户产出总值:" + broadCastStat.getGoldOut())); - msg.add(MarkdownMessage.getReferenceText("游戏执行轮数:" + broadCastStat.getRoundNum())); - msg.add(MarkdownMessage.getReferenceText("当前库存数:" + stock.toString())); - String key = webSecurityConfig.getLuckySeaDingPushKey(); - messageRobotPushService.pushMessageByKey(key,msg, true); - } - - @Async - public void handleWarning(String roundId) { - LuckySeaPreWarningConfig config = getConfig(); - if (null == config) { - log.info("[handleGoldPreWarning] config is null"); - return; - } - - handleInputOutputPreWarning(roundId, config); - handleGoldPreWarning(config); - } - - private void handleInputOutputPreWarning(String roundId, LuckySeaPreWarningConfig c) { - LuckySeaPreWarningConfig.InputOutputPreWarning config = c.getInputOutputPreWarning(); - if (null == config || !config.getOpen()){ - log.info("[handleInputOutputPreWarning] 开关未开启"); - return; - } - LuckySeaBroadCastDTO statDto = luckySeaPreWarningMapper.getStatByRoundId(roundId); - if (null == statDto) { - return; - } - if (statDto.getGoldIn() > config.getInput() || statDto.getGoldOut() > config.getOutput()){ - sendInputOutputWarningEnterpriseWechatMsg(c, statDto, roundId); - } - } - - private void sendInputOutputWarningEnterpriseWechatMsg(LuckySeaPreWarningConfig config, LuckySeaBroadCastDTO broadCastStat, String roundId) { - BigDecimal stock = stockService.getStock(); - - LuckySeaActInfo actInfo = actInfoService.getById(roundId); - String drawItemNames = actInfo.getDrawItemList().stream() - .map(LuckySeaDrawItem::getDrawName) - .collect(Collectors.joining(",")); - - MarkdownMessage msg = new MarkdownMessage(); - String appName = config.getAppName(); - String actName = config.getActName(); - msg.addTitle(MarkdownMessage.getHeaderText(3, actName + "高投产播报")); - msg.add(MarkdownMessage.getReferenceText("["+ appName + "]" + "[" + actName + "]")); - msg.add(MarkdownMessage.getReferenceText("轮次:" + roundId)); - msg.add(MarkdownMessage.getReferenceText("开奖:" + actInfo.getDrawName()) + "("+ drawItemNames + ")"); - msg.add(MarkdownMessage.getReferenceText("参与用户数:" + broadCastStat.getPeopleNum())); - msg.add(MarkdownMessage.getReferenceText("用户参与总值:" + broadCastStat.getGoldIn())); - msg.add(MarkdownMessage.getReferenceText("用户产出总值:" + broadCastStat.getGoldOut())); - msg.add(MarkdownMessage.getReferenceText("当前库存数:" + stock.toString())); - String key = webSecurityConfig.getLuckySeaDingPushKey(); - messageRobotPushService.pushMessageByKey(key,msg, true); - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/WebConfigService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/WebConfigService.java deleted file mode 100644 index e56af296d..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/WebConfigService.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.accompany.business.service; - -import com.accompany.business.model.WebConfig; -import com.accompany.business.model.WebConfigExample; -import com.accompany.business.mybatismapper.WebConfigMapper; -import com.accompany.common.constant.ApplicationConstant; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.utils.BlankUtil; -import com.accompany.core.service.base.BaseService; -import com.accompany.core.service.common.JedisService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * Created by yuanyi on 2019/3/19. - */ -@Service -public class WebConfigService extends BaseService { - - @Autowired - private JedisService jedisService; - - @Autowired - private WebConfigMapper mapper; - - - public List<WebConfig> getList() { - WebConfigExample example = new WebConfigExample(); - return mapper.selectByExample(example); - } - - public void refresh() { - List<WebConfig> list = this.getList(); - for (WebConfig config : list) { - jedisService.hset(RedisKey.web_config.getKey(), config.getAkey(), config.getAval()); - } - } - - public String getSingleConfValFromCache(String key){ - String configValStr = jedisService.hget(RedisKey.web_config.getKey(), key); - if(BlankUtil.isBlank(configValStr) || ApplicationConstant.NULL_JSON_OBJECT.equals(configValStr)){ - return null; - } - return configValStr; - } - - public String getSingleConf(String key){ - String val = this.getSingleConfValFromCache(key); - if(val != null){ - return val; - } - WebConfig webConfig = this.getSingleConfFromDB(key); - if(webConfig == null){ - return null; - } - jedisService.hset(RedisKey.web_config.getKey(),webConfig.getAkey(),webConfig.getAval()); - return webConfig.getAval(); - } - - public WebConfig getSingleConfFromDB(String key){ - WebConfigExample example = new WebConfigExample(); - WebConfigExample.Criteria criteria = example.createCriteria(); - criteria.andAkeyEqualTo(key); - List<WebConfig> list = mapper.selectByExample(example); - return list.get(0); - } - - public Map<String,String> getBatchActConf(String[] fieldsArray) { - List<String> configStrList = jedisService.hmread(RedisKey.web_config.getKey(), fieldsArray); - Map<String, String> map = new HashMap<>(); - Integer index = 0; - for (String configStr : configStrList) { - map.put(fieldsArray[index], configStr); - index++; - } - return map; - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/ActSingleRoomRankService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/ActSingleRoomRankService.java deleted file mode 100644 index 84bd4f6c6..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/ActSingleRoomRankService.java +++ /dev/null @@ -1,166 +0,0 @@ -package com.accompany.business.service.activities; - -import com.accompany.business.constant.activities.ActivityAwardTypeEnum; -import com.accompany.business.model.CarGoods; -import com.accompany.business.model.Gift; -import com.accompany.business.model.Headwear; -import com.accompany.business.model.Nameplate; -import com.accompany.business.mybatismapper.ActSingleRoomRankMapper; -import com.accompany.business.mybatismapper.NameplateMapper; -import com.accompany.business.service.car.CarGoodsService; -import com.accompany.business.service.gift.GiftService; -import com.accompany.business.service.headwear.HeadwearService; -import com.accompany.business.vo.activity.*; -import com.accompany.common.constant.Constant; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.service.SysConfService; -import com.accompany.core.service.base.BaseService; -import com.alibaba.fastjson.JSONObject; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.LinkedList; -import java.util.List; - -@Service -@Slf4j -public class ActSingleRoomRankService extends BaseService { - - private static final Integer hour_unit = 60; - - @Autowired - private ActSingleRoomRankMapper actSingleRoomRankMapper; - @Autowired - private SysConfService sysConfService; - @Autowired - private CarGoodsService carGoodsService; - @Autowired - private NameplateMapper nameplateMapper; - @Autowired - private HeadwearService headwearService; - @Autowired - private GiftService giftService; - - public ActivitySingleRoomRankVo getSingleRoomRank(Integer rankType) { - ActivitySingleRoomRankVo rankVo = new ActivitySingleRoomRankVo(); - Date beginTimeWeek = DateTimeUtil.getBeginTimeOfCurrentWeek(); - Date endTimeWeek = DateTimeUtil.getEndTimeOfCurrentWeek(); - List<ActivityRankVo> list = new LinkedList<>(); - if(rankType.equals(Constant.SingleRoomRankType.NEW_USER_SEND_GIFT)){ - list = actSingleRoomRankMapper.selectNewUserSendGift(beginTimeWeek,endTimeWeek); - } else if(rankType.equals(Constant.SingleRoomRankType.JOIN_FANS_USER)){ - list = actSingleRoomRankMapper.selectJoinFansUser(beginTimeWeek,endTimeWeek); - } else if(rankType.equals(Constant.SingleRoomRankType.OPNE_TIME)){ - list = actSingleRoomRankMapper.selectSignleRoomOpenTime(beginTimeWeek,endTimeWeek); - parseDuration(list); - } - rankVo.setBeginTimeWeek(DateTimeUtil.convertDate(beginTimeWeek, DateTimeUtil.DEFAULT_DATE_PATTERN)); - rankVo.setEndTimeWeek(DateTimeUtil.convertDate(endTimeWeek, DateTimeUtil.DEFAULT_DATE_PATTERN)); - rankVo.setRankVoList(list); - return rankVo; - } - - public ActivitySingleRoomRankAward getSingleRoomRankAwardList(Integer rankType) { - ActivitySingleRoomRankAward awardVo = new ActivitySingleRoomRankAward(); - String key = RedisKey.single_room_week_rank_award.getKey(rankType.toString()); - String rankAwardStr = jedisService.get(key); - - if(StringUtils.isNotBlank(rankAwardStr)){ - awardVo = gson.fromJson(rankAwardStr, ActivitySingleRoomRankAward.class); - }else{ - if(rankType.equals(Constant.SingleRoomRankType.NEW_USER_SEND_GIFT)){ - awardVo = initSingleRoomAward(getSingleRoomRankAward().getNewUserSendGiftAward()); - } else if(rankType.equals(Constant.SingleRoomRankType.JOIN_FANS_USER)){ - awardVo = initSingleRoomAward(getSingleRoomRankAward().getJoinFansUser()); - } else if(rankType.equals(Constant.SingleRoomRankType.OPNE_TIME)){ - awardVo = initSingleRoomAward(getSingleRoomRankAward().getOpenTime()); - } - jedisService.set(key, gson.toJson(awardVo)); - } - return awardVo; - } - - private ActivitySingleRoomRankAward initSingleRoomAward(ActivitySingleRoomRankAward awardConfig){ - ActivitySingleRoomRankAward awardVo = new ActivitySingleRoomRankAward(); - List<ActivitiyAwardConfigVo> firstAward = getAwardList(awardConfig.getFirstAward()); - List<ActivitiyAwardConfigVo> secondAward = getAwardList(awardConfig.getSecondAward()); - List<ActivitiyAwardConfigVo> thirdAward = getAwardList(awardConfig.getThirdAward()); - - awardVo.setFirstAward(firstAward); - awardVo.setSecondAward(secondAward); - awardVo.setThirdAward(thirdAward); - return awardVo; - } - - private List<ActivitiyAwardConfigVo> getAwardList(List<ActivitiyAwardConfigVo> awardList){ - for(ActivitiyAwardConfigVo awardVo : awardList){ - - Integer awardId = awardVo.getAwardId(); - String awardName = ""; - String awardPic = ""; - String awardPrice = awardVo.getAwardNum() + " 天"; - if(awardVo.getAwardType().equals(ActivityAwardTypeEnum.NAMEPLATE.getAwardType())){ - Nameplate nameplate = nameplateMapper.selectById(awardId); - if(nameplate != null){ - awardName = nameplate.getName(); - awardPic = nameplate.getIconPic(); - } - }else if(awardVo.getAwardType().equals(ActivityAwardTypeEnum.HEADWEAR.getAwardType())){ - Headwear headwear = headwearService.getHeadwear(awardId); - if(headwear != null){ - awardName = headwear.getName(); - awardPic = headwear.getPic(); - } - }else if(awardVo.getAwardType().equals(ActivityAwardTypeEnum.CAR.getAwardType())){ - CarGoods carGoods = carGoodsService.getCarGoods(awardId); - if(carGoods != null){ - awardName = carGoods.getName(); - awardPic = carGoods.getPic(); - } - }else if(awardVo.getAwardType().equals(ActivityAwardTypeEnum.GIFT.getAwardType())){ - Gift gift = giftService.getGiftById(awardId); - if(gift != null){ - awardName = gift.getGiftName(); - awardPic = gift.getPicUrl(); - awardPrice = gift.getGoldPrice() + " 钻"; - } - } - awardVo.setAwardName(awardName); - awardVo.setAwardUrl(awardPic); - awardVo.setAwardPrice(awardPrice); - } - return awardList; - } - - public ActivitySingleRoomRankConfig getSingleRoomRankAward() { - String result = sysConfService.getSysConfValueById(Constant.SysConfId.SINGLE_ROOM_RANK_AWARD); - if(StringUtils.isBlank(result)){ - throw new ServiceException(BusiStatus.ACTIVITY_PARAMETERS_NOT_CONFIGURED); - } - ActivitySingleRoomRankConfig config = JSONObject.parseObject(result, ActivitySingleRoomRankConfig.class); - return config; - } - - private void parseDuration(List<ActivityRankVo> list) { - if (!CollectionUtils.isEmpty(list)) { - for (ActivityRankVo rankVo : list) { - //实际是分 - Long hour = rankVo.getRankValue(); - if (hour < hour_unit) { - rankVo.setRankValueStr(BigDecimal.valueOf(hour).intValue() + "min"); - } else { - rankVo.setRankValueStr(BigDecimal.valueOf(hour / hour_unit).intValue() + "h" + BigDecimal.valueOf(hour % hour_unit).intValue() + "min"); - } - } - } - } - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/ActivitiesLuckySeaService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/ActivitiesLuckySeaService.java deleted file mode 100644 index ec093577f..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/ActivitiesLuckySeaService.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.accompany.business.service.activities.luckySea; - -import com.accompany.business.dto.luckysea.LuckySeaActConfig; -import com.accompany.business.model.activity.luckysea.LuckySeaActInfo; -import com.accompany.business.service.activities.vo.LuckySeaActUserDrawRecordVo; -import com.accompany.business.service.activities.vo.LuckySeaActUserInfo; -import com.accompany.business.service.activities.vo.LuckySeaRankVo; -import com.accompany.business.vo.activities.LuckySeaActInfoVo; -import com.accompany.business.vo.activities.LuckySeaActUserDrawItemVO; - -import java.util.List; - -/** - * <br>接口描述: 深海奇缘活动service - * <br>功能详细描述: - * - * @author H1 - * @date [2020/12/29] - */ -public interface ActivitiesLuckySeaService { - /** - * 更新用户深海奇缘活动碎片数 - * @param uid - * @param packId - * @param packNum - */ - void updateUserLuckySeaActPiece(Long uid, Integer packId, Integer packNum); - - /** - * 获取用户深海奇缘活动信息 - * @param uid - * @return - */ - LuckySeaActUserInfo getUserLuckySeaActInfo(Long uid); - - /** - * 获取深海奇缘活动信息列表 - * @param count - * @param roundId - * @return - */ - List<LuckySeaActInfo> listLuckySeaActInfo(Integer count, String roundId); - - /** - * 获取最新一次的深海奇缘活动信息 - * @return - * @param uid - */ - LuckySeaActInfoVo getNewestLuckySeaActInfo(Long uid); - - /** - * 获取深海奇缘活动榜单信息 - * @param type - * @param page - * @param pageSize - * @param uid - * @return - */ - LuckySeaRankVo listRank(Integer type, Integer page, Integer pageSize, Long uid); - - /** - * 深海奇缘活动用户抽奖 - * @param uid - */ - void draw(Long uid, Long itemId, Long num); - - /** - * 获取深海奇缘活动各阶段时间配置 - * @return - */ - LuckySeaActConfig getLuckySeaTimeConfig(); - - /** - * 获取用户深海奇缘活动游戏记录 - */ - List<LuckySeaActUserDrawRecordVo> listUserDrawResult(Long uid, Integer page, Integer pageSize); - - - /** - * 获取用户单轮活动中投入碎片信息 - * @param uid - * @param roundId - * @return - */ - List<LuckySeaActUserDrawItemVO> listUserDrawItemInfo(Long uid, String roundId); - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaActConfigService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaActConfigService.java deleted file mode 100644 index e45419aff..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaActConfigService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.accompany.business.service.activities.luckySea; - -import com.accompany.business.dto.luckysea.LuckySeaActConfig; - -/** - * <br>接口描述: 深海奇缘活动信息service - * <br>功能详细描述: - * - * @author H1 - * @date [2020/12/31] - */ -public interface LuckySeaActConfigService { - - LuckySeaActConfig getLuckySeaTimeConfig(); - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaActInfoService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaActInfoService.java deleted file mode 100644 index 1dcc42ff1..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaActInfoService.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.accompany.business.service.activities.luckySea; - -import com.accompany.business.dto.luckysea.LuckySeaActConfig; -import com.accompany.business.model.activity.luckysea.LuckySeaActInfo; -import com.accompany.business.model.activity.luckysea.LuckySeaItem; -import com.baomidou.mybatisplus.extension.service.IService; - -import java.util.Date; -import java.util.List; - -/** - * <br>接口描述: 深海奇缘活动信息service - * <br>功能详细描述: - * - * @author H1 - * @date [2020/12/31] - */ -public interface LuckySeaActInfoService extends IService<LuckySeaActInfo> { - /** - * 根据当前时间获取活动信息 - * @return - */ - LuckySeaActInfo getByCurrTime(); - - List<LuckySeaActInfo> listActInfo(String roundId, Integer count); - - LuckySeaActInfo createNewRoundAct(LuckySeaActConfig timeConfig ); - - boolean updateStatus(String roundId, Byte drawing); - - boolean updateDrawResult(String roundId, Integer drawMode, String drawName, List<LuckySeaItem> drawItems, Date showResultStageStartTime, Double ticket); - - boolean endRound(String roundId); - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaDrawService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaDrawService.java deleted file mode 100644 index 215dc708b..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaDrawService.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.accompany.business.service.activities.luckySea; - -import com.accompany.business.model.activity.luckysea.LuckySeaItem; -import com.accompany.business.model.activity.luckysea.LuckySeaItemGroup; -import com.accompany.business.model.activity.luckysea.LuckySeaUserDrawRecord; - -import java.math.BigDecimal; -import java.util.List; - -public interface LuckySeaDrawService { - - void userDraw(Long uid, Long itemId, Long num); - - Integer getDrawMode(int drawMode, int uv); - - List<LuckySeaItem> handleDrawPrize(Integer drawMode, List<LuckySeaUserDrawRecord> recordList, - List<LuckySeaItem> itemList, - List<LuckySeaItemGroup> itemGroupList, - BigDecimal stock); -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaItemGroupService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaItemGroupService.java deleted file mode 100644 index b41c26862..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaItemGroupService.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.accompany.business.service.activities.luckySea; - -import com.accompany.business.model.activity.luckysea.LuckySeaItemGroup; -import com.baomidou.mybatisplus.extension.service.IService; - -import java.util.List; - -/** - * <br>接口描述: 深海奇缘活动配置item - * <br>功能详细描述: - * - * @author H1 - * @date [2020/12/31] - */ -public interface LuckySeaItemGroupService extends IService<LuckySeaItemGroup> { - - List<LuckySeaItemGroup> listItemGroup(); -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaItemService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaItemService.java deleted file mode 100644 index adee1f865..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaItemService.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.accompany.business.service.activities.luckySea; - -import com.accompany.business.model.activity.luckysea.LuckySeaItem; -import com.baomidou.mybatisplus.extension.service.IService; - -import java.util.List; - -/** - * <br>接口描述: 深海奇缘活动配置item - * <br>功能详细描述: - * - * @author H1 - * @date [2020/12/31] - */ -public interface LuckySeaItemService extends IService<LuckySeaItem> { - - LuckySeaItem getItemById(Long uid); - - List<LuckySeaItem> listItem(); - - List<LuckySeaItem> listItemFromDB(); -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaRankService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaRankService.java deleted file mode 100644 index 24ee1fb9b..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaRankService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.accompany.business.service.activities.luckySea; - -import com.accompany.business.service.activities.vo.LuckySeaRankVo; - -/** - * <br>接口描述: 深海奇缘活动信息service - * <br>功能详细描述: - * - * @author H1 - * @date [2020/12/31] - */ -public interface LuckySeaRankService { - - LuckySeaRankVo listRank(Integer type, Integer page, Integer pageSize, Long uid); - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaSettlementService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaSettlementService.java deleted file mode 100644 index ad53a373a..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaSettlementService.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.accompany.business.service.activities.luckySea; - -import com.accompany.business.model.activity.luckysea.LuckySeaItem; - -import java.util.List; - -public interface LuckySeaSettlementService { - - void sendReward(String roundId); - - void addUserDrawResult(String roundId, List<LuckySeaItem> itemList, List<LuckySeaItem> drawItems); -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaStockService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaStockService.java deleted file mode 100644 index 447e3195d..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaStockService.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.accompany.business.service.activities.luckySea; - -import com.accompany.common.constant.Constant; -import com.accompany.common.redis.RedisKey; -import com.accompany.core.service.SysConfService; -import org.redisson.api.RAtomicDouble; -import org.redisson.api.RedissonClient; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; - -@Service -public class LuckySeaStockService implements InitializingBean { - - private RAtomicDouble stockCache; - - @Autowired - private SysConfService sysConfService; - @Autowired - private RedissonClient redissonClient; - - public BigDecimal getStock() { - Double stock = stockCache.get(); - if (!stockCache.isExists()){ - stock = Double.parseDouble(sysConfService.getDefaultSysConfValueById(Constant.SysConfId.LUCKY_SEA_STOCK, "0")); - stockCache.set(stock); - } - return BigDecimal.valueOf(stock); - } - - public BigDecimal addStock(BigDecimal userInputAfterDeduct) { - double userInputD = userInputAfterDeduct.doubleValue(); - double after = stockCache.addAndGet(userInputD); - return BigDecimal.valueOf(after); - } - - public BigDecimal subStock(BigDecimal output) { - if (BigDecimal.ZERO.compareTo(output) >= 0){ - return getStock(); - } - double outputD = output.doubleValue(); - double after = stockCache.addAndGet(-outputD); - return BigDecimal.valueOf(after); - } - - public void editStock(BigDecimal stock) { - double stockD = stock.doubleValue(); - stockCache.set(stockD); - } - - @Override - public void afterPropertiesSet() throws Exception { - stockCache = redissonClient.getAtomicDouble(RedisKey.LUCKY_SEA_ACT_STOCK.getKey()); - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaTicketService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaTicketService.java deleted file mode 100644 index 1a320b09d..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaTicketService.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.accompany.business.service.activities.luckySea; - -import com.accompany.business.dto.activity.luckysea.LuckySeaTicketConfigDto; -import com.accompany.common.constant.Constant; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.common.utils.StringUtils; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.service.SysConfService; -import com.alibaba.fastjson.JSON; -import lombok.extern.slf4j.Slf4j; -import org.redisson.api.RAtomicDouble; -import org.redisson.api.RedissonClient; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; - -@Slf4j -@Service -public class LuckySeaTicketService { - - @Autowired - private SysConfService sysConfService; - @Autowired - private RedissonClient redissonClient; - - /** - * 获取召唤战斗活动配置的门票 - * - * @return - */ - public BigDecimal getTicketRate(BigDecimal stock) { - String ticketStr = sysConfService.getSysConfValueById(Constant.SysConfId.LUCKY_SEA_TICKET); - if (StringUtils.isBlank(ticketStr)) { - throw new ServiceException(BusiStatus.THE_CONFIGURED_TICKET_IS_EMPTY); - } - - LuckySeaTicketConfigDto ticketConfig = JSON.parseObject(ticketStr, LuckySeaTicketConfigDto.class); - - BigDecimal todayTotalTicket = getTodayTotalTicket(); - if (todayTotalTicket.compareTo(ticketConfig.getDayTicketMax()) >= 0){ - log.info("春日游园活动，当天已达到门票上限 {}，不再收取门票", ticketConfig.getDayTicketMax()); - return BigDecimal.ZERO; - } - - if (stock.compareTo(ticketConfig.getStockBenchmark()) >= 0){ - log.info("春日游园活动，当前库存 {} 大于等于 库存基准点 {} ，门票比例 {}", stock, ticketConfig.getStockBenchmark(), ticketConfig.getBigTicketRate()); - return ticketConfig.getBigTicketRate(); - } - - log.info("春日游园活动，当前库存 {} 小于 库存基准点 {} ，门票比例 {}", stock, ticketConfig.getStockBenchmark(), ticketConfig.getSmallTicketRate()); - return ticketConfig.getSmallTicketRate(); - } - - private BigDecimal getTodayTotalTicket(){ - String today = DateTimeUtil.getTodayStr(); - RAtomicDouble todayTotalTicket = redissonClient.getAtomicDouble(RedisKey.lucky_sea_today_total_ticket.getKey(today)); - if (!todayTotalTicket.isExists()){ - return BigDecimal.ZERO; - } - return BigDecimal.valueOf(todayTotalTicket.get()); - } - - public BigDecimal addTodayTotalTicket(BigDecimal ticketPiece) { - if (BigDecimal.ZERO.compareTo(ticketPiece) < 0){ - String today = DateTimeUtil.getTodayStr(); - double after = redissonClient.getAtomicDouble(RedisKey.lucky_sea_today_total_ticket.getKey(today)).addAndGet(ticketPiece.doubleValue()); - return BigDecimal.valueOf(after); - } - - return getTodayTotalTicket(); - } - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaUserDrawRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaUserDrawRecordService.java deleted file mode 100644 index 45c8d997d..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaUserDrawRecordService.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.accompany.business.service.activities.luckySea; - -import com.accompany.business.model.activity.luckysea.LuckySeaItem; -import com.accompany.business.model.activity.luckysea.LuckySeaUserDrawRecord; -import com.baomidou.mybatisplus.extension.service.IService; -import org.redisson.api.RMap; - -import java.util.List; - -/** - * <br>接口描述: - * <br>功能详细描述: - * - * @author H1 - * @date [2021/1/4] - */ -public interface LuckySeaUserDrawRecordService extends IService<LuckySeaUserDrawRecord> { - RMap<Long, Double> getTodayDiamondIncomCacheMap(); - - Double getUserTodayDiamondIncome(Long uid); - - /** - * 更新用户抽奖记录 - * @param uid - * @param roundId - * @param costPieceNum - */ - boolean updateUserDrawRecord(Long uid, Long roomUid, String roundId, LuckySeaItem item, Long costPieceNum); - - List<LuckySeaUserDrawRecord> listRecordByRoundId(String roundId, Byte status); - - boolean updateDrawRecordStatus(String roundId, List<Long> drawIds, Byte win); -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaUserDrawResultService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaUserDrawResultService.java deleted file mode 100644 index 9b376427d..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaUserDrawResultService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.accompany.business.service.activities.luckySea; - -import com.accompany.business.model.activity.luckysea.LuckySeaUserDrawResult; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * <br>接口描述: - * <br>功能详细描述: - * - * @author H1 - * @date [2021/1/5] - */ -public interface LuckySeaUserDrawResultService extends IService<LuckySeaUserDrawResult> { - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/ActivitiesLuckySeaServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/ActivitiesLuckySeaServiceImpl.java deleted file mode 100644 index be8f77a59..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/ActivitiesLuckySeaServiceImpl.java +++ /dev/null @@ -1,329 +0,0 @@ -package com.accompany.business.service.activities.luckySea.impl; - -import com.accompany.business.dto.activity.luckysea.LuckySeaUserDrawResultDto; -import com.accompany.business.dto.luckysea.LuckySeaActConfig; -import com.accompany.business.model.ActivityPack; -import com.accompany.business.model.UserPurse; -import com.accompany.business.model.activity.luckysea.LuckySeaActInfo; -import com.accompany.business.model.activity.luckysea.LuckySeaDrawItem; -import com.accompany.business.model.activity.luckysea.LuckySeaItem; -import com.accompany.business.model.activity.luckysea.LuckySeaUserDrawResult; -import com.accompany.business.mybatismapper.activity.LuckySeaActMapper; -import com.accompany.business.service.activities.luckySea.*; -import com.accompany.business.service.activities.vo.LuckySeaActUserDrawRecordVo; -import com.accompany.business.service.activities.vo.LuckySeaActUserInfo; -import com.accompany.business.service.activities.vo.LuckySeaRankVo; -import com.accompany.business.service.activity.ActivityPackService; -import com.accompany.business.service.purse.UserPurseService; -import com.accompany.business.service.user.UserActPropertyInfoService; -import com.accompany.business.service.user.UsersService; -import com.accompany.business.vo.activities.*; -import com.accompany.common.constant.Constant; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.common.utils.StringUtils; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.model.Users; -import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; -import org.redisson.api.RLock; -import org.redisson.api.RedissonClient; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import javax.annotation.Resource; -import java.util.*; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.Executor; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; - - -@Service -@Slf4j -public class ActivitiesLuckySeaServiceImpl implements ActivitiesLuckySeaService { - - @Autowired - private RedissonClient redissonClient; - @Autowired - private LuckySeaActConfigService configService; - @Autowired - private ActivityPackService activityPackService; - @Autowired - private UserActPropertyInfoService userActPropertyInfoService; - @Autowired - private UsersService usersService; - @Autowired - private UserPurseService userPurseService; - @Autowired - private LuckySeaItemService luckySeaItemService; - @Autowired - private LuckySeaActInfoService luckySeaActInfoService; - @Autowired - private LuckySeaRankService rankService; - @Autowired - private LuckySeaActMapper luckySeaActMapper; - @Autowired - private LuckySeaDrawService drawService; - @Autowired - private LuckySeaUserDrawResultService userDrawResultService; - @Autowired - private LuckySeaUserDrawRecordService userDrawRecordService; - @Resource(name = "biz-executor") - private ThreadPoolExecutor taskExecutor; - - @Override - public void updateUserLuckySeaActPiece(Long uid, Integer packId, Integer packNum) { - if (null == uid) { - throw new ServiceException("uid不能为空"); - } - if (null == packId) { - throw new ServiceException("packId不能为空"); - } - if (null == packNum || packNum <= 0) { - throw new ServiceException("购买礼包数必须大于0"); - } - log.info("updateUserLuckySeaActPiece, uid = {}, packId = {}, packNum = {}", uid, packId, packNum); - boolean locked = false; - RLock lock = redissonClient.getLock(RedisKey.LOCK_LUCKY_SEA_UPDATE_PIECE.getKey(uid.toString())); - try { - locked = lock.tryLock(3, TimeUnit.SECONDS); - if (!locked){ - throw new ServiceException(BusiStatus.SERVERBUSY); - } - - ActivityPack pack = activityPackService.getPackById(packId); - if (null == pack) { - throw new ServiceException("购买的产品不存在"); - } - int pieceNum = pack.getTicketNum() * packNum; - userActPropertyInfoService.updatePiece(uid, (long)pieceNum); - log.info("updateTicketNum, num = {}",pieceNum); - } catch (InterruptedException e) { - log.error("[春日游园]", e); - throw new ServiceException(BusiStatus.SERVERBUSY); - } finally { - if (locked){ - lock.unlock(); - } - } - } - - @Override - public LuckySeaActUserInfo getUserLuckySeaActInfo(Long uid) { - Users user = usersService.getUsersByUid(uid); - if (null == user) { - throw new ServiceException(BusiStatus.USERNOTEXISTS); - } - - LuckySeaActUserInfo info = new LuckySeaActUserInfo(); - info.setAvatar(user.getAvatar()); - info.setNick(user.getNick()); - - // 获取用户钱包钻石数 - UserPurse userPurse = userPurseService.queryUserPurse(uid); - info.setDiamonds(null != userPurse? userPurse.getDiamonds() : 0); - - Double diamondIncome = userDrawRecordService.getUserTodayDiamondIncome(uid); - info.setTodayReward(diamondIncome); - return info; - } - - @Override - public List<LuckySeaActInfo> listLuckySeaActInfo(Integer count, String roundId) { - return luckySeaActInfoService.listActInfo(roundId, count); - } - - @Override - public LuckySeaActInfoVo getNewestLuckySeaActInfo(Long uid) { - LuckySeaActInfoVo vo = new LuckySeaActInfoVo(); - - LuckySeaActInfo info = luckySeaActInfoService.getByCurrTime(); - if (null == info){ - return vo; - } - BeanUtils.copyProperties(info, vo); - - LuckySeaActConfig luckySeaTimeConfig = getLuckySeaTimeConfig(); - - if (vo.getShowResultStageStartTime() == null) { - vo.setShowResultStageStartTime(DateTimeUtil.addSeconds(vo.getDrawStageStartTime(), luckySeaTimeConfig.getWaitingDrawStageTime())); - } - - if (Constant.LuckySeaActStatus.DRAW_OVER.equals(info.getStatus())) { - vo.setEndTime(DateTimeUtil.addSeconds(vo.getShowResultStageStartTime(), luckySeaTimeConfig.getDrawOverStageTime())); - - CountDownLatch cdl = new CountDownLatch(2); - taskExecutor.execute(()->{ - try { - // 获取排行榜前三 - List<LuckySeaActRoundRankUserVo> topThreeUser = luckySeaActMapper.listTopThreeInOneRound(info.getRoundId()); - if (!CollectionUtils.isEmpty(topThreeUser)){ - List<Long> uids = topThreeUser.stream().map(LuckySeaActRoundRankUserVo::getUid).distinct().collect(Collectors.toList()); - Map<Long, Users> usersMap = usersService.getUsersMapByUids(uids); - for (LuckySeaActRoundRankUserVo e: topThreeUser){ - Users u = usersMap.get(e.getUid()); - if (null == u){ - continue; - } - e.setErbanNo(u.getErbanNo()); - e.setNick(u.getNick()); - e.setAvatar(u.getAvatar()); - } - } - vo.setRankUserList(topThreeUser); - } catch (Exception e){ - log.error("[春日游园]", e); - } finally { - cdl.countDown(); - } - }); - - taskExecutor.execute(()->{ - try { - // 获取用户中奖信息 - LuckySeaActUserOneRoundDrawResult result = new LuckySeaActUserOneRoundDrawResult(); - List<LuckySeaActUserDrawItemVO> userRecords = listUserDrawItemInfo(uid, info.getRoundId()); - result.setDrawRecords(userRecords); - - Set<Long> drawIds = info.getDrawItemList().stream() - .map(LuckySeaDrawItem::getDrawId).collect(Collectors.toSet()); - - result.setPrizeDiamonds(0L); - if (CollectionUtils.isEmpty(userRecords)){ - result.setDrawStatus(Constant.LuckySeaUserStatus.NOT_JOIN); - } else { - result.setDrawStatus(Constant.LuckySeaUserStatus.NOT_WIN); - for (LuckySeaActUserDrawItemVO record: userRecords){ - if (drawIds.contains(record.getId()) && record.getCostPieceNum() > 0) { - result.setDrawStatus(Constant.LuckySeaUserStatus.WIN); - result.setPrizeDiamonds(result.getPrizeDiamonds() - + record.getCostPieceNum().longValue() * record.getMultiple().longValue()); - } - } - } - vo.setUserDrawResult(result); - } catch (Exception e){ - log.error("[春日游园]", e); - } finally { - cdl.countDown(); - } - }); - - try { - cdl.await(3, TimeUnit.SECONDS); - } catch (InterruptedException e) { - log.error("[春日游园]", e); - throw new ServiceException(BusiStatus.SERVERERROR); - } - } - return vo; - } - - @Override - public LuckySeaRankVo listRank(Integer type, Integer page, Integer pageSize, Long uid) { - return rankService.listRank(type, page, pageSize, uid); - } - - @Override - public void draw(Long uid, Long itemId, Long num) { - drawService.userDraw(uid, itemId, num); - } - - @Override - public LuckySeaActConfig getLuckySeaTimeConfig() { - return configService.getLuckySeaTimeConfig(); - } - - @Override - public List<LuckySeaActUserDrawRecordVo> listUserDrawResult(Long uid, Integer page, Integer pageSize) { - - Page<LuckySeaUserDrawResult> pageInfo = new Page<>(page, pageSize); - QueryWrapper<LuckySeaUserDrawResult> wrapper = Wrappers.query(); - wrapper.lambda().eq(LuckySeaUserDrawResult::getUid, uid) - .orderByDesc(LuckySeaUserDrawResult::getDrawTime); - userDrawResultService.page(pageInfo, wrapper); - - List<LuckySeaActUserDrawRecordVo> results = new ArrayList<>(); - - if (CollectionUtils.isEmpty(pageInfo.getRecords())){ - return results; - } - - for (LuckySeaUserDrawResult result : pageInfo.getRecords()) { - LuckySeaActUserDrawRecordVo vo = new LuckySeaActUserDrawRecordVo(); - BeanUtils.copyProperties(result, vo); - - Set<Long> drawIds = result.getDrawItemList().stream().map(LuckySeaDrawItem::getDrawId).collect(Collectors.toSet()); - - long reward = 0L; - List<LuckySeaUserDrawResultVo> resultVos = handleDrawResult(result.getResult()); - for (LuckySeaUserDrawResultVo resultVo : resultVos) { - if (drawIds.contains(resultVo.getItemId())){ - reward += resultVo.getCostPiece() * resultVo.getMultiple(); - } - } - vo.setResults(resultVos); - vo.setReward(reward); - results.add(vo); - } - return results; - } - - /** - * 处理抽奖结果返回 - * @param resultJson - * @return - */ - private List<LuckySeaUserDrawResultVo> handleDrawResult(String resultJson) { - List<LuckySeaUserDrawResultVo> results = new ArrayList<>(); - if (StringUtils.isBlank(resultJson)){ - return results; - } - - Map<Long, String> itemUrlMap = luckySeaItemService.listItem().stream().collect(Collectors.toMap(LuckySeaItem::getId, LuckySeaItem::getImgUrl)); - - List<LuckySeaUserDrawResultDto> dtoList = JSON.parseArray(resultJson, LuckySeaUserDrawResultDto.class); - for (LuckySeaUserDrawResultDto dto : dtoList) { - LuckySeaUserDrawResultVo vo = new LuckySeaUserDrawResultVo(); - vo.setItemUrl(itemUrlMap.get(dto.getItemId())); - vo.setCostPiece(dto.getCostNum()); - vo.setItemId(dto.getItemId()); - vo.setMultiple(dto.getMultiple()); - results.add(vo); - } - - return results; - } - - @Override - public List<LuckySeaActUserDrawItemVO> listUserDrawItemInfo(Long uid, String roundId) { - Map<Long, LuckySeaActUserDrawItemVO> voMap = luckySeaItemService.listItem().stream().map(r->{ - LuckySeaActUserDrawItemVO vo = new LuckySeaActUserDrawItemVO(); - BeanUtils.copyProperties(r, vo); - vo.setCostPieceNum(0); - return vo; - }).collect(Collectors.toMap(LuckySeaActUserDrawItemVO::getId, i->i)); - - List<LuckySeaActUserDrawItemVO> userDrawRecord = luckySeaActMapper.listUserDrawItemInfo(roundId, uid); - if (!CollectionUtils.isEmpty(userDrawRecord)){ - for (LuckySeaActUserDrawItemVO record: userDrawRecord){ - LuckySeaActUserDrawItemVO vo = voMap.get(record.getId()); - vo.setCostPieceNum(record.getCostPieceNum()); - } - } - - return voMap.values().stream() - .sorted(Comparator.comparing(LuckySeaActUserDrawItemVO::getMultiple) - .thenComparing(LuckySeaActUserDrawItemVO::getId)) - .collect(Collectors.toList()); - } - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaActConfigServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaActConfigServiceImpl.java deleted file mode 100644 index 191d3978f..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaActConfigServiceImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.accompany.business.service.activities.luckySea.impl; - -import com.accompany.business.dto.luckysea.LuckySeaActConfig; -import com.accompany.business.service.activities.luckySea.LuckySeaActConfigService; -import com.accompany.common.constant.Constant; -import com.accompany.common.utils.StringUtils; -import com.accompany.core.service.SysConfService; -import com.alibaba.fastjson.JSON; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -/** - * <br>类描述: - * <br>功能详细描述: - * - * @author H1 - * @date [2020/12/31] - */ -@Service -@Slf4j -public class LuckySeaActConfigServiceImpl implements LuckySeaActConfigService { - - @Autowired - private SysConfService sysConfService; - - /** - * 选择阶段默认时间(秒) - */ - private final static Integer DEFAULT_CHOOSE_STAGE_TIME = 30; - /** - * 开奖阶段默认时间(秒) - */ - private final static Integer DEFAULT_WAITING_DRAW_STAGE_TIME = 5; - /** - * 开奖结束阶段默认时间(秒) - */ - private final static Integer DEFAULT_DRAW_OVER_STAGE_TIME = 3; - private final static Integer DEFAULT_MODE = 1; - - @Override - public LuckySeaActConfig getLuckySeaTimeConfig() { - String luckySeaConfigStr = sysConfService.getSysConfValueById(Constant.SysConfId.LUCKY_SEA_TIME_CONFIG); - if (StringUtils.isNoneBlank(luckySeaConfigStr)) { - return JSON.parseObject(luckySeaConfigStr, LuckySeaActConfig.class); - } - - LuckySeaActConfig config = new LuckySeaActConfig(); - config.setChooseStageTime(DEFAULT_CHOOSE_STAGE_TIME); - config.setWaitingDrawStageTime(DEFAULT_WAITING_DRAW_STAGE_TIME); - config.setDrawOverStageTime(DEFAULT_DRAW_OVER_STAGE_TIME); - config.setModelType(DEFAULT_MODE); - return config; - } - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaActInfoServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaActInfoServiceImpl.java deleted file mode 100644 index 33625880a..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaActInfoServiceImpl.java +++ /dev/null @@ -1,169 +0,0 @@ -package com.accompany.business.service.activities.luckySea.impl; - -import com.accompany.business.dto.luckysea.LuckySeaActConfig; -import com.accompany.business.model.activity.luckysea.LuckySeaActInfo; -import com.accompany.business.model.activity.luckysea.LuckySeaDrawItem; -import com.accompany.business.model.activity.luckysea.LuckySeaItem; -import com.accompany.business.mybatismapper.activity.LuckySeaActInfoMapper; -import com.accompany.business.service.activities.luckySea.LuckySeaActInfoService; -import com.accompany.common.constant.Constant; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.exception.ServiceException; -import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.extern.slf4j.Slf4j; -import org.redisson.api.RBucket; -import org.redisson.api.RedissonClient; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Comparator; -import java.util.Date; -import java.util.List; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; - -/** - * <br>类描述: - * <br>功能详细描述: - * - * @author H1 - * @date [2020/12/31] - */ -@Service -@Slf4j -public class LuckySeaActInfoServiceImpl extends ServiceImpl<LuckySeaActInfoMapper, LuckySeaActInfo> implements LuckySeaActInfoService, InitializingBean { - - @Autowired - private RedissonClient redissonClient; - - private RBucket<LuckySeaActInfo> actInfoCache; - - private final Integer CACHE_EXPIRE_SECOND = 3; - - @Override - public LuckySeaActInfo createNewRoundAct(LuckySeaActConfig timeConfig) { - Date startTime = new Date(); - String roundId = DateTimeUtil.convertDate(startTime, DateTimeUtil.LUCKY_SEA_ACT_ROUND_PATTERN); - LuckySeaActInfo act = new LuckySeaActInfo(); - act.setRoundId(roundId); - act.setStartTime(startTime); - act.setStatus(Constant.LuckySeaActStatus.CHOOSE_STAGE); - act.setDrawStageStartTime(DateTimeUtil.addSeconds(startTime, timeConfig.getChooseStageTime())); - act.setDrawMode(timeConfig.getModelType()); - act.setCreateTime(startTime); - act.setUpdateTime(startTime); - if (!save(act)){ - log.error("春日游园活动, 保存新的一轮游戏失败 roundId:{}, startTime:{}", roundId, startTime); - throw new ServiceException(BusiStatus.SERVERERROR); - } - actInfoCache.set(act, CACHE_EXPIRE_SECOND, TimeUnit.SECONDS); - log.info("春日游园活动, 创建新的一轮游戏 roundId:{}, startTime:{}", roundId, startTime); - return act; - } - - @Override - public boolean updateStatus(String roundId, Byte drawing) { - LuckySeaActInfo db = new LuckySeaActInfo(); - db.setRoundId(roundId); - db.setStatus(drawing); - db.setUpdateTime(new Date()); - - boolean succeed = updateById(db); - if (succeed){ - actInfoCache.delete(); - } - return succeed; - } - - @Override - public boolean endRound(String roundId) { - Date now = new Date(); - LuckySeaActInfo db = new LuckySeaActInfo(); - db.setRoundId(roundId); - db.setEndTime(now); - db.setUpdateTime(now); - - boolean succeed = updateById(db); - if (succeed){ - actInfoCache.delete(); - } - return succeed; - } - - @Override - public boolean updateDrawResult(String roundId, Integer drawMode, String drawName, List<LuckySeaItem> itemList, Date showResultStageStartTime, Double ticket) { - LuckySeaActInfo db = new LuckySeaActInfo(); - db.setRoundId(roundId); - - List<LuckySeaDrawItem> drawItemList = itemList.stream().map(item->{ - LuckySeaDrawItem drawItem = new LuckySeaDrawItem(); - drawItem.setDrawId(item.getId()); - drawItem.setDrawMultiple(item.getMultiple()); - drawItem.setDrawName(item.getName()); - drawItem.setDrawImageUrl(item.getImgUrl()); - return drawItem; - }).sorted(Comparator.comparing(LuckySeaDrawItem::getDrawMultiple).thenComparing(LuckySeaDrawItem::getDrawId)) - .collect(Collectors.toList()); - db.setDrawItemList(drawItemList); - - db.setStatus(Constant.LuckySeaActStatus.DRAW_OVER); - db.setShowResultStageStartTime(showResultStageStartTime); - db.setTicket(ticket); - db.setDrawMode(drawMode); - db.setDrawName(drawName); - db.setUpdateTime(new Date()); - - boolean succeed = updateById(db); - if (succeed){ - actInfoCache.delete(); - } - return succeed; - } - - @Override - public LuckySeaActInfo getByCurrTime() { - LuckySeaActInfo actInfo = actInfoCache.get(); - if (null != actInfo){ - return actInfo; - } - - QueryWrapper<LuckySeaActInfo> wrapper = new QueryWrapper<>(); - wrapper.lambda().orderByDesc(LuckySeaActInfo::getRoundId); - wrapper.last("limit 1"); - actInfo = getOne(wrapper); - if (null != actInfo){ - actInfoCache.set(actInfo, CACHE_EXPIRE_SECOND, TimeUnit.SECONDS); - } - - return actInfo; - } - - @Override - public List<LuckySeaActInfo> listActInfo(String roundId, Integer count) { - String cacheKey = RedisKey.lucky_sea_act_info.getKey(String.valueOf(count), roundId); - RBucket<String> cacheVal = redissonClient.getBucket(cacheKey); - if (cacheVal.isExists()){ - return JSON.parseArray(cacheVal.get(), LuckySeaActInfo.class); - } - - QueryWrapper<LuckySeaActInfo> wrapper = new QueryWrapper<>(); - wrapper.lambda() - .lt(LuckySeaActInfo::getRoundId, roundId) - .eq(LuckySeaActInfo::getStatus, Constant.LuckySeaActStatus.DRAW_OVER) - .orderByDesc(LuckySeaActInfo::getRoundId); - wrapper.last(String.format("limit %d", count)); - List<LuckySeaActInfo> actList = list(wrapper); - cacheVal.set(JSON.toJSONString(actList), CACHE_EXPIRE_SECOND, TimeUnit.SECONDS); - return actList; - } - - @Override - public void afterPropertiesSet() throws Exception { - actInfoCache = redissonClient.getBucket(RedisKey.lucky_sea_act_info.getKey()); - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaDrawServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaDrawServiceImpl.java deleted file mode 100644 index e6e49284c..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaDrawServiceImpl.java +++ /dev/null @@ -1,368 +0,0 @@ -package com.accompany.business.service.activities.luckySea.impl; - -import com.accompany.business.event.LuckySeaDrawMessageEvent; -import com.accompany.business.message.LuckySeaDrawMessage; -import com.accompany.business.model.activity.luckysea.LuckySeaActInfo; -import com.accompany.business.model.activity.luckysea.LuckySeaItem; -import com.accompany.business.model.activity.luckysea.LuckySeaItemGroup; -import com.accompany.business.model.activity.luckysea.LuckySeaUserDrawRecord; -import com.accompany.business.service.activities.luckySea.*; -import com.accompany.business.service.purse.UserPurseService; -import com.accompany.business.service.record.BillRecordService; -import com.accompany.business.service.room.UserInOutRoomRecordService; -import com.accompany.common.constant.Constant; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.RandomUtil; -import com.accompany.common.utils.StringUtils; -import com.accompany.core.enumeration.BillObjTypeEnum; -import com.accompany.core.exception.ServiceException; -import com.alibaba.fastjson.JSON; -import lombok.extern.slf4j.Slf4j; -import org.redisson.api.RAtomicLong; -import org.redisson.api.RLock; -import org.redisson.api.RedissonClient; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; - -import java.math.BigDecimal; -import java.util.*; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; - -@Service -@Slf4j -public class LuckySeaDrawServiceImpl implements LuckySeaDrawService { - - @Autowired - private RedissonClient redissonClient; - @Autowired - private LuckySeaActInfoService actInfoService; - @Autowired - private LuckySeaItemService itemService; - @Autowired - private LuckySeaUserDrawRecordService drawRecordService; - @Autowired - private UserPurseService userPurseService; - @Autowired - private BillRecordService billRecordService; - @Autowired - private UserInOutRoomRecordService userInOutRoomRecordService; - @Autowired - private ApplicationContext applicationContext; - @Autowired - private LuckySeaStockService stockService; - - @Override - @Transactional(rollbackFor = Exception.class) - public void userDraw(Long uid, Long itemId, Long num) { - String roundId = null; - boolean locked = false; - RLock lock = redissonClient.getLock(RedisKey.LOCK_LUCKY_SEA_USER_DRAW.getKey(uid.toString())); - try { - locked = lock.tryLock(5L, TimeUnit.SECONDS); - if (!locked) { - log.error("[春日游园] 获取分布式锁失败，uid:{}", uid); - throw new ServiceException(BusiStatus.JOIN_GAME_USER_TOO_MORE); - } - - LuckySeaItem item = itemService.getItemById(itemId); - if (null == item || !item.getStatus().equals(Constant.status.valid)) { - log.error("选择的配置不存在, itemId：" + item); - throw new ServiceException(BusiStatus.THE_SELECTED_CONFIGURATION_DOES_NOT_EXIST); - } - - Date now = new Date(); - LuckySeaActInfo actInfo = actInfoService.getByCurrTime(); - if (actInfo == null || !Constant.LuckySeaActStatus.CHOOSE_STAGE.equals(actInfo.getStatus()) - || now.compareTo(actInfo.getDrawStageStartTime()) >= 0) { - log.error("选择失败，当前时段不存在活动。actInfo:" + JSON.toJSONString(actInfo)); - throw new ServiceException(BusiStatus.SELECTION_FAILED_CURRENTLY_NOT_IN_THE_SELECTION_STAGE); - } - - userPurseService.subDiamond(uid, num.doubleValue(), BillObjTypeEnum.ACTIVITY_LUCKY_SEA_DRAW); - - log.info("[春日游园] uid {} 消耗钻石总数 {}", uid, num); - - RAtomicLong atomic = redissonClient.getAtomicLong(RedisKey.lucky_sea_curr_write_data_user_count.getKey(actInfo.getRoundId())); - atomic.incrementAndGet(); - roundId = actInfo.getRoundId(); - - Long roomUid = userInOutRoomRecordService.getUserCurrentRoomUid(uid); - if (!drawRecordService.updateUserDrawRecord(uid, roomUid, roundId, item, num)){ - throw new ServiceException(BusiStatus.SERVERBUSY); - } - - LuckySeaDrawMessage message = new LuckySeaDrawMessage(uid, roomUid, roundId, itemId, num, now); - applicationContext.publishEvent(new LuckySeaDrawMessageEvent(message)); - - } catch (InterruptedException e) { - throw new ServiceException(BusiStatus.SERVERBUSY); - } finally { - if (StringUtils.isNoneBlank(roundId)){ - RAtomicLong atomic = redissonClient.getAtomicLong(RedisKey.lucky_sea_curr_write_data_user_count.getKey(roundId)); - atomic.decrementAndGet(); - } - if (locked){ - lock.unlock(); - } - } - } - - @Override - public Integer getDrawMode(int drawMode, int uv) { - if (uv < 1){ - log.info("春日游园活动,只有一个uv, 模式 {}", 1); - return 1; - } - int randomIndex = RandomUtil.randomByRange(0, uv); - if (randomIndex < 1){ - log.info("春日游园活动,随机数 {} , 小于 1uv 模式 {}", randomIndex, 1); - return 1; - } - log.info("春日游园活动,随机数 {} , 大于 1uv 原配置模式 {}", randomIndex, drawMode); - return drawMode; - } - - /** - * 处理开奖 - * - * @param drawMode - * @param itemList - * @param itemGroupList - * @param stock - * @return 开奖的itemId - */ - @Override - public List<LuckySeaItem> handleDrawPrize(Integer drawMode, List<LuckySeaUserDrawRecord> recordList, - List<LuckySeaItem> itemList, - List<LuckySeaItemGroup> itemGroupList, - BigDecimal stock) { - - //id : List<Item> - Map<Long, List<LuckySeaItem>> itemMap = itemList.stream().collect(Collectors.toMap(LuckySeaItem::getId, Collections::singletonList)); - itemMap.putAll(itemGroupList.stream().collect(Collectors.toMap(LuckySeaItemGroup::getId, - g->itemList.stream().filter(i->g.getItemIds().contains(i.getId())) - .collect(Collectors.toList())))); - - //itemId : List<itemId or groupId> - Map<Long, List<Long>> idListMap = itemList.stream().collect(Collectors.toMap(LuckySeaItem::getId, i->{ - List<Long> ids = new ArrayList<>(); - ids.add(i.getId()); - return ids; - })); - for (LuckySeaItemGroup group : itemGroupList){ - for (Long itemId : group.getItemIds()){ - List<Long> ids = idListMap.get(itemId); - ids.add(group.getId()); - } - } - - //itemId or groupId: prize - Map<Long, BigDecimal> itemPrizeMap = itemMap.keySet().stream().collect(Collectors.toMap(e->e, e->BigDecimal.ZERO)); - - //itemId or groupId: uidList - Map<Long, Set<Long>> itemUvMap = itemMap.keySet().stream().collect(Collectors.toMap(e->e, e->new HashSet<>())); - - for (LuckySeaUserDrawRecord e : recordList) { - List<Long> idList = idListMap.get(e.getItemId()); - for (Long id: idList){ - BigDecimal old = itemPrizeMap.get(id); - BigDecimal t = BigDecimal.valueOf(e.getCostPriceNum() * e.getItemMultiple()); - itemPrizeMap.put(id, old.add(t)); - - Set<Long> uidList = itemUvMap.get(id); - uidList.add(e.getUid()); - } - } - - Map<Long, Integer> userNumMap = itemUvMap.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, e->e.getValue().size())); - - Map<Long, BigDecimal> lessThanStockItemMap = itemPrizeMap.entrySet().stream() - .filter(entry->stock.compareTo(entry.getValue()) > 0) - .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); - - Long drawId = !CollectionUtils.isEmpty(lessThanStockItemMap)? - drawFromLess(drawMode, lessThanStockItemMap, userNumMap, itemMap): - drawFromLarget(itemPrizeMap); - - List<LuckySeaItem> drawItems = itemMap.get(drawId); - // 更新库存 - BigDecimal prizePiece = itemPrizeMap.get(drawId); - BigDecimal afterStock = stockService.subStock(prizePiece); - log.info("春日游园活动, drawId: {}, prizePiece: {}, afterStock: {}, itemList: {} ", - drawId, prizePiece, afterStock, JSON.toJSONString(drawItems)); - - return drawItems; - } - - private Long drawFromLess(Integer drawMode, - Map<Long, BigDecimal> lessThanStockItemMap, - Map<Long, Integer> userAllNumMap, - Map<Long, List<LuckySeaItem>> itemMap) { - log.info("春日游园活动, 存在小于库存的条件组, lessThanStockItemId: {}", JSON.toJSONString(lessThanStockItemMap)); - - Map<Long, Integer> userNumMap = lessThanStockItemMap.keySet().stream().filter(userAllNumMap::containsKey) - .collect(Collectors.toMap(id->id, id->userAllNumMap.getOrDefault(id, 0))); - //没人玩直接模式1 - if (CollectionUtils.isEmpty(userNumMap)){ - log.info("春日游园活动, 模式 {}, 但没人参与，直接模式1", drawMode); - return random(lessThanStockItemMap); - } - - if (4 == drawMode){ - //消耗库存最多的-》uv最多的 - List<Long> idList = new ArrayList<>(); - - Map<Long, BigDecimal> itemPriceMap = lessThanStockItemMap.entrySet().stream() - .filter(e->itemMap.get(e.getKey()).size() <= 1) - .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); - if (!CollectionUtils.isEmpty(itemPriceMap)){ - Long itemId = drawByPrizeAndUv(itemPriceMap, userNumMap); - log.info("春日游园活动, 模式 4, 单项选出 {} ", itemId); - idList.add(itemId); - } - - Map<Long, BigDecimal> groupPriceMap = lessThanStockItemMap.entrySet().stream() - .filter(e->itemMap.get(e.getKey()).size() > 1) - .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); - if (!CollectionUtils.isEmpty(groupPriceMap)){ - Long groupId = drawByPrizeAndUv(groupPriceMap, userNumMap); - log.info("春日游园活动, 模式 4, 组合选出 {} ", groupId); - idList.add(groupId); - } - - if (!CollectionUtils.isEmpty(idList)){ - Collections.shuffle(idList); - return idList.get(0); - } - - log.info("春日游园活动, 模式 4, 单项和组合选出都为空, 回到模式 1 随机保底"); - - } else if (3 == drawMode) { - //uv最多的-》 消耗库存最多 - List<Long> idList = new ArrayList<>(); - - Map<Long, Integer> itemUvMap = userNumMap.entrySet().stream() - .filter(e->itemMap.get(e.getKey()).size() <= 1) - .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); - if (!CollectionUtils.isEmpty(itemUvMap)){ - Long itemId = drawByUvAndPrize(lessThanStockItemMap, itemUvMap); - log.info("春日游园活动, 模式 3, 单项选出 {} ", itemId); - idList.add(itemId); - } - - Map<Long, Integer> groupUvMap = userNumMap.entrySet().stream() - .filter(e->itemMap.get(e.getKey()).size() > 1) - .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); - if (!CollectionUtils.isEmpty(groupUvMap)){ - Long groupId = drawByUvAndPrize(lessThanStockItemMap, groupUvMap); - log.info("春日游园活动, 模式 3, 组合选出 {} ", groupId); - idList.add(groupId); - } - - if (!CollectionUtils.isEmpty(idList)){ - Collections.shuffle(idList); - return idList.get(0); - } - - log.info("春日游园活动, 模式 3, 单项和组合选出都为空, 回到模式 1 随机保底"); - - } else if (2 == drawMode) { - List<Long> keyList = lessThanStockItemMap.entrySet().stream().filter(entry->BigDecimal.ZERO.compareTo(entry.getValue()) < 0) - .map(Map.Entry::getKey) - .collect(Collectors.toList()); - if (CollectionUtils.isEmpty(keyList)){ - keyList = new ArrayList<>(lessThanStockItemMap.keySet()); - } - - int randomIndex = RandomUtil.randomByRange(0, keyList.size()); - return keyList.get(randomIndex); - - } - - // 保底模式1随便开 - return random(lessThanStockItemMap); - } - - private Long drawByPrizeAndUv(Map<Long, BigDecimal> itemPrizeMap, - Map<Long, Integer> userNumMap){ - BigDecimal maxOutput = itemPrizeMap.values().stream().max(BigDecimal::compareTo).orElse(BigDecimal.ZERO); - List<Long> maxOutputIdList = itemPrizeMap.entrySet().stream() - .filter(entry->maxOutput.compareTo(entry.getValue()) == 0) - .map(Map.Entry::getKey) - .collect(Collectors.toList()); - if (maxOutputIdList.size() == 1){ - log.info("春日游园活动, 模式 4, 最大产出 {}, 只有一个符合 {}", maxOutput, JSON.toJSONString(maxOutputIdList)); - return maxOutputIdList.get(0); - } - - Integer maxNum = maxOutputIdList.stream().mapToInt(id->userNumMap.getOrDefault(id,0)).max().getAsInt(); - - List<Long> maxNumIdList = userNumMap.entrySet().stream() - .filter(entry->maxOutputIdList.contains(entry.getKey())) - .filter(entry->maxNum.compareTo(entry.getValue()) == 0) - .map(Map.Entry::getKey).collect(Collectors.toList()); - - int randomIndex = RandomUtil.randomByRange(0, maxNumIdList.size()); - Long id = maxNumIdList.get(randomIndex); - - log.info("春日游园活动, 模式 4, 最大产出 {}, 最大uv {}, 选出 {}, 符合条件 {}", maxOutput, maxNum, id, JSON.toJSONString(maxNumIdList)); - - return id; - } - - private Long drawByUvAndPrize(Map<Long, BigDecimal> itemPrizeMap, - Map<Long, Integer> userNumMap){ - //uv最多的-》 消耗库存最多 - Integer maxNum = userNumMap.values().stream().max(Integer::compareTo).orElse(0); - List<Long> maxNumIdList = userNumMap.entrySet().stream() - .filter(entry->maxNum.compareTo(entry.getValue()) == 0) - .map(Map.Entry::getKey) - .collect(Collectors.toList()); - - if (maxNumIdList.size() == 1){ - log.info("春日游园活动, 模式 3, 最大uv {}, 只有一个符合 {}", maxNum, JSON.toJSONString(maxNumIdList)); - return maxNumIdList.get(0); - } - - BigDecimal maxInput = maxNumIdList.stream().map(id->itemPrizeMap.getOrDefault(id, BigDecimal.ZERO)) - .max(BigDecimal::compareTo).orElse(BigDecimal.ZERO); - - List<Long> maxInputIdList = itemPrizeMap.entrySet().stream() - .filter(entry->maxNumIdList.contains(entry.getKey())) - .filter(entry->maxInput.compareTo(entry.getValue()) == 0) - .map(Map.Entry::getKey) - .collect(Collectors.toList()); - - int randomIndex = RandomUtil.randomByRange(0, maxInputIdList.size()); - Long id = maxInputIdList.get(randomIndex); - - log.info("春日游园活动, 模式 3, 最大uv {}, 最大产出 {}, 选出 {}, 符合条件 {}", maxNum, maxInput, id, JSON.toJSONString(maxInputIdList)); - - return id; - } - - private long random(Map<Long, BigDecimal> lessThanStockItemMap){ - // 保底模式1随便开 - List<Long> keyList = new ArrayList<>(lessThanStockItemMap.keySet()); - int randomIndex = RandomUtil.randomByRange(0, keyList.size()); - return keyList.get(randomIndex); - } - - private Long drawFromLarget(Map<Long, BigDecimal> drawMap) { - // 将map进行排序，最小的放在map首位 - BigDecimal minUserInput = drawMap.values().stream().min(BigDecimal::compareTo).orElse(BigDecimal.ZERO); - List<Long> keys = drawMap.entrySet().stream().filter(o -> o.getValue().compareTo(minUserInput) == 0) - .map(Map.Entry::getKey) - .sorted() - .collect(Collectors.toList()); - log.info("春日游园活动, 没有小于库存的条件组, 满足最小用户投入的itemIdList: {}", JSON.toJSONString(keys)); - int index = RandomUtil.randomByRange(0, keys.size()); - return keys.get(index); - } - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaItemGroupServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaItemGroupServiceImpl.java deleted file mode 100644 index 3dc6e61fe..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaItemGroupServiceImpl.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.accompany.business.service.activities.luckySea.impl; - -import com.accompany.business.model.activity.luckysea.LuckySeaItemGroup; -import com.accompany.business.mybatismapper.activity.LuckySeaItemGroupMapper; -import com.accompany.business.service.activities.luckySea.LuckySeaItemGroupService; -import com.accompany.common.constant.Constant; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * <br>类描述: - * <br>功能详细描述: - * - * @author H1 - * @date [2020/12/31] - */ -@Service -@Slf4j -public class LuckySeaItemGroupServiceImpl extends ServiceImpl<LuckySeaItemGroupMapper, LuckySeaItemGroup> implements LuckySeaItemGroupService { - - @Override - public List<LuckySeaItemGroup> listItemGroup() { - QueryWrapper<LuckySeaItemGroup> wrapper = new QueryWrapper<>(); - wrapper.lambda().eq(LuckySeaItemGroup::getStatus, Constant.status.valid); - return list(wrapper); - } - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaItemServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaItemServiceImpl.java deleted file mode 100644 index 23c2aa2c4..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaItemServiceImpl.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.accompany.business.service.activities.luckySea.impl; - -import com.accompany.business.model.activity.luckysea.LuckySeaItem; -import com.accompany.business.mybatismapper.activity.LuckySeaItemMapper; -import com.accompany.business.service.activities.luckySea.LuckySeaItemService; -import com.accompany.common.constant.Constant; -import com.accompany.common.redis.RedisKey; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.extern.slf4j.Slf4j; -import org.redisson.api.RMap; -import org.redisson.api.RedissonClient; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.util.Collection; -import java.util.Comparator; -import java.util.List; -import java.util.Optional; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; - -/** - * <br>类描述: - * <br>功能详细描述: - * - * @author H1 - * @date [2020/12/31] - */ -@Service -@Slf4j -public class LuckySeaItemServiceImpl extends ServiceImpl<LuckySeaItemMapper, LuckySeaItem> implements LuckySeaItemService, InitializingBean { - - @Autowired - private RedissonClient redissonClient; - private RMap<Long, LuckySeaItem> cacheMap; - private final static Integer CACHE_EXPIRE_SECOND = 3; - - @Override - public LuckySeaItem getItemById(Long itemId) { - LuckySeaItem item = cacheMap.get(itemId); - if (null != item){ - return item; - } - - List<LuckySeaItem> dbList = listItemFromDB(); - if (CollectionUtils.isEmpty(dbList)){ - return item; - } - - Optional<LuckySeaItem> optional = dbList.stream().filter(e->itemId.equals(e.getId())).findAny(); - if (optional.isPresent()){ - item = optional.get(); - } - - return item; - } - - @Override - public List<LuckySeaItem> listItem() { - Collection<LuckySeaItem> cacheList = cacheMap.values(); - if (!CollectionUtils.isEmpty(cacheList)){ - return cacheList.stream() - .sorted(Comparator.comparing(LuckySeaItem::getMultiple) - .thenComparing(LuckySeaItem::getId)) - .collect(Collectors.toList()); - } - return listItemFromDB(); - } - - @Override - public List<LuckySeaItem> listItemFromDB() { - QueryWrapper<LuckySeaItem> wrapper = new QueryWrapper<>(); - wrapper.lambda().eq(LuckySeaItem::getStatus, Constant.status.valid); - List<LuckySeaItem> itemList = list(wrapper); - cacheMap.putAll(itemList.stream().collect(Collectors.toMap(LuckySeaItem::getId, e->e))); - cacheMap.expire(CACHE_EXPIRE_SECOND, TimeUnit.SECONDS); - return itemList; - } - - @Override - public void afterPropertiesSet() throws Exception { - cacheMap = redissonClient.getMap(RedisKey.lucky_sea_item.getKey()); - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaPushMsgService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaPushMsgService.java deleted file mode 100644 index 71919e61c..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaPushMsgService.java +++ /dev/null @@ -1,162 +0,0 @@ -package com.accompany.business.service.activities.luckySea.impl; - -import com.accompany.business.enums.message.ContentTypeEnum; -import com.accompany.business.enums.message.ResourceTypeEnum; -import com.accompany.business.model.activity.luckysea.LuckySeaRoomTipConfig; -import com.accompany.business.model.activity.luckysea.LuckySeaUserDrawRecord; -import com.accompany.business.service.SendSysMsgService; -import com.accompany.business.service.room.RoomService; -import com.accompany.business.service.user.UsersService; -import com.accompany.business.vo.message.BaseSpan; -import com.accompany.business.vo.message.FloatingMessageTemplate; -import com.accompany.business.vo.message.MessageTemplate; -import com.accompany.business.vo.message.TextSpan; -import com.accompany.common.constant.Constant; -import com.accompany.core.enumeration.I18nAlertEnum; -import com.accompany.core.model.Room; -import com.accompany.core.model.Users; -import com.accompany.core.service.SysConfService; -import com.accompany.core.util.I18NMessageSourceUtil; -import com.alibaba.fastjson.JSON; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; -import org.springframework.util.StringUtils; - -import java.util.*; -import java.util.stream.Collectors; - -@Service -@Slf4j -public class LuckySeaPushMsgService { - - @Autowired - private SysConfService sysConfService; - @Autowired - private UsersService usersService; - @Autowired - private SendSysMsgService sendSysMsgService; - @Autowired - private RoomService roomService; - - /** - * 异步飘屏 - * - * @param drawUserRecordList - */ - @Async - public void sendChatRoomTipAsync(List<LuckySeaUserDrawRecord> drawUserRecordList) { - LuckySeaRoomTipConfig roomTipConfig = JSON.parseObject(sysConfService.getDefaultSysConfValueById(Constant.SysConfId.LUCKY_SEA_ROOM_TIP_CONFIG, "{}"), LuckySeaRoomTipConfig.class); - if (roomTipConfig.isClose() || CollectionUtils.isEmpty(drawUserRecordList)) { - return; - } - - Map<Long, List<LuckySeaUserDrawRecord>> uidDrawIdMap = drawUserRecordList.stream() - .filter(record -> roomTipConfig.needTip(record.getItemMultiple() * record.getCostPriceNum())) - .sorted(Comparator.comparing(record -> record.getItemMultiple() * record.getCostPriceNum())) - .collect(Collectors.groupingBy(LuckySeaUserDrawRecord::getUid)); - if (CollectionUtils.isEmpty(uidDrawIdMap)) { - return; - } - - List<Long> uids = uidDrawIdMap.keySet().stream().distinct().collect(Collectors.toList()); - Map<Long, String> nickMap = usersService.getUsersListByUids(uids).stream().collect(Collectors.toMap(Users::getUid, Users::getNick)); - for (Map.Entry<Long, List<LuckySeaUserDrawRecord>> entry : uidDrawIdMap.entrySet()) { - List<LuckySeaUserDrawRecord> recordList = entry.getValue(); - for (LuckySeaUserDrawRecord record : recordList) { - String nick = nickMap.get(record.getUid()); - if (!StringUtils.hasText(nick)) { - continue; - } - - long goldNum = record.getItemMultiple() * record.getCostPriceNum(); - - sendChatScreenTip(nick, goldNum, roomTipConfig, record.getRoomUid()); - - sendFloatingScreenTip(record, nick, goldNum, roomTipConfig); - } - } - } - - private void sendFloatingScreenTip(LuckySeaUserDrawRecord record, String nick, long goldNum, LuckySeaRoomTipConfig roomTipConfig) { - Room room = null != record.getRoomUid() ? roomService.getRoomByUid(record.getRoomUid()) : null; - boolean needSpecialFloating = roomTipConfig.needAllServerTip(goldNum); - FloatingMessageTemplate message = new FloatingMessageTemplate(); - message.setResourceType(needSpecialFloating ? ResourceTypeEnum.SVGA.name() : ResourceTypeEnum.IMAGE.name()); - message.setResourceContent(needSpecialFloating ? roomTipConfig.getSpecialFloatUrl() : roomTipConfig.getNormalFloatUrl()); - message.setResourceTop(23); - message.setResourceWidth(375); - message.setResourceHeight(60); - message.setTemplate(I18NMessageSourceUtil.getMessageMap(I18nAlertEnum.LUCKY_SEA_FLOATING_MSG.getI18nId(), new Object[]{"nick", "rate", "goldNum"})); - TextSpan nickSpan = new TextSpan(); - nickSpan.setKey("nick"); - nickSpan.setZh(nick); - nickSpan.setTextColor("#FEF23E"); - message.addSpan(nickSpan); - TextSpan rateSpan = new TextSpan(); - rateSpan.setKey("rate"); - rateSpan.setMessage(String.valueOf(record.getItemMultiple())); - rateSpan.setTextColor("#00EAFF"); - message.addSpan(rateSpan); - TextSpan goldNumSpan = new TextSpan(); - goldNumSpan.setKey("goldNum"); - goldNumSpan.setMessage(String.valueOf(goldNum)); - goldNumSpan.setTextColor("#00EAFF"); - message.addSpan(goldNumSpan); - message.setUidList(Arrays.asList(record.getUid())); - if (room != null) { - message.setPartitionId(room.getPartitionId()); - message.setRoomUid(room.getUid()); - } - if (roomTipConfig.needAllServerTip(goldNum)) { - sendSysMsgService.sendFloatingMessageForBroadcast(message); - } else if (roomTipConfig.needAllRoomTip(goldNum)) { - sendSysMsgService.sendFloatingMessageForRoom(message); - } else if (roomTipConfig.needSingleRoomTip(goldNum) && null != room) { - sendSysMsgService.sendFloatingMessageForRoom(room, message); - } - } - - private void sendChatScreenTip(String nick, long goldNum, LuckySeaRoomTipConfig roomTipConfig, Long roomUid) { - Map<String, String> messageMap = I18NMessageSourceUtil.getMessageMap(I18nAlertEnum.LUCKY_SEA_SCREEN.getI18nId(), new Object[]{"nick", "goldNum"}, I18nAlertEnum.LUCKY_SEA_SCREEN.getDefaultStr()); - MessageTemplate messageTemplate = new MessageTemplate(); - messageTemplate.setTemplate(messageMap); - List<BaseSpan> contentList = new ArrayList<>(); - messageTemplate.setContents(contentList); - TextSpan nickSpan = new TextSpan(); - nickSpan.setType(ContentTypeEnum.TEXT.name()); - nickSpan.setKey("nick"); - Map<String, String> nickT = new HashMap<>(); - nickT.put("zh", nick); - nickT.put("ar", nick); - nickT.put("en", nick); - nickSpan.setText(nickT); - nickSpan.setTextColor("#FFBC51"); - contentList.add(nickSpan); - TextSpan goldNumSpan = new TextSpan(); - goldNumSpan.setType(ContentTypeEnum.TEXT.name()); - goldNumSpan.setKey("goldNum"); - Map<String, String> goldNumT = new HashMap<>(); - goldNumT.put("zh", String.valueOf(goldNum)); - goldNumT.put("ar", String.valueOf(goldNum)); - goldNumT.put("en", String.valueOf(goldNum)); - goldNumSpan.setText(goldNumT); - goldNumSpan.setTextColor("#FFBC51"); - contentList.add(goldNumSpan); - Room room = roomService.getRoomByUid(roomUid); - if (room != null) { - messageTemplate.setPartitionId(room.getPartitionId()); - } - if (roomTipConfig.needAllServerTip(goldNum) || roomTipConfig.needAllRoomTip(goldNum)) { - sendSysMsgService.sendTemplateMessage(messageTemplate); - } else if (roomTipConfig.needSingleRoomTip(goldNum) - && null != roomUid) { - if (null != room) { - sendSysMsgService.sendTemplateMessage(room.getRoomId(), room.getUid(), messageTemplate); - } - } - } - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaRankServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaRankServiceImpl.java deleted file mode 100644 index 178d8fe71..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaRankServiceImpl.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.accompany.business.service.activities.luckySea.impl; - -import com.accompany.business.mybatismapper.activity.LuckySeaActMapper; -import com.accompany.business.service.activities.luckySea.LuckySeaRankService; -import com.accompany.business.service.activities.vo.LuckySeaRankListVo; -import com.accompany.business.service.activities.vo.LuckySeaRankVo; -import com.accompany.business.service.user.UsersService; -import com.accompany.common.constant.Constant; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.model.Users; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -@Service -@Slf4j -public class LuckySeaRankServiceImpl implements LuckySeaRankService { - - @Autowired - private UsersService usersService; - @Autowired - private LuckySeaActMapper luckySeaActMapper; - - @Override - public LuckySeaRankVo listRank(Integer type, Integer page, Integer pageSize, Long uid) { - LuckySeaRankVo vo = new LuckySeaRankVo(); - List<LuckySeaRankListVo> rankList = null; - LuckySeaRankListVo userRankInfo = null; - - Date now = new Date(); - Date beginTimeOfDay = DateTimeUtil.getBeginTimeOfDay(now); - Date endTimeOfDay = DateTimeUtil.getEndTimeOfDay(now); - - int start = (page - 1) * pageSize; - if (type.equals(Constant.LuckySeaRankType.DIAMOND_RANK)) { - rankList = luckySeaActMapper.listDiamondRank(start, pageSize, beginTimeOfDay, endTimeOfDay); - userRankInfo = luckySeaActMapper.listUserDiamondRank(uid, beginTimeOfDay, endTimeOfDay); - } else if (type.equals(Constant.LuckySeaRankType.LUCKY_MAN_RANK)) { - rankList = luckySeaActMapper.listLuckyManRank(start, pageSize, beginTimeOfDay, endTimeOfDay); - userRankInfo = luckySeaActMapper.listUserLuckyManRank(uid, beginTimeOfDay, endTimeOfDay); - } - - if (null == rankList){ - rankList = new ArrayList<>(); - } - - if (null == userRankInfo){ - userRankInfo = new LuckySeaRankListVo(); - userRankInfo.setUid(uid); - userRankInfo.setNum(0d); - } - - vo.setRankList(rankList); - vo.setMyRankInfo(userRankInfo); - - List<LuckySeaRankListVo> all = new ArrayList<>(rankList); - all.add(userRankInfo); - List<Long> uids = all.stream().map(LuckySeaRankListVo::getUid).distinct().collect(Collectors.toList()); - Map<Long, Users> usersMap = usersService.getUsersMapByUids(uids); - for (LuckySeaRankListVo e: all){ - Users u = usersMap.get(e.getUid()); - if (null == u){ - continue; - } - e.setErbanNo(u.getErbanNo()); - e.setNick(u.getNick()); - e.setAvatar(u.getAvatar()); - } - - return vo; - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaSettlementServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaSettlementServiceImpl.java deleted file mode 100644 index 815f9b0d4..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaSettlementServiceImpl.java +++ /dev/null @@ -1,171 +0,0 @@ -package com.accompany.business.service.activities.luckySea.impl; - -import com.accompany.business.dto.activity.luckysea.LuckySeaUserDrawResultDto; -import com.accompany.business.model.activity.luckysea.LuckySeaDrawItem; -import com.accompany.business.model.activity.luckysea.LuckySeaItem; -import com.accompany.business.model.activity.luckysea.LuckySeaUserDrawRecord; -import com.accompany.business.model.activity.luckysea.LuckySeaUserDrawResult; -import com.accompany.business.service.activities.luckySea.LuckySeaSettlementService; -import com.accompany.business.service.activities.luckySea.LuckySeaUserDrawRecordService; -import com.accompany.business.service.activities.luckySea.LuckySeaUserDrawResultService; -import com.accompany.business.service.purse.UserPurseService; -import com.accompany.business.service.record.BillRecordService; -import com.accompany.common.constant.Constant; -import com.accompany.core.enumeration.BillObjTypeEnum; -import com.accompany.core.util.DoubleUtil; -import com.alibaba.fastjson.JSON; -import lombok.extern.slf4j.Slf4j; -import org.redisson.api.RMap; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.util.*; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; - -@Service -@Slf4j -public class LuckySeaSettlementServiceImpl implements LuckySeaSettlementService { - - @Autowired - private LuckySeaUserDrawRecordService drawRecordService; - @Autowired - private LuckySeaUserDrawResultService resultService; - @Autowired - private UserPurseService userPurseService; - @Autowired - private BillRecordService billRecordService; - @Autowired - private LuckySeaPushMsgService pushMsgService; - - @Async - @Override - public void sendReward(String roundId) { - // 获取轮次下中奖的用户列表 - List<LuckySeaUserDrawRecord> drawUserRecordList = drawRecordService.listRecordByRoundId(roundId, Constant.LuckySeaUserStatus.WIN); - if (CollectionUtils.isEmpty(drawUserRecordList)){ - log.info("春日游园活动, 该轮没人中奖, roundId:{} ", roundId); - return; - } - - Map<Long, Double> uidDiamonsMap = drawUserRecordList.stream().collect(Collectors.groupingBy(LuckySeaUserDrawRecord::getUid, - Collectors.summingDouble(r-> r.getCostPriceNum() * r.getItemMultiple()))); - log.info("春日游园活动, 开始分发钻石奖励, roundId:{} 分发用户:{} 中奖记录:{}", roundId, uidDiamonsMap, JSON.toJSONString(drawUserRecordList)); - - RMap<Long, Double> cacheMap = drawRecordService.getTodayDiamondIncomCacheMap(); - Map<Long,Double> userCacheMap = cacheMap.getAll(uidDiamonsMap.keySet()); - - // 奖励用户对应钻石 - for (Map.Entry<Long, Double> record : uidDiamonsMap.entrySet()) { - long uid = record.getKey(); - double diamondsNum = record.getValue(); - log.info("春日游园活动, 开始分发钻石奖励。 uid：{}， diamondsNum:{}", uid, diamondsNum); - userPurseService.addDiamond(uid, diamondsNum, BillObjTypeEnum.ACTIVITY_LUCKY_SEA_DIAMOND_IN, - (userPurse -> billRecordService.insertGeneralBillRecord(uid, roundId, BillObjTypeEnum.ACTIVITY_LUCKY_SEA_DIAMOND_IN, diamondsNum, userPurse))); - double todayDiamondIncome = DoubleUtil.add(userCacheMap.getOrDefault(uid, 0D), diamondsNum); - userCacheMap.put(uid, todayDiamondIncome); - log.info("春日游园活动, 结束分发钻石奖励。 uid：{}， diamondsNum:{}, todayDiamondIncome: {}", - uid, diamondsNum, todayDiamondIncome); - } - - cacheMap.putAll(userCacheMap); - cacheMap.expire(1, TimeUnit.DAYS); - - pushMsgService.sendChatRoomTipAsync(drawUserRecordList); - } - - @Async - @Override - public void addUserDrawResult(String roundId, List<LuckySeaItem> itemList, List<LuckySeaItem> drawItems) { - List<LuckySeaUserDrawRecord> drawUserRecordList = drawRecordService.listRecordByRoundId(roundId, null); - if (CollectionUtils.isEmpty(drawUserRecordList)){ - return; - } - - Map<Long, Byte> userDrawStatusMap = new HashMap<>(drawUserRecordList.size()); - Map<Long, List<LuckySeaUserDrawRecord>> userDrawRecordMap = new HashMap<>(drawUserRecordList.size()); - for (LuckySeaUserDrawRecord record : drawUserRecordList) { - Byte drawStatus = userDrawStatusMap.get(record.getUid()); - if (null == drawStatus || drawStatus > record.getDrawStatus()){ - userDrawStatusMap.put(record.getUid(), record.getDrawStatus()); - } - - List<LuckySeaUserDrawRecord> userDrawRecord = userDrawRecordMap.get(record.getUid()); - if (CollectionUtils.isEmpty(userDrawRecord)) { - userDrawRecord = new ArrayList<>(); - userDrawRecordMap.put(record.getUid(), userDrawRecord); - } - userDrawRecord.add(record); - } - - Date now = new Date(); - Map<Long, Map<Long, LuckySeaUserDrawResultDto>> userDrawResultMap = initUserDrawResultMap(userDrawRecordMap, itemList); - List<LuckySeaUserDrawResult> results = new ArrayList<>(); - for (Long uid : userDrawResultMap.keySet()) { - Map<Long, LuckySeaUserDrawResultDto> resultDtoMap = userDrawResultMap.get(uid); - List<LuckySeaUserDrawResultDto> resultDtoList = resultDtoMap.values().stream() - .sorted(Comparator.comparing(LuckySeaUserDrawResultDto::getMultiple).thenComparing(LuckySeaUserDrawResultDto::getItemId)) - .collect(Collectors.toList()); - - List<LuckySeaDrawItem> drawItemList = drawItems.stream().map(item->{ - LuckySeaDrawItem drawItem = new LuckySeaDrawItem(); - drawItem.setDrawId(item.getId()); - drawItem.setDrawMultiple(item.getMultiple()); - drawItem.setDrawName(item.getName()); - drawItem.setDrawImageUrl(item.getImgUrl()); - return drawItem; - }).sorted(Comparator.comparing(LuckySeaDrawItem::getDrawMultiple).thenComparing(LuckySeaDrawItem::getDrawId)) - .collect(Collectors.toList()); - - LuckySeaUserDrawResult result = new LuckySeaUserDrawResult(); - result.setUid(uid); - result.setRoundId(roundId); - result.setDrawItemList(drawItemList); - result.setResult(JSON.toJSONString(resultDtoList)); - result.setDrawStatus(userDrawStatusMap.get(uid)); - result.setDrawTime(now); - result.setCreateTime(now); - result.setUpdateTime(now); - results.add(result); - } - resultService.saveBatch(results); - } - - /** - * 处理用户游戏记录的result数据 - * @param userDrawRecordMap - * @param itemList - * @return - */ - private Map<Long, Map<Long, LuckySeaUserDrawResultDto>> initUserDrawResultMap(Map<Long, List<LuckySeaUserDrawRecord>> userDrawRecordMap, - List<LuckySeaItem> itemList) { - Map<Long, Map<Long, LuckySeaUserDrawResultDto>> userDrawResultMap = new HashMap<>(); - for (Long uid : userDrawRecordMap.keySet()) { - Map<Long, LuckySeaUserDrawResultDto> itemDtoMap = new HashMap<>(itemList.size()); - for (LuckySeaItem item : itemList) { - LuckySeaUserDrawResultDto dto = new LuckySeaUserDrawResultDto(); - dto.setItemId(item.getId()); - dto.setCostNum(0L); - dto.setMultiple(item.getMultiple()); - itemDtoMap.put(item.getId(), dto); - } - List<LuckySeaUserDrawRecord> userDrawRecordList = userDrawRecordMap.get(uid); - for (LuckySeaUserDrawRecord record : userDrawRecordList) { - LuckySeaUserDrawResultDto dto = new LuckySeaUserDrawResultDto(); - dto.setItemId(record.getItemId()); - dto.setCostNum(record.getCostPriceNum()); - dto.setMultiple(record.getItemMultiple()); - - Map<Long, LuckySeaUserDrawResultDto> userResultMap = userDrawResultMap.get(record.getUid()); - if (CollectionUtils.isEmpty(userResultMap)) { - userResultMap = itemDtoMap; - userDrawResultMap.put(record.getUid(), userResultMap); - } - userResultMap.put(dto.getItemId(), dto); - } - } - return userDrawResultMap; - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaUserDrawRecordServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaUserDrawRecordServiceImpl.java deleted file mode 100644 index f83db455b..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaUserDrawRecordServiceImpl.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.accompany.business.service.activities.luckySea.impl; - -import com.accompany.business.model.activity.luckysea.LuckySeaItem; -import com.accompany.business.model.activity.luckysea.LuckySeaUserDrawRecord; -import com.accompany.business.mybatismapper.activity.LuckySeaUserDrawRecordMapper; -import com.accompany.business.service.activities.luckySea.LuckySeaUserDrawRecordService; -import com.accompany.common.constant.Constant; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.utils.DateTimeUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.extern.slf4j.Slf4j; -import org.redisson.api.RMap; -import org.redisson.api.RedissonClient; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Date; -import java.util.List; - -/** - * <br>类描述: - * <br>功能详细描述: - * - * @author H1 - * @date [2021/1/4] - */ -@Service -@Transactional(rollbackFor = Exception.class) -@Slf4j -public class LuckySeaUserDrawRecordServiceImpl extends ServiceImpl<LuckySeaUserDrawRecordMapper, LuckySeaUserDrawRecord> - implements LuckySeaUserDrawRecordService { - - @Autowired - private RedissonClient redissonClient; - - @Override - public RMap<Long, Double> getTodayDiamondIncomCacheMap(){ - String todayStr = DateTimeUtil.getTodayStr(); - return redissonClient.getMap(RedisKey.lucky_sea_user_diamond_income.getKey(todayStr)); - } - - @Override - public Double getUserTodayDiamondIncome(Long uid){ - RMap<Long, Double> cacheMap = getTodayDiamondIncomCacheMap(); - return cacheMap.getOrDefault(uid, 0D); - } - - @Override - public boolean updateUserDrawRecord(Long uid, Long roomUid, String roundId, LuckySeaItem item, Long costPieceNum) { - Date now = new Date(); - Long itemId = item.getId(); - boolean succeed = false; - - QueryWrapper<LuckySeaUserDrawRecord> wrapper = Wrappers.query(); - wrapper.lambda().eq(LuckySeaUserDrawRecord::getUid, uid).eq(LuckySeaUserDrawRecord::getRoundId, roundId) - .eq(LuckySeaUserDrawRecord::getItemId, itemId); - LuckySeaUserDrawRecord record = getOne(wrapper); - log.info("更新用户单轮消耗碎片数操作前, uid:{},roundId:{},itemId:{},costPiece:{}", - uid, roundId, itemId, record == null ? 0 : record.getCostPriceNum()); - if (record == null) { - record = new LuckySeaUserDrawRecord(); - record.setUid(uid); - record.setRoomUid(roomUid); - record.setRoundId(roundId); - record.setItemId(itemId); - record.setItemName(item.getName()); - record.setItemUrl(item.getImgUrl()); - record.setItemMultiple(item.getMultiple()); - record.setCostPriceNum(costPieceNum); - record.setDrawStatus(Constant.LuckySeaUserStatus.NOT_WIN); - record.setCreateTime(now); - record.setUpdateTime(now); - succeed = save(record); - } else { - UpdateWrapper<LuckySeaUserDrawRecord> updateWrapper = Wrappers.update(); - updateWrapper.lambda().eq(LuckySeaUserDrawRecord::getId, record.getId()) - .eq(LuckySeaUserDrawRecord::getDrawStatus, Constant.LuckySeaUserStatus.NOT_WIN) - .set(LuckySeaUserDrawRecord::getRoomUid, roomUid) - .set(LuckySeaUserDrawRecord::getCostPriceNum, record.getCostPriceNum() + costPieceNum) - .set(LuckySeaUserDrawRecord::getUpdateTime, now); - succeed = update(updateWrapper); - } - log.info("更新用户单轮消耗碎片数操作后, succeed:{},uid:{},roomUid:{},roundId:{},itemId:{},costPiece:{}", - succeed, uid, roomUid, roundId, itemId, - succeed? record.getCostPriceNum() + costPieceNum: record.getCostPriceNum()); - - return succeed; - } - - @Override - public List<LuckySeaUserDrawRecord> listRecordByRoundId(String roundId, Byte status) { - QueryWrapper<LuckySeaUserDrawRecord> wrapper = Wrappers.query(); - wrapper.lambda().eq(LuckySeaUserDrawRecord::getRoundId, roundId) - .eq(null != status, LuckySeaUserDrawRecord::getDrawStatus, status); - return list(wrapper); - } - - @Override - public boolean updateDrawRecordStatus(String roundId, List<Long> drawIds, Byte win) { - UpdateWrapper<LuckySeaUserDrawRecord> wrapper = Wrappers.update(); - wrapper.lambda().eq(LuckySeaUserDrawRecord::getRoundId, roundId) - .in(LuckySeaUserDrawRecord::getItemId, drawIds) - .set(LuckySeaUserDrawRecord::getDrawStatus, win) - .set(LuckySeaUserDrawRecord::getUpdateTime, new Date()); - return update(wrapper); - } - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaUserDrawResultServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaUserDrawResultServiceImpl.java deleted file mode 100644 index 5999fd7b0..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaUserDrawResultServiceImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.accompany.business.service.activities.luckySea.impl; - -import com.accompany.business.model.activity.luckysea.LuckySeaUserDrawResult; -import com.accompany.business.mybatismapper.activity.LuckySeaUserDrawResultMapper; -import com.accompany.business.service.activities.luckySea.LuckySeaUserDrawResultService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -/** - * <br>类描述: - * <br>功能详细描述: - * - * @author H1 - * @date [2021/1/5] - */ -@Service -@Transactional(rollbackFor = Exception.class) -public class LuckySeaUserDrawResultServiceImpl extends ServiceImpl<LuckySeaUserDrawResultMapper, LuckySeaUserDrawResult> - implements LuckySeaUserDrawResultService { - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/vo/LuckySeaActUserDrawRecordVo.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/vo/LuckySeaActUserDrawRecordVo.java deleted file mode 100644 index ccdc6ccc7..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/vo/LuckySeaActUserDrawRecordVo.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.accompany.business.service.activities.vo; - -import com.accompany.business.model.activity.luckysea.LuckySeaDrawItem; -import com.accompany.business.vo.activities.LuckySeaUserDrawResultVo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; -import java.util.List; - -/** - * <br>类描述: 深海奇缘活动用户抽奖记录信息 - * <br>功能详细描述: - * - * @author H1 - * @date [2021/1/5] - */ -@Data -@ApiModel -public class LuckySeaActUserDrawRecordVo { - - @ApiModelProperty(value = "轮次id") - private String roundId; - - @ApiModelProperty(value = "轮次开奖时间") - private Date drawTime; - - @ApiModelProperty(value = "中奖状态") - private Byte drawStatus; - - @ApiModelProperty(value = "中奖详情") - private List<LuckySeaUserDrawResultVo> results; - - @ApiModelProperty(value = "游戏奖励") - private Long reward; - - @ApiModelProperty(value = "中奖ids") - private List<LuckySeaDrawItem> drawItemList; - - @ApiModelProperty(value = "礼物单价") - private Long price; - - @ApiModelProperty(value = "模式(1:普通模式 2: 礼物模式)") - private Integer itemType; - - @ApiModelProperty(value = "礼物名称") - private String itemName; - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/vo/LuckySeaActUserInfo.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/vo/LuckySeaActUserInfo.java deleted file mode 100644 index 884468354..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/vo/LuckySeaActUserInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * 文 件 名: LuckySeaActUserInfo - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2020/12/30 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.service.activities.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * <br>类描述: 用户深海奇缘活动信息 - * <br>功能详细描述: - * - * @author H1 - * @date [2020/12/30] - */ -@Data -@ApiModel -public class LuckySeaActUserInfo { - @ApiModelProperty(value = "头像") - private String avatar; - @ApiModelProperty(value = "昵称") - private String nick; - @ApiModelProperty(value = "当前碎片数") - private Long pieceNum; - @ApiModelProperty(value = "当前钻石数") - private Double diamonds; - @ApiModelProperty(value = "今日奖励") - private Double todayReward; -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/vo/LuckySeaRankListVo.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/vo/LuckySeaRankListVo.java deleted file mode 100644 index 5a3d2da28..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/vo/LuckySeaRankListVo.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * 文 件 名: LuckySeaRankListVo - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/4 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.service.activities.vo; - -import com.accompany.common.annotation.ReplaceAppDomain; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * <br>类描述: 深海奇缘榜单列表vo - * <br>功能详细描述: - * - * @author H1 - * @date [2021/1/4] - */ -@Data -@ApiModel -public class LuckySeaRankListVo { - @ApiModelProperty(value = "uid") - private Long uid; - @ApiModelProperty(value = "平台号") - private Long erbanNo; - @ApiModelProperty(value = "昵称") - private String nick; - @ApiModelProperty(value = "头像") - @ReplaceAppDomain - private String avatar; - @ApiModelProperty(value = "数值") - private Double num; -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/vo/LuckySeaRankVo.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/vo/LuckySeaRankVo.java deleted file mode 100644 index e41fc11e0..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/vo/LuckySeaRankVo.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * 文 件 名: LuckySeaRankVo - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/4 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.service.activities.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * <br>类描述: 深海奇缘榜单 - * <br>功能详细描述: - * - * @author H1 - * @date [2021/1/4] - */ -@Data -@ApiModel -public class LuckySeaRankVo { - - @ApiModelProperty(value = "排行榜信息") - private List<LuckySeaRankListVo> rankList; - - @ApiModelProperty(value = "用户排行榜信息") - private LuckySeaRankListVo myRankInfo; -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/ActivityConfigService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/ActivityConfigService.java deleted file mode 100644 index 5452d2377..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/ActivityConfigService.java +++ /dev/null @@ -1,164 +0,0 @@ -package com.accompany.business.service.activity; - -import com.accompany.business.model.ActivityConfig; -import com.accompany.business.model.ActivityConfigExample; -import com.accompany.business.mybatismapper.ActivityConfigMapper; -import com.accompany.common.constant.ApplicationConstant; -import com.accompany.common.constant.Constant; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.utils.BlankUtil; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.common.utils.StringUtils; -import com.accompany.core.service.common.JedisService; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; -import org.apache.commons.collections.CollectionUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * Created by PaperCut on 2018/3/10. - */ -@Service -public class ActivityConfigService { - private static final Logger logger = LoggerFactory.getLogger(ActivityConfigService.class); - - @Autowired - JedisService jedisService; - - @Autowired - ActivityConfigMapper mapper; - - protected Gson gson = new Gson(); - - public void refresh() { - jedisService.del(RedisKey.activity_conf.getKey()); - List<ActivityConfig> list = this.getList(); - - for (ActivityConfig config : list) { - jedisService.hset(RedisKey.activity_conf.getKey(), config.getAkey(), config.getAval()); - } - logger.info("cacheActivityConfig finish ==========="); - } - - public List<ActivityConfig> getList() { - ActivityConfigExample example = new ActivityConfigExample(); - ActivityConfigExample.Criteria criteria = example.createCriteria(); - criteria.andStatusEqualTo(Constant.ActStatus.using); - return mapper.selectByExample(example); - } - - public void changeConf(String confKey,String confValue){ - ActivityConfig activityConfig = this.getSingleConfFromDB(confKey); - ActivityConfigExample example = new ActivityConfigExample(); - example.createCriteria().andAkeyEqualTo(confKey); - if(activityConfig != null){ - activityConfig.setAval(confValue); - mapper.updateByExample(activityConfig,example); - jedisService.hset(RedisKey.activity_conf.getKey(), activityConfig.getAkey(),activityConfig.getAval()); - } - } - - public ActivityConfig getSingleConfFromDB(String key){ - ActivityConfigExample example = new ActivityConfigExample(); - ActivityConfigExample.Criteria criteria = example.createCriteria(); - criteria.andAkeyEqualTo(key).andStatusEqualTo(Constant.ActStatus.using); - List<ActivityConfig> list = mapper.selectByExample(example); - return CollectionUtils.isNotEmpty(list) ? list.get(0) : null; - } - - public String getSingleConfValFromCache(String key){ - String configValStr = jedisService.hget(RedisKey.activity_conf.getKey(), key); - if(BlankUtil.isBlank(configValStr) || ApplicationConstant.NULL_JSON_OBJECT.equals(configValStr)){ - return null; - } - return configValStr; - } - - public String getSingleConf(String key){ - String val = this.getSingleConfValFromCache(key); - if(val != null){ - return val; - } - ActivityConfig activityConfig = this.getSingleConfFromDB(key); - if(activityConfig == null){ - return null; - } - jedisService.hset(RedisKey.activity_conf.getKey(),activityConfig.getAkey(),activityConfig.getAval()); - return activityConfig.getAval(); - } - - /** - * 是否在活动范围内 - * @param current - * @param startDateKey - * @param endDateKey - * @return - */ - public Boolean isInActivityRange(Date current,String startDateKey,String endDateKey) { - String beginTimeStr = this.getSingleConf(startDateKey); - String endTimeStr = this.getSingleConf(endDateKey); - if (StringUtils.isEmpty(beginTimeStr) || StringUtils.isEmpty(endDateKey)){ - return false; - } - Date beginTime = DateTimeUtil.convertStrToDate(beginTimeStr); - Date endTime = DateTimeUtil.convertStrToDate(endTimeStr); - - if (beginTime != null && endTime != null & current != null) { - if (Long.valueOf(current.getTime()).compareTo(beginTime.getTime()) >= 0 - && Long.valueOf(current.getTime()).compareTo(endTime.getTime()) <= 0) { - return true; - } - } - - return Boolean.FALSE; - } - - /** - * 获取活动日期 - * @param key - * @return - */ - public Date getActConfDate(String key){ - String confStr = getSingleConf(key); - if(com.accompany.common.utils.StringUtils.isBlank(confStr)){ - return null; - } - return DateTimeUtil.convertStrToDate(confStr,DateTimeUtil.DEFAULT_DATETIME_PATTERN); - } - - public Map<String,String> getBatchActConf(String[] fieldsArray) { - List<String> configStrList = jedisService.hmread(RedisKey.activity_conf.getKey(), fieldsArray); - Map<String, String> map = new HashMap<>(); - Integer index = 0; - for (String configStr : configStrList) { - map.put(fieldsArray[index], configStr); - index++; - } - return map; - } - - /** - * 根据 targetKey 获取 map中对应的value - * @param confKey - * @param targetKey - * @return - */ - public String getConfigMapValue(String confKey, String targetKey){ - //获取配置表中的三种概率配置 - String str = this.getSingleConf(confKey); - Map<String,String> config = gson.fromJson(str,new TypeToken<Map<String,String>>(){}.getType()); - if (config != null && config.size() > 0) { - return config.get(targetKey); - } - return null; - } - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/ActivityPackMessageService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/ActivityPackMessageService.java index 8f9803b2c..037fc8fb4 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/ActivityPackMessageService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/ActivityPackMessageService.java @@ -8,7 +8,6 @@ import com.accompany.business.model.ActivityPack; import com.accompany.business.param.neteasepush.NeteaseSendMsgParam; import com.accompany.business.service.SendSysMsgService; import com.accompany.business.service.activities.ActivitiesDrawService; -import com.accompany.business.service.activities.luckySea.ActivitiesLuckySeaService; import com.accompany.business.service.prize.PrizeContext; import com.accompany.business.service.prize.PrizeStrategyFactory; import com.accompany.business.service.user.UserActPropertyInfoV2Service; @@ -53,8 +52,6 @@ public class ActivityPackMessageService { @Autowired private SendSysMsgService sendSysMsgService; @Autowired - private ActivitiesLuckySeaService activitiesLuckySeaService; - @Autowired private UserActPropertyInfoV2Service userActPropertyInfoV2Service; @Autowired private ActivitiesDrawService activitiesDrawService; @@ -81,9 +78,6 @@ public class ActivityPackMessageService { //赠送门票 if (packType == ActivitesPackTypeEnum.park.getValue().byteValue()) { activitiesDrawService.updateTicketNum(uid, packId, packNum); - } else if (packType == ActivitesPackTypeEnum.LUCKY_SEA.getValue().byteValue()) { - // 深海活动赠送碎片 - activitiesLuckySeaService.updateUserLuckySeaActPiece(uid, packId, packNum); } else { logger.info("update user act property info. uid: {}, packType: {}, packId: {}, packTicketNum: {}, packNum: {}", uid, packType, packId, pack.getTicketNum(), packNum); userActPropertyInfoV2Service.updateUserPiece(uid, (long) pack.getTicketNum() * packNum, (int) packType); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/ActivityPackService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/ActivityPackService.java index 5561fd07b..ea7cc8f14 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/ActivityPackService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/ActivityPackService.java @@ -9,7 +9,6 @@ import com.accompany.business.mybatismapper.ActivityPackMapper; import com.accompany.business.mybatismapper.UserActivityPackRecordMapper; import com.accompany.business.service.mq.RocketMQService; import com.accompany.business.service.purse.UserPurseService; -import com.accompany.business.service.record.BillRecordService; import com.accompany.business.service.user.UsersService; import com.accompany.business.vo.activity.ActivityPackAwardItem; import com.accompany.business.vo.activity.ActivityPackListVo; @@ -17,7 +16,6 @@ import com.accompany.business.vo.activity.ActivityPackVo; import com.accompany.common.constant.ActivityConf; import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; -import com.accompany.common.support.BeanSelfAware; import com.accompany.common.utils.DateTimeUtil; import com.accompany.common.utils.UUIDUtil; import com.accompany.core.base.BeanMapper; @@ -26,21 +24,16 @@ import com.accompany.core.exception.ServiceException; import com.accompany.core.model.Users; import com.accompany.core.service.common.JedisService; import com.google.common.collect.Lists; -import com.google.common.io.CharStreams; import com.google.gson.Gson; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; -import java.io.InputStreamReader; -import java.io.Reader; import java.util.*; import java.util.stream.Collectors; @@ -241,10 +234,6 @@ public class ActivityPackService { private BillObjTypeEnum getBillObjTypeByPackType(byte packType) { BillObjTypeEnum billObjTypeEnum = BillObjTypeEnum.ACTIVITY_PACKET; - if (packType == ActivitesPackTypeEnum.CALL_BATTLE.getValue().byteValue()) { - // 守护星球 - billObjTypeEnum = BillObjTypeEnum.CALL_BATTLE; - } if (packType == ActivitesPackTypeEnum.SHIP_ANTICS.getValue().byteValue()) { // 守护星球 billObjTypeEnum = BillObjTypeEnum.SHIP_ANTICS_PACK; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/BigGiftNameplateActivityService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/BigGiftNameplateActivityService.java deleted file mode 100644 index f6bc21995..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/BigGiftNameplateActivityService.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.accompany.business.service.activity; - -import com.accompany.business.message.GiftMessage; -import com.accompany.business.model.Nameplate; -import com.accompany.business.model.activity.BigGiftNameplateActivityConfig; -import com.accompany.business.mybatismapper.NameplateMapper; -import com.accompany.business.service.nameplate.UserNameplateService; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.service.base.BaseService; -import com.accompany.core.service.common.JedisService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Date; - -@Service -public class BigGiftNameplateActivityService extends BaseService { - - private static final Logger logger = LoggerFactory.getLogger(BigGiftNameplateActivityService.class); - - @Autowired - JedisService jedisService; - @Autowired - ActivityConfigService activityConfigService; - @Autowired - private UserNameplateService userNameplateService; - @Autowired - private NameplateMapper nameplateMapper; - - public BigGiftNameplateActivityConfig getConfig() { - // 获取配置 - String activityConfig = activityConfigService.getSingleConf("big_gift_nameplate_activity"); - return gson.fromJson(activityConfig, BigGiftNameplateActivityConfig.class); - } - - public void handle(GiftMessage giftMessage) { - // 处理异常不影响其他活动 - try { - handleGiftMessage(giftMessage); - } catch (Exception e) { - logger.error("BigGiftNameplateActivityService handle error:{}", e); - } - } - - public void handleGiftMessage(GiftMessage giftMessage) { - // 检查活动时间 - BigGiftNameplateActivityConfig config = getConfig(); - if (!DateTimeUtil.isBetweenDate(new Date(), config.getStartTime(), config.getEndTime())) { - return; - } - // 检查礼物价值 - if (giftMessage.getGoldNum() < config.getValue1() * giftMessage.getGiftNum()) { - return; - } - logger.info("BigGiftNameplateActivityService giftMessage:{}", giftMessage); - // 第二个铭牌 - if (giftMessage.getGoldNum() >= config.getValue2() * giftMessage.getGiftNum()) { - Integer days = config.getDay2() * giftMessage.getGiftNum(); - sendBonusToOne(giftMessage.getSendUid(), config.getNameplateId3(), days); - sendBonusToOne(giftMessage.getRecvUid(), config.getNameplateId4(), days); - return; - } - // 第一个铭牌 - if (giftMessage.getGoldNum() >= config.getValue1() * giftMessage.getGiftNum()) { - Integer days = config.getDay1() * giftMessage.getGiftNum(); - sendBonusToOne(giftMessage.getSendUid(), config.getNameplateId1(), days); - sendBonusToOne(giftMessage.getRecvUid(), config.getNameplateId2(), days); - return; - } - } - - public void sendBonusToOne(Long uid, Long nameplateId, Integer days) { - logger.info("ChildrenActivityService sendBonus, uid:{}, nameplateId:{}, days:{}", uid, nameplateId, days); - // 查询铭牌 - Nameplate nameplate = nameplateMapper.selectById(nameplateId); - // 赠送铭牌给一个用户 - String remark = "大禮物贈送銘牌"; - String notice = String.format("恭喜你～獲得限定銘牌“%s”%s天，已經幫你放進裝扮里啦～快點移步查看", nameplate.getName(), days); - userNameplateService.sendUserNameplate(uid, nameplateId, remark, days); - // 发送小助手消息 - userNameplateService.sendNameplateSecretaryMessage(uid, notice); - } - -} - diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/CarActivityService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/CarActivityService.java deleted file mode 100644 index 87333eb07..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/CarActivityService.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.accompany.business.service.activity; - -import com.accompany.business.model.ActivityConfig; -import com.accompany.business.model.activity.CarActivityConfig; -import com.accompany.business.service.record.BillRecordService; -import com.accompany.business.service.user.UsersService; -import com.accompany.core.enumeration.BillObjTypeEnum; -import com.accompany.core.service.base.BaseService; -import com.accompany.core.util.DoubleUtil; -import com.accompany.sharding.model.BillRecord; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@Service -public class CarActivityService extends BaseService { - - @Autowired - ActivityConfigService activityConfigService; - @Autowired - UsersService usersService; - @Autowired - BillRecordService billRecordService; - - public Object getUserStats(Long uid) { - // 返回用户信息 - CarActivityConfig config = getConfig(); - - // 查询用户时间范围内充值金额 - QueryWrapper<BillRecord> wrapper = new QueryWrapper<>(); - wrapper.lambda().eq(BillRecord::getUid, uid).eq(BillRecord::getObjType, BillObjTypeEnum.CHARGE.getValue()) - .between(BillRecord::getCreateTime, config.getStartTime(), config.getEndTime()); - List<BillRecord> list = billRecordService.list(wrapper); - Double amount = list.stream().mapToDouble(BillRecord::getActualAmount).reduce(Double.NaN, DoubleUtil::add); - - Map<String, Object> data = new HashMap<>(); - data.put("user", usersService.getSimpleUserByUid(uid)); - data.put("amount", amount); - return data; - } - - public CarActivityConfig getConfig() { - // 获取配置 - ActivityConfig activityConfig = activityConfigService.getSingleConfFromDB("car_activity_2020"); - return gson.fromJson(activityConfig.getAval(), CarActivityConfig.class); - } - -} - diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/ChargeActivityVisitLogService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/ChargeActivityVisitLogService.java deleted file mode 100644 index 4ec770710..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/ChargeActivityVisitLogService.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.accompany.business.service.activity; - -import com.accompany.business.model.ChargeActivityVisitLog; -import com.accompany.business.mybatismapper.ChargeActivityVisitLogMapper; -import com.accompany.core.service.base.BaseService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Date; - -/** - * ｛这里添加描述｝ - * - * @author fangchengyan - * @date 2019-05-07 16:51 - */ -@Service -public class ChargeActivityVisitLogService extends BaseService { - - @Autowired - private ChargeActivityVisitLogMapper chargeActivityVisitLogMapper; - - public int insertSelective(ChargeActivityVisitLog record) { - record.setCreateTime(new Date()); - return chargeActivityVisitLogMapper.insertSelective(record); - } - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/OperationActService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/OperationActService.java deleted file mode 100644 index c086a2cef..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/OperationActService.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.accompany.business.service.activity; - -import com.accompany.business.model.OperationAct; -import com.accompany.business.model.OperationActExample; -import com.accompany.business.mybatismapper.OperationActMapper; -import com.accompany.common.constant.Constant; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.utils.BlankUtil; -import com.accompany.core.service.base.BaseService; -import com.accompany.core.service.common.JedisService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.util.List; - -/** - * Created by yuanyi on 2018/10/5. - */ -@Service -public class OperationActService extends BaseService { - @Autowired - private JedisService jedisService; - @Autowired - private OperationActMapper operationActMapper; - - public OperationAct queryOpertionAct(Integer id) { - String str = jedisService.hget(RedisKey.oper_act.getKey(),id.toString()); - if(BlankUtil.isBlank(str)){ - return null; - } - OperationAct operationAct = gson.fromJson(str,OperationAct.class); - return operationAct; - } - - public void refreshOperationAct() { - OperationActExample example = new OperationActExample(); - OperationActExample.Criteria criteria = example.createCriteria(); - criteria.andStatusEqualTo(Constant.status.valid); - List<OperationAct> list = this.operationActMapper.selectByExample(example); - if(CollectionUtils.isEmpty(list)){ - return; - } - jedisService.del(RedisKey.oper_act.getKey()); - for(OperationAct operationAct:list){ - jedisService.hset(RedisKey.oper_act.getKey(),operationAct.getId().toString(),gson.toJson(operationAct)); - } - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/PageActivityService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/PageActivityService.java deleted file mode 100644 index 3881e401a..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/PageActivityService.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.accompany.business.service.activity; - -import com.accompany.business.model.activity.PageActivity; -import com.accompany.business.mybatismapper.activity.PageActivityMapper; -import com.accompany.core.util.StringUtils; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.util.List; - -/** - * @Author: yangming - * @Date: 2020/5/13 20:16 - * @Description: 页面活动配置 - **/ -@Service -public class PageActivityService extends ServiceImpl<PageActivityMapper,PageActivity> { - - public PageActivity getByCode(String code){ - QueryWrapper<PageActivity> wrapper = new QueryWrapper<>(); - wrapper.lambda().eq(PageActivity::getCode,code) - .orderByDesc(PageActivity::getId); - List<PageActivity> pageActivities = list(wrapper); - if(CollectionUtils.isEmpty(pageActivities)){ - return null; - } - return pageActivities.get(0); - } - - public IPage<PageActivity> pageList(String searchKey, Integer page, Integer pageSize) { - QueryWrapper<PageActivity> wrapper = new QueryWrapper<>(); - wrapper.lambda().like(StringUtils.isNoneBlank(searchKey),PageActivity::getCode,searchKey).or() - .like(StringUtils.isNoneBlank(searchKey),PageActivity::getTitle,searchKey).or() - .like(StringUtils.isNoneBlank(searchKey),PageActivity::getSecondTitle,searchKey) - .orderByDesc(PageActivity::getId); - IPage<PageActivity> iPage = new Page<>(page,pageSize); - return page(iPage,wrapper); - } - - public long countByCode(String code) { - QueryWrapper<PageActivity> wrapper = new QueryWrapper<>(); - wrapper.lambda().eq(PageActivity::getCode,code); - return count(wrapper); - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/PkActivityService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/PkActivityService.java deleted file mode 100644 index f57827ef6..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/PkActivityService.java +++ /dev/null @@ -1,155 +0,0 @@ -package com.accompany.business.service.activity; - -import com.accompany.business.model.PkActRecord; -import com.accompany.business.model.PkActRecordExample; -import com.accompany.business.mybatismapper.PkActRecordMapper; -import com.accompany.business.mybatismapper.PkActRecordMapperMgr; -import com.accompany.business.service.user.UsersService; -import com.accompany.common.constant.ActivityConf; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.BlankUtil; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.model.Users; -import com.accompany.core.service.base.BaseService; -import com.accompany.core.service.common.JedisService; -import com.google.common.collect.Lists; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.util.Date; -import java.util.List; - -@Service -public class PkActivityService extends BaseService { - private static final Logger logger = LoggerFactory.getLogger(PkActivityService.class); - - @Autowired - private JedisService jedisService; - @Autowired - private PkActRecordMapper pkActRecordMapper; - @Autowired - private UsersService usersService; - @Autowired - private PkActRecordMapperMgr pkActRecordMapperMgr; - - private static double INCREASE = 1.0; - - public BusiResult savePkActRecord(Long uid,String targetUnionId,String ipAddress){ - BusiResult busiResult = new BusiResult(BusiStatus.SUCCESS); - - // 根据时间区间判断是在第一轮还是第二轮活动 - Date startDate = null; - Date endDate = null; - Date nowDate = new Date(); - String key = null; - - List<Date> listDate = getActConf(); - - if(DateTimeUtil.isBetweenDate(nowDate,listDate.get(0),listDate.get(1))){ - startDate = listDate.get(0); - endDate = listDate.get(1); - key = RedisKey.pk_act_first_rank.getKey(); - }else if(DateTimeUtil.isBetweenDate(nowDate,listDate.get(2),listDate.get(3))){ - startDate = listDate.get(2); - endDate = listDate.get(3); - key = RedisKey.pk_act_second_rank.getKey(); - } - Users users = usersService.getUsersByUid(uid); - if(users == null){ - return new BusiResult(BusiStatus.USERNOTEXISTS); - } - if(startDate == null || endDate == null){ - return new BusiResult(BusiStatus.PK_ACT_RECORD_TIME_ERROR,"活动时间区间错误",null); - } - - - Boolean ipRepeatBol = checkIpIsRepeat(ipAddress,uid,startDate,endDate); - - if(ipRepeatBol){ - return new BusiResult(BusiStatus.PK_ACT_RECORD_IP_REPEAT,"IP地址重复",null); - } - - PkActRecord pkActRecord = checkIsExist(uid,targetUnionId,startDate,endDate); - if(pkActRecord != null){ - return new BusiResult(BusiStatus.PK_ACT_RECORD_EXIST,"该记录已存在",null); - }else { - pkActRecord = buildPkActRecord(uid, targetUnionId, ipAddress); - // 存入DB - saveRecordDB(pkActRecord); - // 存入redis - if (!BlankUtil.isBlank(key)) { - saveRecordRedis(key, uid, INCREASE); - } - busiResult.setData(pkActRecord); - return busiResult; - } - } - - private PkActRecord buildPkActRecord(Long uid,String targetUnionId,String ipAddress){ - PkActRecord pkActRecord = new PkActRecord(); - pkActRecord.setUid(uid); - pkActRecord.setTargetUnionid(targetUnionId); - pkActRecord.setIp(ipAddress); - pkActRecord.setCreateTime(new Date()); - return pkActRecord; - } - - private PkActRecord checkIsExist(Long uid,String targetUnionId,Date startDate,Date endDate){ - PkActRecordExample example = new PkActRecordExample(); - PkActRecordExample.Criteria criteria = example.createCriteria(); - - criteria.andUidEqualTo(uid).andTargetUnionidEqualTo(targetUnionId).andCreateTimeBetween(startDate,endDate); - - List<PkActRecord> list = pkActRecordMapper.selectByExample(example); - if(CollectionUtils.isEmpty(list)){ - return null; - } - return list.get(0); - } - - private Boolean checkIpIsRepeat(String ipAddress,Long uid,Date startDate,Date endDate){ - PkActRecordExample example = new PkActRecordExample(); - PkActRecordExample.Criteria criteria = example.createCriteria(); - - criteria.andIpEqualTo(ipAddress).andUidEqualTo(uid).andCreateTimeBetween(startDate,endDate); - - List<PkActRecord> list = pkActRecordMapper.selectByExample(example); - if(CollectionUtils.isEmpty(list)){ - // 没有重复 - return false; - } - return true; - } - - private int saveRecordDB(PkActRecord pkActRecord){ - return pkActRecordMapper.insertSelective(pkActRecord); - } - - private void saveRecordRedis(String key,Long uid,Double score){ - jedisService.zincrby(key,score,uid.toString()); - } - - private List<Date> getActConf(){ - List<Date> list = Lists.newArrayList(); - String[] strArr = {ActivityConf.PK_ACT_FIRST_START,ActivityConf.PK_ACT_FIRST_END,ActivityConf.PK_ACT_SECOND_START,ActivityConf.PK_ACT_SECOND_END}; - for(String key:strArr){ - Date date = getActTime(key); - list.add(date); - } - return list; - } - - private Date getActTime(String key){ - String str = jedisService.hget(RedisKey.activity_conf.getKey(),key); - if(BlankUtil.isBlank(str)){ - return null; - } - return DateTimeUtil.convertStrToDate(str); - } -} - diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleBizService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleBizService.java deleted file mode 100644 index 9acc9518f..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleBizService.java +++ /dev/null @@ -1,150 +0,0 @@ -/* - * 文 件 名: ActivitiesLUckySeaService - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2020/12/29 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.service.callbattle; - - - -import com.accompany.business.dto.activity.callbattle.ActCallBattleConfig; -import com.accompany.business.model.callbattle.ActCallBattleInfo; -import com.accompany.business.model.callbattle.ActCallBattleItem; -import com.accompany.business.param.callbattle.ActCallBattleDrawParams; -import com.accompany.business.vo.callbattle.*; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * <br>接口描述: 召唤战斗活动service - * <br>功能详细描述: - * - * @author H1 - * @date [2020/12/29] - */ -public interface ActCallBattleBizService { - /** - * 更新用户活动碎片数 - * @param uid - * @param packId - * @param packNum - */ - void updateUserActPiece(Long uid, Integer packId, Integer packNum); - - /** - * 获取用户活动信息 - * @param uid - * @return - */ - ActCallBattleUserInfo getUserActInfo(Long uid); - - /** - * 获取活动配置奖项列表 - * @return - */ - List<ActCallBattleItem> listActItem(); - - /** - * 获取活动信息列表 - * @param count - * @param roundId - * @return - */ - List<ActCallBattleInfo> listActInfo(Integer count, String roundId); - - /** - * 获取最新一次的活动信息 - * @return - * @param uid - */ - ActCallBattleInfoVo getNewestActInfo(Long uid); - - /** - * 获取活动榜单信息 - * @param type - * @param uid - * @return - */ - ActCallBattleRankVo listRank(Integer type, Long uid); - - /** - * 活动用户抽奖 - * @param uid - * @param params - */ - void draw(Long uid, List<ActCallBattleDrawParams> params); - - /** - * 获取活动各阶段时间配置 - * @return - */ - ActCallBattleConfig getActTimeConfig(); - - /** - * 获取用户活动游戏记录 - * @return - */ - List<ActCallBattleUserDrawRecordVo> listUserDrawResult(Long uid, Integer page, Integer pageSize); - - /** - * 活动开奖 - * @param itemList - * @param roundId - * @param timeConfig - * @param stockInCache - * @return - */ - Long actDraw(List<ActCallBattleItem> itemList, String roundId, ActCallBattleConfig timeConfig, BigDecimal stockInCache) throws InterruptedException; - - /** - * 异步更新用户抽奖记录信息 - * @param roundId - * @param itemList - */ - void updateUserDrawRecordAsync(String roundId, List<ActCallBattleItem> itemList); - - /** - * 创建新的一轮游戏 - * @return - * @param startTime - * @param chooseStageConfigTime - */ - String createNewRoundAct(Date startTime, Integer chooseStageConfigTime); - - /** - * 更新游戏状态 - * @param roundId - * @param status - */ - void updateActStatus(String roundId, Byte status); - - /** - * 结束游戏 - * @param roundId - * @param endTime - */ - void endAct(String roundId, Date endTime); - - /** - * 获取用户单轮活动中投入碎片信息 - * @param uid - * @param roundId - * @return - */ - List<ActCallBattleUserDrawItemVO> listUserDrawItemInfo(Long uid, String roundId); - - /** - * 游戏发生异常时，补偿用户投入碎片 - * @param roundId - * @param beforeStoke - */ - void compensateUserPieceWhenGameAbnormal(String roundId, BigDecimal beforeStoke); - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleDrawService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleDrawService.java deleted file mode 100644 index 9cf67ec51..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleDrawService.java +++ /dev/null @@ -1,160 +0,0 @@ -package com.accompany.business.service.callbattle; - -import com.accompany.business.dto.activity.callbattle.ActCallBattleConfig; -import com.accompany.business.model.callbattle.ActCallBattleItem; -import com.accompany.business.mybatismapper.callbattle.ActCallBattleMapper; -import com.accompany.business.vo.callbattle.ActCallBattleRoundStatVo; -import com.accompany.common.utils.RandomUtil; -import com.accompany.core.base.SpringContextHolder; -import com.alibaba.fastjson.JSON; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -@Slf4j -@Service -public class ActCallBattleDrawService { - - @Autowired - private ActCallBattleMapper actCallBattleMapper; - @Autowired - private ActCallBattleStockService stockService; - - public ActCallBattleItem handleDrawPrize(String roundId, List<ActCallBattleItem> itemList, BigDecimal stock) { - Map<Long, BigDecimal> userInputMap = new HashMap<>(); - Map<Long, Long> userNumMap = new HashMap<>(); - - List<ActCallBattleRoundStatVo> statList = actCallBattleMapper.listUserRoundStat(roundId); - for (ActCallBattleRoundStatVo statVo : statList) { - BigDecimal userInput = userInputMap.getOrDefault(statVo.getItemId(), BigDecimal.ZERO).add(BigDecimal.valueOf(statVo.getTotalPiece() * statVo.getItemMultiple())); - userInputMap.put(statVo.getItemId(), userInput); - userNumMap.put(statVo.getItemId(), 1L + userNumMap.getOrDefault(statVo.getItemId(), 0L)); - } - - Map<Long, ActCallBattleItem> itemMap = itemList.stream().collect(Collectors.toMap(ActCallBattleItem::getId, item->item)); - - Map<Long, BigDecimal> drawMap = itemList.stream() - .collect(Collectors.toMap(ActCallBattleItem::getId, item->userInputMap.getOrDefault(item.getId(), BigDecimal.ZERO))); - - Map<Long, BigDecimal> lessThanStockItemMap = drawMap.entrySet().stream() - .filter(entry->stock.compareTo(entry.getValue()) > 0) - .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); - - Long itemId = !CollectionUtils.isEmpty(lessThanStockItemMap)? - drawFromLess(lessThanStockItemMap, userNumMap): - drawFromLarget(drawMap); - - // 更新库存 - BigDecimal prizePiece = drawMap.get(itemId); - BigDecimal afterStock = stockService.subStock(prizePiece); - log.info("召唤战斗活动, drawId: {}, prizePiece: {}, afterStock: {}", itemId, prizePiece.toString(), afterStock.toString()); - - return itemMap.get(itemId); - } - - private Long drawFromLess(Map<Long, BigDecimal> lessThanStockItemMap, Map<Long, Long> userAllNumMap) { - log.info("召唤战斗活动, 存在小于库存的条件组, lessThanStockItemId: {}", JSON.toJSONString(lessThanStockItemMap)); - - ActCallBattleConfig config = SpringContextHolder.getBean(ActCallBattleBizService.class).getActTimeConfig(); - - Map<Long, Long> userNumMap = lessThanStockItemMap.keySet().stream().filter(userAllNumMap::containsKey) - .collect(Collectors.toMap(id->id, id->userAllNumMap.getOrDefault(id, 0L))); - //没人玩直接模式1 - if (CollectionUtils.isEmpty(userNumMap)){ - return random(lessThanStockItemMap); - } - - if (4 == config.getModeType()){ - //消耗库存最多的-》uv最多的 - BigDecimal maxOutput = lessThanStockItemMap.values().stream().max(BigDecimal::compareTo).orElse(BigDecimal.ZERO); - List<Long> maxOutputIdList = lessThanStockItemMap.entrySet().stream() - .filter(entry->maxOutput.compareTo(entry.getValue()) == 0) - .map(Map.Entry::getKey) - .collect(Collectors.toList()); - if (maxOutputIdList.size() == 1){ - return maxOutputIdList.get(0); - } - - Long maxNum = maxOutputIdList.stream().mapToLong(id->userNumMap.getOrDefault(id,0L)).max().getAsLong(); - - List<Long> maxNumIdList = userNumMap.entrySet().stream() - .filter(entry->maxOutputIdList.contains(entry.getKey())) - .filter(entry->maxNum.compareTo(entry.getValue()) == 0) - .map(Map.Entry::getKey).collect(Collectors.toList()); - if (!CollectionUtils.isEmpty(maxNumIdList)){ - int randomIndex = RandomUtil.randomByRange(0, maxNumIdList.size()); - return maxNumIdList.get(randomIndex); - } - - } else if (3 == config.getModeType()) { - //uv最多的-》 消耗库存最多 - Long maxNum = userNumMap.values().stream().max(Long::compareTo).orElse(0L); - List<Long> maxNumIdList = (CollectionUtils.isEmpty(userNumMap)? userAllNumMap: userNumMap) - .entrySet().stream() - .filter(entry->maxNum.compareTo(entry.getValue()) == 0) - .map(Map.Entry::getKey) - .collect(Collectors.toList()); - - if (maxNumIdList.size() == 1){ - return maxNumIdList.get(0); - } - - BigDecimal maxInput = maxNumIdList.stream().map(id->lessThanStockItemMap.getOrDefault(id, BigDecimal.ZERO)) - .max(BigDecimal::compareTo).orElse(BigDecimal.ZERO); - - List<Long> maxInputIdList = lessThanStockItemMap.entrySet().stream() - .filter(entry->maxNumIdList.contains(entry.getKey())) - .filter(entry->maxInput.compareTo(entry.getValue()) == 0) - .map(Map.Entry::getKey) - .collect(Collectors.toList()); - if (!CollectionUtils.isEmpty(maxInputIdList)){ - //没人玩 - int randomIndex = RandomUtil.randomByRange(0, maxInputIdList.size()); - return maxInputIdList.get(randomIndex); - } - - } else if (2 == config.getModeType()) { - List<Long> keyList = lessThanStockItemMap.entrySet().stream().filter(entry->BigDecimal.ZERO.compareTo(entry.getValue()) < 0) - .map(Map.Entry::getKey) - .collect(Collectors.toList()); - if (CollectionUtils.isEmpty(keyList)){ - keyList = new ArrayList<>(lessThanStockItemMap.keySet()); - } - - int randomIndex = RandomUtil.randomByRange(0, keyList.size()); - return keyList.get(randomIndex); - - } - - // 保底模式1随便开 - return random(lessThanStockItemMap); - } - - private long random(Map<Long, BigDecimal> lessThanStockItemMap){ - // 保底模式1随便开 - List<Long> keyList = new ArrayList<>(lessThanStockItemMap.keySet()); - int randomIndex = RandomUtil.randomByRange(0, keyList.size()); - return keyList.get(randomIndex); - } - - private Long drawFromLarget(Map<Long, BigDecimal> drawMap) { - // 将map进行排序，最小的放在map首位 - BigDecimal minUserInput = drawMap.values().stream().min(BigDecimal::compareTo).orElse(BigDecimal.ZERO); - List<Long> keys = drawMap.entrySet().stream().filter(o -> o.getValue().compareTo(minUserInput) == 0) - .map(Map.Entry::getKey) - .sorted() - .collect(Collectors.toList()); - log.info("召唤战斗活动, 没有小于库存的条件组, 满足最小用户投入的itemIdList: {}", JSON.toJSONString(keys)); - int index = RandomUtil.randomByRange(0, keys.size()); - return keys.get(index); - } - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleInfoService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleInfoService.java deleted file mode 100644 index 9b94540f0..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleInfoService.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * 文 件 名: LuckySeaActInfoService - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2020/12/31 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.service.callbattle; - -import com.accompany.business.model.callbattle.ActCallBattleInfo; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * <br>接口描述: 深海奇缘活动信息service - * <br>功能详细描述: - * - * @author H1 - * @date [2020/12/31] - */ -public interface ActCallBattleInfoService extends IService<ActCallBattleInfo> { - /** - * 根据当前时间获取活动信息 - * @return - */ - ActCallBattleInfo getByCurrTime(); -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleItemService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleItemService.java deleted file mode 100644 index 2b7493fd4..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleItemService.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 文 件 名: LuckySeaItemService - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2020/12/31 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.service.callbattle; - -import com.accompany.business.model.callbattle.ActCallBattleItem; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * <br>接口描述: 深海奇缘活动配置item - * <br>功能详细描述: - * - * @author H1 - * @date [2020/12/31] - */ -public interface ActCallBattleItemService extends IService<ActCallBattleItem> { - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleMessageService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleMessageService.java deleted file mode 100644 index 2a9dd0e39..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleMessageService.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.accompany.business.service.callbattle; - -import com.accompany.business.dto.activity.callbattle.ActCallBattleRoomTipConfig; -import com.accompany.business.model.callbattle.ActCallBattleUserDrawRecord; -import com.accompany.business.service.SendSysMsgService; -import com.accompany.business.service.room.RoomService; -import com.accompany.business.service.room.UserInOutRoomRecordService; -import com.accompany.business.service.user.UsersService; -import com.accompany.business.vo.activities.LuckySeaPushMsg; -import com.accompany.common.constant.Attach; -import com.accompany.common.constant.Constant; -import com.accompany.core.model.Room; -import com.accompany.core.model.Users; -import com.accompany.core.service.SysConfService; -import com.alibaba.fastjson.JSON; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.util.*; -import java.util.stream.Collectors; - -@Slf4j -@Service -public class ActCallBattleMessageService { - - @Autowired - private SysConfService sysConfService; - @Autowired - private UsersService usersService; - @Autowired - private UserInOutRoomRecordService userInOutRoomRecordService; - @Autowired - private RoomService roomService; - @Autowired - private SendSysMsgService sendSysMsgService; - - @Async - public void sendChatRoomTipAsync(List<ActCallBattleUserDrawRecord> drawUserRecordList) { - ActCallBattleRoomTipConfig roomTipConfig = JSON.parseObject(sysConfService.getDefaultSysConfValueById(Constant.SysConfId.CALL_BATTLE_ROOM_TIP_CONFIG, "{}"), ActCallBattleRoomTipConfig.class); - if (roomTipConfig.isClose() || CollectionUtils.isEmpty(drawUserRecordList)){ - return; - } - - Map<Long, List<ActCallBattleUserDrawRecord>> uidDrawIdMap = drawUserRecordList.stream() - .filter(record-> roomTipConfig.needTip(record.getItemMultiple() * record.getCostPriceNum())) - .sorted(Comparator.comparing(record-> record.getItemMultiple() * record.getCostPriceNum())) - .collect(Collectors.groupingBy(ActCallBattleUserDrawRecord::getUid)); - if (CollectionUtils.isEmpty(uidDrawIdMap)){ - return; - } - - List<Long> uids = uidDrawIdMap.keySet().stream().distinct().collect(Collectors.toList()); - Map<Long, Users> usersMap = usersService.getUsersMapByUids(uids); - - Map<Long, Long> roomMap = userInOutRoomRecordService.getUserInRoomCurrent(new HashSet<>(uids)); - - for (Map.Entry<Long, List<ActCallBattleUserDrawRecord>> entry : uidDrawIdMap.entrySet()){ - List<ActCallBattleUserDrawRecord> recordList = entry.getValue(); - for (ActCallBattleUserDrawRecord record: recordList){ - Users u = usersMap.get(record.getUid()); - if (null == u){ - continue; - } - - String nick = u.getNick(); - - Long roomUid = roomMap.get(record.getUid()); - Room room = null != roomUid? roomService.getRoomByUid(roomUid): null; - - Attach attach = new Attach(); - attach.setFirst(Constant.DefMsgType.CALL_BATTLE); - - LuckySeaPushMsg msg = new LuckySeaPushMsg(); - msg.setUid(record.getUid()); - msg.setNick(nick); - msg.setRoomUid(roomUid); - msg.setItemId(record.getItemId()); - msg.setItemMultiple(record.getItemMultiple()); - msg.setDiamonds(record.getCostPriceNum()*record.getItemMultiple()); - - attach.setData(msg); - - long goldNum = record.getItemMultiple() * record.getCostPriceNum(); - - if (roomTipConfig.needAllRoomTip(goldNum)){ - attach.setSecond(Constant.DefMsgType.CALL_BATTLE_ALL_ROOM_NOTIFY); - if (null == room){ - sendSysMsgService.sendMessageToPartition(u.getPartitionId(), attach); - } else { - sendSysMsgService.sendMessageToPartition(room, attach); - } - } else if (roomTipConfig.needSingleRoomTip(goldNum)){ - attach.setSecond(Constant.DefMsgType.CALL_BATTLE_SINGLE_ROOM_NOTIFY); - if (null != room){ - sendSysMsgService.sendSingleRoomMessage(room, attach); - } - } - } - } - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattlePreWarningService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattlePreWarningService.java deleted file mode 100644 index 9f80d14d3..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattlePreWarningService.java +++ /dev/null @@ -1,225 +0,0 @@ -/* - * 文 件 名: LuckySeaPreWarningService - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/9/22 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.service.callbattle; - -import com.accompany.business.dto.callbattle.ActCallBattleBroadCastDTO; -import com.accompany.business.dto.callbattle.ActCallBattleGoldPreWarningDTO; -import com.accompany.business.dto.callbattle.ActCallBattlePreWarningConfig; -import com.accompany.business.mybatismapper.callbattle.ActCallBattlePreWarningMapper; -import com.accompany.common.config.WebSecurityConfig; -import com.accompany.common.constant.Constant; -import com.accompany.common.push.MarkdownMessage; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.service.SysConfService; -import com.accompany.core.service.message.MessageRobotPushService; -import com.alibaba.fastjson.JSON; -import com.google.common.collect.ImmutableMap; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.joda.time.DateTime; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; -import java.util.Map; - -/** - * <br>类描述: - * <br>功能详细描述: - * - * @author H1 - * @date [2021/9/22] - */ -@Service -@Slf4j -public class ActCallBattlePreWarningService { - - @Autowired - private SysConfService sysConfService; - @Autowired - private ActCallBattlePreWarningMapper actCallBattlePreWarningMapper; - @Autowired - private MessageRobotPushService messageRobotPushService; - @Autowired - private WebSecurityConfig webSecurityConfig; - @Autowired - private ActCallBattleBizService actCallBattleBizService; - @Autowired - private ActCallBattleStockService actCallBattleStockService; - - private static final String START_TIME_KEY = "startTime"; - private static final String END_TIME_KEY = "endTime"; - - /** - * 金币预警 - */ - @Async - public void handleGoldPreWarning() { - log.info("[handleGoldPreWarning] =========== start ==========="); - ActCallBattlePreWarningConfig config = getConfig(); - if (null == config) { - log.info("[handleGoldPreWarning] config is null"); - return; - } - try { - handleGoldPreWarning(config); - log.info("[handleGoldPreWarning] =========== end ==========="); - } catch (Exception e) { - log.error("[handleGoldPreWarning] error", e); - } - } - - /** - * 获取预警配置 - * @return - */ - private ActCallBattlePreWarningConfig getConfig() { - String configVal = sysConfService.getSysConfValueById(Constant.SysConfId.CALL_BATTLE_PREWARNING_CONFIG); - return StringUtils.isBlank(configVal) ? null : JSON.parseObject(configVal, ActCallBattlePreWarningConfig.class); - } - - /** - * 处理金币预警 - * @param config - */ - private void handleGoldPreWarning(ActCallBattlePreWarningConfig config) { - ActCallBattlePreWarningConfig.GoldPreWarning goldPreWarning = config.getGoldPreWarning(); - if (!goldPreWarning.getOpen()) { - log.info("[handleGoldPreWarning] 开关未开启"); - return; - } - List<ActCallBattlePreWarningConfig.GoldPreWarningItem> itemList = goldPreWarning.getItemList(); - if (CollectionUtils.isEmpty(itemList)) { - log.info("[handleGoldPreWarning] 未配置监测项"); - return; - } - for (ActCallBattlePreWarningConfig.GoldPreWarningItem item : itemList) { - ActCallBattleGoldPreWarningDTO stat = actCallBattlePreWarningMapper.getPreRoundStat(item.getRoundNum()); - if (stat.getGoldIn() != 0) { - double rate = new BigDecimal(stat.getGoldOut()).divide(BigDecimal.valueOf(stat.getGoldIn()), 2, BigDecimal.ROUND_HALF_UP).doubleValue(); - log.info("[handleGoldPreWarning] 前{}轮 out{} in{} rate{}", item.getRoundNum(), stat.getGoldOut(), stat.getGoldIn(), rate); - if (rate >= item.getWarnRate()) { - sendGoldPreWarningEnterpriseWechatMsg(config, stat, item.getRoundNum(), rate); - } - } - } - } - - /** - * 发送金币预警企业微信消息 - * @param config - * @param stat - * @param roundNum - * @param rate - */ - private void sendGoldPreWarningEnterpriseWechatMsg(ActCallBattlePreWarningConfig config, ActCallBattleGoldPreWarningDTO stat, Integer roundNum, Double rate) { - MarkdownMessage msg = new MarkdownMessage(); - String appName = config.getAppName(); - String actName = config.getActName(); - msg.addTitle(MarkdownMessage.getHeaderText(3, actName + "产出金币预警")); - msg.add(MarkdownMessage.getReferenceText("["+ appName + "]" + "[" + actName + "]在前" + roundNum + "轮的产出/投入=" + "[" + rate + "]，具体：")); - msg.add(MarkdownMessage.getReferenceText("前"+ roundNum + "轮投入:" + stat.getGoldIn())); - msg.add(MarkdownMessage.getReferenceText("前"+ roundNum + "轮产出:" + stat.getGoldOut())); - msg.add(MarkdownMessage.getReferenceText("请判断是否需要前往后台查看")); - String key = webSecurityConfig.getCallBattleDingPushKey(); - messageRobotPushService.pushMessageByKey(key, msg, true); - } - - /** - * 处理信息轮播 - */ - public void handleBroadcast() { - log.info("[handleBroadcast] =========== start ==========="); - ActCallBattlePreWarningConfig config = getConfig(); - if (null == config) { - log.info("[handleBroadcast] config is null"); - return; - } - ActCallBattlePreWarningConfig.Broadcast broadcast = config.getBroadcast(); - if (!broadcast.getOpen()) { - log.info("[handleBroadcast] 开关未开启"); - return; - } - // 校验是否处在开启时间 - if (!checkIsOpeningTime(broadcast)) { - log.info("[handleBroadcast] 不处于播报时间段"); - return; - } - Date now = new Date(); - String endTime = DateTimeUtil.convertDate(now, DateTimeUtil.DEFAULT_DATETIME_PATTERN); - String startTime = DateTimeUtil.convertDate(DateTimeUtil.addHours(now, -1), DateTimeUtil.DEFAULT_DATETIME_PATTERN); - ActCallBattleBroadCastDTO broadCastStat = actCallBattlePreWarningMapper.getBroadCastStat(startTime, endTime); - sendBroadcastEnterpriseWechatMsg(config, broadCastStat, startTime, endTime); - log.info("[handleBroadcast] =========== end ==========="); - } - - /** - * 检查是否处于轮播时段 - * @param broadcast - * @return - */ - private boolean checkIsOpeningTime(ActCallBattlePreWarningConfig.Broadcast broadcast) { - String timesConfig = broadcast.getOpenTime(); - if (StringUtils.isBlank(timesConfig)) { - return false; - } - String[] times = timesConfig.split("-"); - Map<String, String> openTimeMap = ImmutableMap.of(START_TIME_KEY, times[0], END_TIME_KEY, times[1]); - String startTime = openTimeMap.get(START_TIME_KEY); - String endTime = openTimeMap.get(END_TIME_KEY); - String[] startHourAndMinutes = startTime.split(":"); - String[] endHourAndMinutes = endTime.split(":"); - DateTime now = DateTime.now(); - DateTime startDateTime = - now.withTime( - Integer.valueOf(startHourAndMinutes[0]), Integer.valueOf(startHourAndMinutes[1]), 0, 0); - DateTime endDateTime = - now.withTime( - Integer.valueOf(endHourAndMinutes[0]), Integer.valueOf(endHourAndMinutes[1]), 0, 0); - // 如果结束时间小于开始时间，则结束日期往后延一天。因为存在跨天的情况 - if (endDateTime.compareTo(startDateTime) < 0) { - if (now.getHourOfDay() > endDateTime.getHourOfDay()) { - endDateTime = endDateTime.plusDays(1); - } else { - startDateTime = startDateTime.minusDays(1); - } - } - return now.compareTo(startDateTime) >= 0 && now.compareTo(endDateTime) <= 0; - } - - /** - * 发送定时轮播企业微信 - * @param config - * @param broadCastStat - * @param startTime - * @param endTime - */ - private void sendBroadcastEnterpriseWechatMsg(ActCallBattlePreWarningConfig config, ActCallBattleBroadCastDTO broadCastStat, String startTime, String endTime) { - MarkdownMessage msg = new MarkdownMessage(); - String appName = config.getAppName(); - String actName = config.getActName(); - msg.addTitle(MarkdownMessage.getHeaderText(3, actName + "定时播报")); - msg.add(MarkdownMessage.getReferenceText("["+ appName + "]" + "[" + actName + "]在" + startTime + "-" + endTime + "期间内情况如下：")); - msg.add(MarkdownMessage.getReferenceText("参与用户数:" + broadCastStat.getPeopleNum())); - msg.add(MarkdownMessage.getReferenceText("用户参与总值:" + broadCastStat.getGoldIn())); - msg.add(MarkdownMessage.getReferenceText("用户产出总值:" + broadCastStat.getGoldOut())); - msg.add(MarkdownMessage.getReferenceText("游戏执行轮数:" + broadCastStat.getRoundNum())); - BigDecimal stock = actCallBattleStockService.getStock(); - msg.add(MarkdownMessage.getReferenceText("当前库存数:" + stock.toString())); - String key = webSecurityConfig.getCallBattleDingPushKey(); - messageRobotPushService.pushMessageByKey(key, msg, true); - } - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleStockService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleStockService.java deleted file mode 100644 index 99a9f9ac0..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleStockService.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.accompany.business.service.callbattle; - -import com.accompany.common.constant.Constant; -import com.accompany.common.redis.RedisKey; -import com.accompany.core.service.SysConfService; -import org.redisson.api.RAtomicDouble; -import org.redisson.api.RedissonClient; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; - -@Service -public class ActCallBattleStockService implements InitializingBean { - - private RAtomicDouble stockCache; - - @Autowired - private SysConfService sysConfService; - @Autowired - private RedissonClient redissonClient; - - public BigDecimal getStock() { - Double stock = stockCache.get(); - if (!stockCache.isExists()){ - stock = Double.parseDouble(sysConfService.getDefaultSysConfValueById(Constant.SysConfId.CALL_BATTLE_STOCK, "0")); - stockCache.set(stock); - } - return BigDecimal.valueOf(stock); - } - - public BigDecimal addStock(BigDecimal userInputAfterDeduct) { - double userInputD = userInputAfterDeduct.doubleValue(); - double after = stockCache.addAndGet(userInputD); - return BigDecimal.valueOf(after); - } - - public BigDecimal subStock(BigDecimal output) { - double outputD = output.doubleValue(); - double after = stockCache.addAndGet(-outputD); - return BigDecimal.valueOf(after); - } - - public void editStock(BigDecimal stock) { - double stockD = stock.doubleValue(); - stockCache.set(stockD); - } - - @Override - public void afterPropertiesSet() throws Exception { - stockCache = redissonClient.getAtomicDouble(RedisKey.CALL_BATTLE_ACT_STOCK.getKey()); - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleTicketService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleTicketService.java deleted file mode 100644 index 04b877e2a..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleTicketService.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.accompany.business.service.callbattle; - -import com.accompany.business.dto.callbattle.ActCallBattleTicketConfig; -import com.accompany.common.constant.Constant; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.service.SysConfService; -import com.alibaba.fastjson.JSON; -import org.apache.commons.lang3.StringUtils; -import org.redisson.api.RAtomicDouble; -import org.redisson.api.RedissonClient; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; - -@Service -public class ActCallBattleTicketService { - - @Autowired - private SysConfService sysConfService; - @Autowired - private RedissonClient redissonClient; - - /** - * 获取召唤战斗活动配置的门票 - * - * @return - */ - public BigDecimal getTicketRate(BigDecimal stock) { - String ticketStr = sysConfService.getSysConfValueById(Constant.SysConfId.CALL_BATTLE_TICKET); - if (StringUtils.isBlank(ticketStr)) { - throw new ServiceException(BusiStatus.THE_CONFIGURED_TICKET_IS_EMPTY); - } - - ActCallBattleTicketConfig ticketConfig = JSON.parseObject(ticketStr, ActCallBattleTicketConfig.class); - - BigDecimal todayTotalTicket = getTodayTotalTicket(); - if (todayTotalTicket.compareTo(ticketConfig.getDayTicketMax()) >= 0){ - return BigDecimal.ZERO; - } - - if (stock.compareTo(ticketConfig.getStockBenchmark()) >= 0){ - return ticketConfig.getBigTicketRate(); - } - - return ticketConfig.getSmallTicketRate(); - } - - private BigDecimal getTodayTotalTicket(){ - String today = DateTimeUtil.getTodayStr(); - RAtomicDouble todayTotalTicket = redissonClient.getAtomicDouble(RedisKey.CALL_BATTLE_TODAY_TOTAL_TICKET.getKey(today)); - if (!todayTotalTicket.isExists()){ - return BigDecimal.ZERO; - } - return BigDecimal.valueOf(todayTotalTicket.get()); - } - - public BigDecimal addTodayTotalTicket(BigDecimal ticketPiece) { - if (BigDecimal.ZERO.compareTo(ticketPiece) < 0){ - String today = DateTimeUtil.getTodayStr(); - double after = redissonClient.getAtomicDouble(RedisKey.CALL_BATTLE_TODAY_TOTAL_TICKET.getKey(today)).addAndGet(ticketPiece.doubleValue()); - return BigDecimal.valueOf(after); - } - - return getTodayTotalTicket(); - } - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleUserDrawRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleUserDrawRecordService.java deleted file mode 100644 index e5857573d..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleUserDrawRecordService.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * 文 件 名: LuckySeaUserDrawRecordService - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/4 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.service.callbattle; - -import com.accompany.business.model.callbattle.ActCallBattleUserDrawRecord; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * <br>接口描述: - * <br>功能详细描述: - * - * @author H1 - * @date [2021/1/4] - */ -public interface ActCallBattleUserDrawRecordService extends IService<ActCallBattleUserDrawRecord> { - /** - * 更新用户抽奖记录 - * @param uid - * @param roundId - * @param itemId - * @param costPieceNum - */ - void updateUserDrawRecord(Long uid, String roundId, Long itemId, Long costPieceNum); -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleUserDrawResultService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleUserDrawResultService.java deleted file mode 100644 index 11249265e..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleUserDrawResultService.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 文 件 名: LuckySeaUserDrawResultService - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/5 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.service.callbattle; - -import com.accompany.business.model.callbattle.ActCallBattleUserDrawResult; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * <br>接口描述: - * <br>功能详细描述: - * - * @author H1 - * @date [2021/1/5] - */ -public interface ActCallBattleUserDrawResultService extends IService<ActCallBattleUserDrawResult> { - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/impl/ActCallBattleBizServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/impl/ActCallBattleBizServiceImpl.java deleted file mode 100644 index e74279404..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/impl/ActCallBattleBizServiceImpl.java +++ /dev/null @@ -1,783 +0,0 @@ -/* - * 文 件 名: ActivitiesLuckySeaServiceImpl - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2020/12/29 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.service.callbattle.impl; - -import com.accompany.business.constant.activities.ActivitesPackTypeEnum; -import com.accompany.business.dto.activity.callbattle.ActCallBattleConfig; -import com.accompany.business.dto.callbattle.ActCallBattleUserDrawResultDto; -import com.accompany.business.dto.callbattle.ActCallBattleUserRoundStatDTO; -import com.accompany.business.model.ActivityPack; -import com.accompany.business.model.UserPurse; -import com.accompany.business.model.callbattle.ActCallBattleInfo; -import com.accompany.business.model.callbattle.ActCallBattleItem; -import com.accompany.business.model.callbattle.ActCallBattleUserDrawRecord; -import com.accompany.business.model.callbattle.ActCallBattleUserDrawResult; -import com.accompany.business.mybatismapper.callbattle.ActCallBattleMapper; -import com.accompany.business.mybatismapper.callbattle.ActCallBattleUserDrawResultMapper; -import com.accompany.business.param.callbattle.ActCallBattleDrawParams; -import com.accompany.business.service.activity.ActivityPackService; -import com.accompany.business.service.callbattle.*; -import com.accompany.business.service.purse.UserPurseService; -import com.accompany.business.service.record.BillRecordService; -import com.accompany.business.service.user.UserActPropertyInfoV2Service; -import com.accompany.business.service.user.UsersService; -import com.accompany.business.vo.callbattle.*; -import com.accompany.common.constant.Constant; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.BlankUtil; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.enumeration.BillObjTypeEnum; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.model.Users; -import com.accompany.core.service.SysConfService; -import com.accompany.core.service.common.JedisService; -import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; - -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.*; - - -/** - * <br>类描述: - * <br>功能详细描述: - * - * @author H1 - * @date [2020/12/29] - */ -@Service -@Slf4j -@Transactional(rollbackFor = Exception.class) -public class ActCallBattleBizServiceImpl implements ActCallBattleBizService { - - @Autowired - private ActivityPackService activityPackService; - @Autowired - private UsersService usersService; - @Autowired - private UserPurseService userPurseService; - @Autowired - private SysConfService sysConfService; - @Autowired - private ActCallBattleUserDrawResultService ActCallBattleUserDrawResultService; - @Autowired - private JedisService jedisService; - @Autowired - private BillRecordService billRecordService; - @Autowired - private UserActPropertyInfoV2Service userActPropertyInfoV2Service; - @Autowired - private ActCallBattleItemService actCallBattleItemService; - @Autowired - private ActCallBattleMapper actCallBattleMapper; - @Autowired - private ActCallBattleInfoService actCallBattleInfoService; - @Autowired - private ActCallBattleUserDrawRecordService actCallBattleUserDrawRecordService; - @Autowired - private ActCallBattleUserDrawResultMapper actCallBattleUserDrawResultMapper; - @Autowired - private ActCallBattleUserDrawResultService actCallBattleUserDrawResultService; - @Autowired - private ActCallBattleMessageService actCallBattleMessageService; - @Autowired - private ActCallBattleStockService actCallBattleStockService; - @Autowired - private ActCallBattleTicketService actCallBattleTicketService; - @Autowired - private ActCallBattleDrawService actCallBattleDrawService; - - /** - * 榜单最大数量 - */ - private final static Integer RANK_MAX_SIZE = 30; - /** - * 榜单开始 - */ - private final static Integer RANK_START = 0; - /** - * 默认返回的游戏记录数 - */ - private final static Integer DEFAULT_RETURN_RECORD_NUM = 5; - /** - * 选择阶段默认时间(秒) - */ - private final static Integer DEFAULT_CHOOSE_STAGE_TIME = 30; - /** - * 开奖阶段默认时间(秒) - */ - private final static Integer DEFAULT_WAITING_DRAW_STAGE_TIME = 5; - /** - * 开奖结束阶段默认时间(秒) - */ - private final static Integer DEFAULT_DRAW_OVER_STAGE_TIME = 3; - private final static Integer DEFAULT_MODE = 1; - - @Override - public void updateUserActPiece(Long uid, Integer packId, Integer packNum) { - if (null == uid) { - throw new ServiceException(BusiStatus.UID_CANNOT_BE_EMPTY); - } - if (null == packId) { - throw new ServiceException(BusiStatus.PACKID_CANNOT_BE_EMPTY); - } - if (null == packNum || packNum <= 0) { - throw new ServiceException(BusiStatus.THE_NUMBER_OF_GIFT_PACKAGES_PURCHASED_MUST_BE_GREATER_THAN_0); - } - log.info("[act call battle]updateUserActPiece, uid = {}, packId = {}, packNum = {}", uid, packId, packNum); - String lock = null; - try { - lock = jedisService.lock(RedisKey.CALL_BATTLE_UPDATE_PIECE_LOCK.getKey(uid.toString()), 10 * 1000); - if (BlankUtil.isBlank(lock)){ - throw new ServiceException(BusiStatus.REQUEST_FAST); - } - ActivityPack pack = activityPackService.getPackById(packId); - if (null == pack) { - throw new ServiceException(BusiStatus.THE_PURCHASED_PRODUCT_DOES_NOT_EXIST); - } - userActPropertyInfoV2Service.updateUserPiece(uid, (long) (pack.getTicketNum() * packNum), ActivitesPackTypeEnum.CALL_BATTLE.getValue()); - log.info("updateTicketNum, num = {}",pack.getTicketNum() * packNum); - }finally { - jedisService.unlock(RedisKey.CALL_BATTLE_UPDATE_PIECE_LOCK.getKey(uid.toString()), lock); - } - } - - @Override - public ActCallBattleUserInfo getUserActInfo(Long uid) { - if (null == uid) { - throw new ServiceException(BusiStatus.UID_CANNOT_BE_EMPTY); - } - Users user = usersService.getUsersByUid(uid); - if (user == null) { - throw new ServiceException(BusiStatus.USERNOTEXISTS); - } - ActCallBattleUserInfo info = new ActCallBattleUserInfo(); - info.setAvatar(user.getAvatar()); - info.setNick(user.getNick()); - // 获取用户碎片数 - /*UserActPropertyInfoV2 propertyInfo = userActPropertyInfoV2Service.getUserActPropertyInfo(uid, ActivitesPackTypeEnum.CALL_BATTLE.getValue()); - info.setPieceNum(propertyInfo != null ? propertyInfo.getPieceNum() : 0);*/ - // 获取用户钱包钻石数 - UserPurse userPurse = userPurseService.queryUserPurse(uid); - info.setDiamonds(userPurse != null ? userPurse.getDiamonds() : 0); - - Date today = new Date(); - Date tomorrow = DateTimeUtil.addDays(today, 1); - String todayStr = DateTimeUtil.convertDate(today, DateTimeUtil.DEFAULT_DATE_PATTERN); - String tomorrowStr = DateTimeUtil.convertDate(tomorrow, DateTimeUtil.DEFAULT_DATE_PATTERN); - Double diamondIncome = actCallBattleMapper.countUserDiamondIncome(uid, todayStr, tomorrowStr); - info.setTodayReward(diamondIncome); - return info; - } - - @Override - public List<ActCallBattleItem> listActItem() { - QueryWrapper<ActCallBattleItem> wrapper = new QueryWrapper<>(); - wrapper.lambda().eq(ActCallBattleItem::getStatus, Constant.status.valid) - .orderByAsc(ActCallBattleItem::getMultiple ); - return actCallBattleItemService.list(wrapper); - } - - @Override - public List<ActCallBattleInfo> listActInfo(Integer count, String roundId) { - if (null == count) { - count = DEFAULT_RETURN_RECORD_NUM; - } - QueryWrapper<ActCallBattleInfo> wrapper = new QueryWrapper<>(); - wrapper.lambda().eq(ActCallBattleInfo::getStatus, Constant.LuckySeaActStatus.DRAW_OVER) - .ne(ActCallBattleInfo::getRoundId, roundId) - .orderByDesc(ActCallBattleInfo::getStartTime); - IPage<ActCallBattleInfo> queryPage = new Page<>(1, count); - IPage<ActCallBattleInfo> actPageInfo = actCallBattleInfoService.page(queryPage, wrapper); - - List<ActCallBattleInfo> actList; - if (actPageInfo != null && !CollectionUtils.isEmpty(actPageInfo.getRecords())) { - actList = actPageInfo.getRecords(); - } else { - actList = Collections.emptyList(); - } - return actList; - } - - @Override - public ActCallBattleInfoVo getNewestActInfo(Long uid) { - ActCallBattleInfoVo vo = new ActCallBattleInfoVo(); - ActCallBattleInfo info = actCallBattleInfoService.getByCurrTime(); - ActCallBattleConfig actTimeConfig = getActTimeConfig(); - if (null != info) { - BeanUtils.copyProperties(info, vo); - if (vo.getShowResultStageStartTime() == null) { - vo.setShowResultStageStartTime(DateTimeUtil.addSeconds(vo.getDrawStageStartTime(), actTimeConfig.getWaitingDrawStageTime())); - } - if (Constant.LuckySeaActStatus.DRAW_OVER.equals(info.getStatus())) { - // 获取排行榜前三 - List<String> topThreeUser =actCallBattleMapper.listTopThreeInOneRound(info.getRoundId()); - vo.setRankUserList(topThreeUser); - if (null != uid) { - // 获取用户中奖信息 - ActCallBattleUserOneRoundDrawResult result = new ActCallBattleUserOneRoundDrawResult(); - List<ActCallBattleUserOneRoundDrawResult> userActStatus = actCallBattleMapper.getUserActStatus(info.getRoundId(), uid); - if (CollectionUtils.isEmpty(userActStatus)) { - result.setDrawStatus(Constant.LuckySeaUserStatus.NOT_JOIN); - result.setPrizeDiamonds(0L); - } else { - for (ActCallBattleUserOneRoundDrawResult actStatus : userActStatus) { - if (actStatus.getDrawStatus().equals(Constant.LuckySeaUserStatus.WIN)) { - result.setDrawStatus(Constant.LuckySeaUserStatus.WIN); - result.setPrizeDiamonds(actStatus.getPrizeDiamonds()); - break; - } else { - result.setDrawStatus(Constant.LuckySeaUserStatus.NOT_WIN); - result.setPrizeDiamonds(0L); - } - } - } - vo.setUserDrawResult(result); - } - vo.setEndTime(DateTimeUtil.addSeconds(vo.getShowResultStageStartTime(), actTimeConfig.getDrawOverStageTime())); - } - } - return vo; - } - - @Override - public ActCallBattleRankVo listRank(Integer type, Long uid) { - if (null == type) { - throw new ServiceException(BusiStatus.LIST_TYPE_CANNOT_BE_EMPTY); - } - Users myUser = usersService.getUsersByUid(uid); - if(myUser == null){ - throw new ServiceException(BusiStatus.USER_DOES_NOT_EXIST); - } - - ActCallBattleRankVo vo = new ActCallBattleRankVo(); - List<ActCallBattleRankListVo> rankList = new ArrayList<>(); - Date beginTimeOfDay = DateTimeUtil.getBeginTimeOfDay(new Date()); - Date endTimeOfDay = DateTimeUtil.getEndTimeOfDay(new Date()); - ActCallBattleRankListVo userRankInfo = new ActCallBattleRankListVo(); - userRankInfo.setErbanNo(myUser.getErbanNo()); - userRankInfo.setAvatar(myUser.getAvatar()); - userRankInfo.setNick(myUser.getNick()); - Long myErbanNo = myUser.getErbanNo(); - - double myRankNum = 0.0; - if (type.equals(Constant.ActCallBattleRankType.DIAMOND_RANK)) { - int num = 0; - List<ActCallBattleRankListVo> diamondRank = actCallBattleMapper.listDiamondRank(RANK_START, RANK_MAX_SIZE, beginTimeOfDay, endTimeOfDay); - - // 自己排名 - Integer myRanking = 0; - Integer ranking = 1; - for(ActCallBattleRankListVo rankvo : diamondRank){ - double rankNum = rankvo.getNum(); - int giftDistanceNum = - new Double( - rankNum + num ).intValue() ; - num = rankvo.getNum().intValue(); - if(giftDistanceNum >= 0){ - rankvo.setNum((double) giftDistanceNum); - }else{ - rankvo.setNum( -(double) giftDistanceNum); - } - - if(myErbanNo.equals(rankvo.getErbanNo())){ - myRanking = ranking; - userRankInfo.setNum(rankNum); - } - rankList.add(rankvo); - ranking ++; - } - userRankInfo.setMyRanking(myRanking); - - if(myRanking == 0){ - myRankNum = actCallBattleMapper.listUserDiamondRank(uid, beginTimeOfDay, endTimeOfDay).getNum(); - userRankInfo.setNum(myRankNum); - } - } else if (type.equals(Constant.ActCallBattleRankType.LUCKY_MAN_RANK)) { - rankList = actCallBattleMapper.listLuckyManRank(RANK_START, RANK_MAX_SIZE, beginTimeOfDay, endTimeOfDay); - userRankInfo = getMyRanking(rankList, myErbanNo, userRankInfo); - if(userRankInfo.getMyRanking() == 0){ - myRankNum = actCallBattleMapper.listUserDiamondRank(uid, beginTimeOfDay, endTimeOfDay).getNum(); - userRankInfo.setNum(myRankNum); - } - } - vo.setRankList(rankList); - vo.setMyRankInfo(userRankInfo); - return vo; - } - - // 获取自己欧皇榜数据 - private ActCallBattleRankListVo getMyRanking(List<ActCallBattleRankListVo> rankList,Long myErbanNo, ActCallBattleRankListVo userRankInfo){ - Integer myRanking = 0; - Integer ranking = 1; - for(ActCallBattleRankListVo vo : rankList){ - if(myErbanNo.equals(vo.getErbanNo())){ - myRanking = ranking; - userRankInfo.setNum(vo.getNum()); - break; - } - ranking ++; - } - userRankInfo.setMyRanking(myRanking); - return userRankInfo; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void draw(Long uid, List<ActCallBattleDrawParams> params) { - if (null == uid) { - throw new ServiceException(BusiStatus.UID_CANNOT_BE_EMPTY); - } - if (CollectionUtils.isEmpty(params)) { - throw new ServiceException(BusiStatus.AT_LEAST_ONE_ITEM_NEEDS_TO_BE_SELECTED); - } - String lockVal = jedisService.lock(RedisKey.CALL_BATTLE_USER_DRAW_LOCK.getKey(uid.toString())); - if (BlankUtil.isBlank(lockVal)) { - log.error("召唤战斗，获取分布式锁失败，uid:{}", uid); - throw new ServiceException(BusiStatus.JOIN_GAME_USER_TOO_MORE); - } - String roundId = null; - try { - ActCallBattleInfo actInfo = actCallBattleInfoService.getByCurrTime(); - if (actInfo == null) { - log.error("选择失败，当前时段不存在活动。actInfo:" + JSON.toJSONString(actInfo)); - throw new ServiceException(BusiStatus.SERVERBUSY); - } - roundId = actInfo.getRoundId(); - - Long costPieceTotal = 0L; - for (ActCallBattleDrawParams param : params) { - if (param.getItemId() == null) { - throw new ServiceException(BusiStatus.ITEMID_CANNOT_BE_EMPTY); - } - if (param.getNum() <= 0) { - throw new ServiceException(BusiStatus.THE_SELECTION_QUANTITY_NEEDS_TO_BE_GREATER_THAN_0); - } - if (param.getNum() % 100 != 0) { - throw new ServiceException(BusiStatus.THE_SELECTION_QUANTITY_NEEDS_TO_BE_GREATER_THAN_0); - } - ActCallBattleItem item = actCallBattleItemService.getById(param.getItemId()); - if (null == item || !item.getStatus().equals(Constant.status.valid)) { - log.error("选择的配置不存在, itemId：" + param.getItemId()); - throw new ServiceException(BusiStatus.THE_SELECTED_CONFIGURATION_DOES_NOT_EXIST); - } - costPieceTotal += param.getNum(); - } - - jedisService.incrBy(RedisKey.call_battle_curr_write_data_user_count.getKey(roundId), 1); - if (!actInfo.getStatus().equals(Constant.LuckySeaActStatus.CHOOSE_STAGE)) { - log.error("选择失败，当前不处于选择阶段。actInfo:" + JSON.toJSONString(actInfo)); - throw new ServiceException("选择失败，当前不处于选择阶段"); - } - - // 扣减用户钻石 - userPurseService.subDiamond(uid, costPieceTotal.doubleValue(), BillObjTypeEnum.CALL_BATTLE); - - // TODO: 2021/1/14 待优化，这里可以优化为批量写入 - for (ActCallBattleDrawParams param : params) { - actCallBattleUserDrawRecordService.updateUserDrawRecord(uid, actInfo.getRoundId(), param.getItemId(), param.getNum()); - } - - } finally { - jedisService.unlock(RedisKey.CALL_BATTLE_USER_DRAW_LOCK.getKey(uid.toString()), lockVal); - jedisService.decrBy(RedisKey.call_battle_curr_write_data_user_count.getKey(roundId), 1); - } - } - - @Override - public ActCallBattleConfig getActTimeConfig() { - String callBattleConfigStr = sysConfService.getSysConfValueById(Constant.SysConfId.CALL_BATTLE_TIME_CONFIG); - if (StringUtils.isBlank(callBattleConfigStr)) { - ActCallBattleConfig config = new ActCallBattleConfig(); - config.setChooseStageTime(DEFAULT_CHOOSE_STAGE_TIME); - config.setWaitingDrawStageTime(DEFAULT_WAITING_DRAW_STAGE_TIME); - config.setDrawOverStageTime(DEFAULT_DRAW_OVER_STAGE_TIME); - config.setModeType(DEFAULT_MODE); - return config; - } - return JSON.parseObject(callBattleConfigStr, ActCallBattleConfig.class); - } - - @Override - public List<ActCallBattleUserDrawRecordVo> listUserDrawResult(Long uid, Integer page, Integer pageSize) { - if (page == null) { - page = Constant.DEFAULT_PAGE; - } - if (pageSize == null) { - page = Constant.DEFAULT_PAGE_SIZE; - } - QueryWrapper<ActCallBattleUserDrawResult> wrapper = new QueryWrapper<>(); - wrapper.lambda().eq(ActCallBattleUserDrawResult::getUid, uid).orderByDesc(ActCallBattleUserDrawResult::getDrawTime); - Page<ActCallBattleUserDrawResult> recordVoPage = new Page<>(page, pageSize); - List<ActCallBattleUserDrawResult> list = actCallBattleUserDrawResultMapper.selectPage(recordVoPage, wrapper).getRecords(); - List<ActCallBattleUserDrawRecordVo> results = new ArrayList<>(); - if (!CollectionUtils.isEmpty(list)) { - for (ActCallBattleUserDrawResult result : list) { - ActCallBattleUserDrawRecordVo vo = new ActCallBattleUserDrawRecordVo(); - Long reward = 0L; - ActCallBattleInfo actInfo = actCallBattleInfoService.getById(result.getRoundId()); - if (actInfo != null) { - vo.setRoundId(actInfo.getRoundId()); - vo.setDrawTime(actInfo.getEndTime()); - vo.setDrawId(actInfo.getDrawId()); - vo.setRestraintName(actInfo.getDrawRestraintName()); - vo.setRestraintImageUrl(actInfo.getDrawRestraintImageUrl()); - } - List<ActCallBattleUserDrawResultVo> resultVos = handleDrawResult(result.getResult()); - for (ActCallBattleUserDrawResultVo resultVo : resultVos) { - if (null != result.getDrawId() && result.getDrawId().equals(resultVo.getItemId())) { - reward = resultVo.getCostPiece() * resultVo.getMultiple(); - } - } - vo.setResults(resultVos); - vo.setDrawStatus(result.getDrawStatus()); - vo.setReward(reward); - results.add(vo); - } - } - return results; - } - - @Override - public Long actDraw(List<ActCallBattleItem> itemList, String roundId, ActCallBattleConfig timeConfig, BigDecimal stock) throws InterruptedException { - long beforeDraw = System.currentTimeMillis(); - log.info("召唤战斗活动, 开始开奖, currTime:{}", beforeDraw); - // 开奖 - ActCallBattleInfo actInfo = actCallBattleInfoService.getById(roundId); - log.info("召唤战斗活动, 开奖时使用的配置, itemList:{}", JSON.toJSONString(itemList)); - log.info("召唤战斗活动, 当前开奖的活动信息, actInfo:{}", JSON.toJSONString(actInfo)); - if (actInfo == null) { - throw new ServiceException(BusiStatus.THERE_ARE_CURRENTLY_NO_ONGOING_ACTIVITIES); - } - if (!actInfo.getStatus().equals(Constant.LuckySeaActStatus.DRAWING)) { - throw new ServiceException(BusiStatus.ABNORMAL_ACTIVITY_LOTTERY_STATUS); - } - // 查询当前是否有用户正在进行写入抽奖数据 - String count = jedisService.get(RedisKey.call_battle_curr_write_data_user_count.getKey(roundId)); - while (StringUtils.isNotBlank(count) && Integer.valueOf(count) > 0) { - log.info("召唤战斗活动, 当前还有{}用户正在写入抽奖数据, 轮数:{}", count, roundId); - Thread.sleep(100); - count = jedisService.get(RedisKey.call_battle_curr_write_data_user_count.getKey(roundId)); - } - - BigDecimal userInput = countUserInputPiece(actInfo.getRoundId()); - - BigDecimal ticket = actCallBattleTicketService.getTicketRate(stock); - - // 计算此轮应该抽取的门票 - BigDecimal ticketPiece = userInput.multiply(ticket).setScale(5, RoundingMode.DOWN); - log.info("召唤战斗活动,轮次号:{}, 库存:{}, 用户扣除前投入总和:{}, 需要扣除门票:{}", actInfo.getRoundId(), stock.toString(), userInput, ticketPiece); - - // 扣除门票之后的用户投入 - BigDecimal userInputAfterDeduct = userInput.subtract(ticketPiece).setScale(5, RoundingMode.DOWN); - log.info("召唤战斗活动,轮次号:{}, 用户扣除后投入总和:{}", actInfo.getRoundId(), userInputAfterDeduct); - - // 扣除门票之后加入库存 - BigDecimal stockWithUserInput = actCallBattleStockService.addStock(userInputAfterDeduct); - log.info("召唤战斗活动,轮次号:{}, 加入用户投入之后的库存:{}", actInfo.getRoundId(), stockWithUserInput.toString()); - - BigDecimal afterTicket = actCallBattleTicketService.addTodayTotalTicket(ticketPiece); - log.info("召唤战斗活动,轮次号:{}, 加入用户门票之后的今天累计门票总数:{}", actInfo.getRoundId(), afterTicket.toString()); - - ActCallBattleItem item = actCallBattleDrawService.handleDrawPrize(actInfo.getRoundId(), itemList, stockWithUserInput); - log.info("召唤战斗活动,轮次号:{}, 开奖结束，itemId :{}", actInfo.getRoundId(), item.getId()); - - long endDraw = System.currentTimeMillis(); - log.info("召唤战斗活动, 结束开奖, currTime:{}", endDraw); - // 获取处理此次开奖的时间 - Long drawMills = endDraw - beforeDraw; - log.info("召唤战斗活动, 结束开奖，处理开奖花费{}毫秒", drawMills); - // 更新活动状态 - int drawTime = Math.max(timeConfig.getWaitingDrawStageTime() * 1000, drawMills.intValue()); - Date showResultStageStartTime = DateTimeUtil.addMilliSecond(actInfo.getDrawStageStartTime(), drawTime); - updateLuckyActDrawResult(roundId, item, showResultStageStartTime,ticketPiece.doubleValue()); - jedisService.del(RedisKey.call_battle_curr_write_data_user_count.getKey(roundId)); - return drawMills; - } - - /** - * 异步分发用户游戏碎片奖励 - * @param roundId - */ - @Async - public void distributeDiamondAsync(String roundId) { - log.info("召唤战斗活动, 开始分发钻石奖励, roundId:{}", roundId); - // 获取轮次下中奖的用户列表 - QueryWrapper<ActCallBattleUserDrawRecord> recordQueryWrapper = new QueryWrapper<>(); - recordQueryWrapper.lambda().eq(ActCallBattleUserDrawRecord::getRoundId, roundId) - .eq(ActCallBattleUserDrawRecord::getDrawStatus, Constant.status.valid); - List<ActCallBattleUserDrawRecord> drawUserRecordList = actCallBattleUserDrawRecordService.list(recordQueryWrapper); - log.info("召唤战斗活动, 开始分发钻石奖励, 分发用户:{}", JSON.toJSONString(drawUserRecordList)); - // 奖励用户对应钻石 - for (ActCallBattleUserDrawRecord record : drawUserRecordList) { - double diamondsNum = record.getCostPriceNum() * record.getItemMultiple(); - log.info("召唤战斗活动, 开始分发钻石奖励。 uid：{}， diamondsNum:{}", record.getUid(), diamondsNum); - userPurseService.addDiamond(record.getUid(), diamondsNum, BillObjTypeEnum.CALL_BATTLE_REWARD, - (userPurse -> billRecordService.insertGeneralBillRecord(record.getUid(), record.getRoundId(), BillObjTypeEnum.CALL_BATTLE_REWARD, diamondsNum, userPurse))); - log.info("召唤战斗活动, 结束分发钻石奖励。 uid：{}， diamondsNum:{}", record.getUid(), diamondsNum); - } - // 公屏 + 飘屏 - actCallBattleMessageService.sendChatRoomTipAsync(drawUserRecordList); - } - - /** - * 异步写入用户的游戏记录 - * @param roundId - * @param itemList - */ - @Transactional(rollbackFor = Exception.class) - public void addUserDrawResult(String roundId, List<ActCallBattleItem> itemList) { - ActCallBattleInfo actInfo = actCallBattleInfoService.getById(roundId); - QueryWrapper<ActCallBattleUserDrawRecord> recordQueryWrapper = new QueryWrapper<>(); - recordQueryWrapper.lambda().eq(ActCallBattleUserDrawRecord::getRoundId, roundId) - .orderByAsc(ActCallBattleUserDrawRecord::getUid).orderByAsc(ActCallBattleUserDrawRecord::getDrawStatus); - List<ActCallBattleUserDrawRecord> drawUserRecordList = actCallBattleUserDrawRecordService.list(recordQueryWrapper); - if (!CollectionUtils.isEmpty(drawUserRecordList)) { - Map<Long, Byte> userDrawStatusMap = new HashMap<>(drawUserRecordList.size()); - Map<Long, List<ActCallBattleUserDrawRecord>> userDrawRecordMap = new HashMap<>(drawUserRecordList.size()); - for (ActCallBattleUserDrawRecord record : drawUserRecordList) { - Byte status = userDrawStatusMap.get(record.getUid()); - if (null == status) { - userDrawStatusMap.put(record.getUid(), record.getDrawStatus()); - } - List<ActCallBattleUserDrawRecord> userDrawRecord = userDrawRecordMap.get(record.getUid()); - if (CollectionUtils.isEmpty(userDrawRecord)) { - userDrawRecord = new ArrayList<>(); - userDrawRecordMap.put(record.getUid(), userDrawRecord); - } - userDrawRecord.add(record); - } - Map<Long, Map<Long, ActCallBattleUserDrawResultDto>> userDrawResultMap = initUserDrawResultMap(userDrawRecordMap, itemList); - List<ActCallBattleUserDrawResult> results = new ArrayList<>(); - for (Long uid : userDrawResultMap.keySet()) { - Map<Long, ActCallBattleUserDrawResultDto> resultDtoMap = userDrawResultMap.get(uid); - Collection<ActCallBattleUserDrawResultDto> dtos = resultDtoMap.values(); - ArrayList<ActCallBattleUserDrawResultDto> resultDtoList = new ArrayList<>(dtos); - ActCallBattleUserDrawResult result = new ActCallBattleUserDrawResult(); - result.setUid(uid); - result.setRoundId(actInfo.getRoundId()); - result.setDrawId(actInfo.getDrawId()); - result.setResult(JSON.toJSONString(resultDtoList)); - result.setDrawStatus(userDrawStatusMap.get(uid)); - result.setCreateTime(new Date()); - result.setUpdateTime(new Date()); - results.add(result); - } - ActCallBattleUserDrawResultService.saveBatch(results); - } - } - - /** - * 处理用户游戏记录的result数据 - * @param userDrawRecordMap - * @param itemList - * @return - */ - private Map<Long, Map<Long, ActCallBattleUserDrawResultDto>> initUserDrawResultMap( Map<Long, List<ActCallBattleUserDrawRecord>> userDrawRecordMap, - List<ActCallBattleItem> itemList) { - Map<Long, Map<Long, ActCallBattleUserDrawResultDto>> userDrawResultMap = new HashMap<>(); - for (Long uid : userDrawRecordMap.keySet()) { - Map<Long, ActCallBattleUserDrawResultDto> itemDtoMap = new HashMap<>(itemList.size()); - for (ActCallBattleItem item : itemList) { - ActCallBattleUserDrawResultDto dto = new ActCallBattleUserDrawResultDto(); - dto.setItemId(item.getId()); - dto.setCostNum(0L); - dto.setMultiple(item.getMultiple()); - itemDtoMap.put(item.getId(), dto); - } - List<ActCallBattleUserDrawRecord> userDrawRecordList = userDrawRecordMap.get(uid); - for (ActCallBattleUserDrawRecord record : userDrawRecordList) { - ActCallBattleUserDrawResultDto dto = new ActCallBattleUserDrawResultDto(); - dto.setItemId(record.getItemId()); - dto.setCostNum(record.getCostPriceNum()); - dto.setMultiple(record.getItemMultiple()); - Map<Long, ActCallBattleUserDrawResultDto> userResultMap = userDrawResultMap.get(record.getUid()); - if (CollectionUtils.isEmpty(userResultMap)) { - userResultMap = itemDtoMap; - userDrawResultMap.put(record.getUid(), userResultMap); - } - userResultMap.put(dto.getItemId(), dto); - } - } - return userDrawResultMap; - } - - /** - * 异步更新用户抽奖记录信息 - * @param roundId - * @param itemList - */ - @Async - @Transactional(rollbackFor = Exception.class) - @Override - public void updateUserDrawRecordAsync(String roundId, List<ActCallBattleItem> itemList) { - try { - ActCallBattleInfo actInfo = actCallBattleInfoService.getById(roundId); - if (null != actInfo) { - actCallBattleMapper.batchUpdateUserDrawRecord(roundId, actInfo.getDrawId()); - } - // 分发中奖用户的奖励 - distributeDiamondAsync(roundId); - addUserDrawResult(roundId, itemList); - } catch (Exception e) { - log.error("召唤战斗活动，异步更新用户参与信息时出现异常, roundId:" + roundId, e); - throw new ServiceException(BusiStatus.AN_EXCEPTION_OCCURRED_DURING_THE_ASYNCHRONOUS_UPDATE_OF_USER_PARTICIPATION_INFORMATION_DURING_THE_SUMMONING_OF_COMBAT_ACTIVITIES); - } - } - - /** - * 更新抽奖结果 - * @param roundId - * @param item - * @param ticket - */ - @Transactional(rollbackFor = Exception.class) - public void updateLuckyActDrawResult(String roundId, ActCallBattleItem item, Date showResultStageStartTime, Double ticket) { - ActCallBattleInfo act = new ActCallBattleInfo(); - act.setRoundId(roundId); - act.setDrawId(item.getId()); - act.setDrawName(item.getName()); - act.setDrawImageUrl(item.getImgUrl()); - act.setDrawMultiple(item.getMultiple()); - act.setStatus(Constant.LuckySeaActStatus.DRAW_OVER); - act.setTicket(ticket); - act.setShowResultStageStartTime(showResultStageStartTime); - act.setDrawRestraintName(item.getRestraintName()); - act.setDrawRestraintImageUrl(item.getRestraintImageUrl()); - act.setUpdateTime(new Date()); - actCallBattleInfoService.updateById(act); - } - - /** - * 更新游戏状态 - * @param roundId - * @param status - */ - @Transactional(rollbackFor = Exception.class) - @Override - public void updateActStatus(String roundId, Byte status) { - ActCallBattleInfo act = new ActCallBattleInfo(); - act.setRoundId(roundId); - act.setStatus(status); - act.setUpdateTime(new Date()); - actCallBattleInfoService.updateById(act); - } - - @Override - @Async - public void endAct(String roundId, Date endTime) { - ActCallBattleInfo act = new ActCallBattleInfo(); - act.setRoundId(roundId); - act.setEndTime(endTime); - act.setUpdateTime(new Date()); - actCallBattleInfoService.updateById(act); - QueryWrapper<ActCallBattleUserDrawResult> wrapper = new QueryWrapper<>(); - wrapper.lambda().eq(ActCallBattleUserDrawResult::getRoundId, roundId); - List<ActCallBattleUserDrawResult> results = ActCallBattleUserDrawResultService.list(wrapper); - if (!CollectionUtils.isEmpty(results)) { - for (ActCallBattleUserDrawResult result : results) { - result.setDrawTime(endTime); - } - actCallBattleUserDrawResultService.updateBatchById(results); - } - } - - @Override - public List<ActCallBattleUserDrawItemVO> listUserDrawItemInfo(Long uid, String roundId) { - List<ActCallBattleUserDrawItemVO> itemVOS = actCallBattleMapper.listUserDrawItemInfo(roundId, uid); - return itemVOS; - } - - @Override - public void compensateUserPieceWhenGameAbnormal(String roundId, BigDecimal beforeStoke) { - log.info("召唤战斗活动，开始处理发生异常的活动, roundId:{}, 还原库存：{}", roundId, beforeStoke.toString()); - // 将库存还原为发生异常之前的库存 - jedisService.set(RedisKey.CALL_BATTLE_ACT_STOCK.getKey(), beforeStoke.toString()); - // 获取此轮参加游戏的用户投入碎片情况 - List<ActCallBattleUserRoundStatDTO> statList = actCallBattleMapper.listUserDrawStatDtoOneRound(roundId); - if (!CollectionUtils.isEmpty(statList)) { - for (ActCallBattleUserRoundStatDTO stat : statList) { - userActPropertyInfoV2Service.updateUserPiece(stat.getUid(), stat.getCostPieceNum(), ActivitesPackTypeEnum.CALL_BATTLE.getValue()); - } - } - log.info("召唤战斗活动，结束处理发生异常的活动, roundId:{}, 处理的投入列表statList:{}", roundId, JSON.toJSONString(statList)); - } - - /** - * 创建新的一轮游戏 - * @return - * @param startTime - * @param chooseStageConfigTime - */ - @Transactional(rollbackFor = Exception.class) - @Override - public String createNewRoundAct(Date startTime, Integer chooseStageConfigTime) { - if (startTime == null) { - startTime = new Date(); - } - String roundId = String.valueOf(startTime.getTime()); - ActCallBattleInfo act = new ActCallBattleInfo(); - act.setRoundId(roundId); - act.setStartTime(startTime); - act.setStatus(Constant.LuckySeaActStatus.CHOOSE_STAGE); - act.setDrawStageStartTime(DateTimeUtil.addSeconds(startTime, chooseStageConfigTime)); - act.setCreateTime(new Date()); - act.setUpdateTime(new Date()); - actCallBattleInfoService.save(act); - log.info("召唤战斗活动, 创建新的一轮游戏 roundId:{}, startTime:{}", roundId, startTime); - return roundId; - } - - /** - * 统计用户投入碎片总数 - * @param roundId - * @return - */ - private BigDecimal countUserInputPiece(String roundId) { - BigDecimal userInput = actCallBattleMapper.countUserInputPiece(roundId); - if (null == userInput){ - return BigDecimal.ZERO; - } - return userInput; - } - - /** - * 处理抽奖结果返回 - * @param resultJson - * @return - */ - private List<ActCallBattleUserDrawResultVo> handleDrawResult(String resultJson) { - List<ActCallBattleUserDrawResultVo> results = new ArrayList<>(); - if (StringUtils.isNotBlank(resultJson)) { - List<ActCallBattleUserDrawResultDto> dtoList = JSON.parseArray(resultJson, ActCallBattleUserDrawResultDto.class); - for (ActCallBattleUserDrawResultDto dto : dtoList) { - ActCallBattleUserDrawResultVo vo = new ActCallBattleUserDrawResultVo(); - ActCallBattleItem item = actCallBattleItemService.getById(dto.getItemId()); - vo.setItemUrl(item != null ? item.getImgUrl() : null); - vo.setCostPiece(dto.getCostNum()); - vo.setItemId(dto.getItemId()); - vo.setMultiple(dto.getMultiple()); - results.add(vo); - } - } - return results; - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/impl/ActCallBattleInfoServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/impl/ActCallBattleInfoServiceImpl.java deleted file mode 100644 index e50f3c690..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/impl/ActCallBattleInfoServiceImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * 文 件 名: LuckySeaActInfoServiceImpl - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2020/12/31 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.service.callbattle.impl; - -import com.accompany.business.model.callbattle.ActCallBattleInfo; -import com.accompany.business.mybatismapper.callbattle.ActCallBattleInfoMapper; -import com.accompany.business.service.callbattle.ActCallBattleInfoService; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; - -import java.util.Date; - -/** - * <br>类描述: - * <br>功能详细描述: - * - * @author H1 - * @date [2020/12/31] - */ -@Service -@Slf4j -@Transactional(rollbackFor = Exception.class) -public class ActCallBattleInfoServiceImpl extends ServiceImpl<ActCallBattleInfoMapper, ActCallBattleInfo> - implements ActCallBattleInfoService { - - @Override - public ActCallBattleInfo getByCurrTime() { - Date currDate = new Date(); - QueryWrapper<ActCallBattleInfo> wrapper = new QueryWrapper<>(); - wrapper.lambda().le(ActCallBattleInfo::getStartTime, currDate).orderByDesc(ActCallBattleInfo::getCreateTime); - IPage<ActCallBattleInfo> queryPage = new Page<>(1, 1); - IPage<ActCallBattleInfo> actPageInfo = page(queryPage, wrapper); - - ActCallBattleInfo info = null; - if (actPageInfo != null && !CollectionUtils.isEmpty(actPageInfo.getRecords())) { - info = actPageInfo.getRecords().get(0); - } - return info; - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/impl/ActCallBattleItemServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/impl/ActCallBattleItemServiceImpl.java deleted file mode 100644 index f299a07e9..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/impl/ActCallBattleItemServiceImpl.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * 文 件 名: LuckySeaItemServiceImpl - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2020/12/31 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.service.callbattle.impl; - -import com.accompany.business.model.callbattle.ActCallBattleItem; -import com.accompany.business.mybatismapper.callbattle.ActCallBattleItemMapper; -import com.accompany.business.service.callbattle.ActCallBattleItemService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -/** - * <br>类描述: - * <br>功能详细描述: - * - * @author H1 - * @date [2020/12/31] - */ -@Service -@Slf4j -public class ActCallBattleItemServiceImpl extends ServiceImpl<ActCallBattleItemMapper, ActCallBattleItem> - implements ActCallBattleItemService { - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/impl/ActCallBattleUserDrawRecordServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/impl/ActCallBattleUserDrawRecordServiceImpl.java deleted file mode 100644 index 3d1be4381..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/impl/ActCallBattleUserDrawRecordServiceImpl.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - * 文 件 名: LuckySeaUserDrawRecordServiceImpl - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/4 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.service.callbattle.impl; - -import com.accompany.business.model.callbattle.ActCallBattleItem; -import com.accompany.business.model.callbattle.ActCallBattleUserDrawRecord; -import com.accompany.business.mybatismapper.callbattle.ActCallBattleUserDrawRecordMapper; -import com.accompany.business.service.callbattle.ActCallBattleItemService; -import com.accompany.business.service.callbattle.ActCallBattleUserDrawRecordService; -import com.accompany.common.constant.Constant; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.service.common.JedisService; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Date; - -/** - * <br>类描述: - * <br>功能详细描述: - * - * @author H1 - * @date [2021/1/4] - */ -@Service -@Slf4j -public class ActCallBattleUserDrawRecordServiceImpl extends ServiceImpl<ActCallBattleUserDrawRecordMapper, ActCallBattleUserDrawRecord> - implements ActCallBattleUserDrawRecordService { - - @Autowired - private ActCallBattleItemService ActCallBattleItemService; - @Autowired - private JedisService jedisService; - - @Override - public void updateUserDrawRecord(Long uid, String roundId, Long itemId, Long costPieceNum) { - ActCallBattleItem item = ActCallBattleItemService.getById(itemId); - if (null == item) { - throw new ServiceException(BusiStatus.THE_SELECTED_CONFIGURATION_ITEM_DOES_NOT_EXIST); - } - String lockVal = jedisService.lock(RedisKey.CALL_BATTLE_UPDATE_COST_PIECE_LOCK.getKey(uid.toString())); - try { - QueryWrapper<ActCallBattleUserDrawRecord> wrapper = new QueryWrapper<>(); - wrapper.lambda().eq(ActCallBattleUserDrawRecord::getUid, uid).eq(ActCallBattleUserDrawRecord::getRoundId, roundId) - .eq(ActCallBattleUserDrawRecord::getItemId, itemId); - ActCallBattleUserDrawRecord record = getOne(wrapper); - log.info("[ActCallBattle updateUserDrawRecord] 更新用户单轮消耗碎片数操作前, uid:{},roundId:{},itemId:{},costPiece:{}", - uid, roundId, item, record == null ? 0 : record.getCostPriceNum()); - boolean insert = false; - - if (record == null) { - insert = true; - record = new ActCallBattleUserDrawRecord(); - record.setUid(uid); - record.setRoundId(roundId); - record.setItemId(itemId); - record.setItemName(item.getName()); - record.setItemUrl(item.getImgUrl()); - record.setItemMultiple(item.getMultiple()); - record.setCostPriceNum(costPieceNum); - record.setRestraintName(item.getRestraintName()); - record.setRestraintImageUrl(item.getRestraintImageUrl()); - record.setDrawStatus(Constant.status.invalid); - record.setCreateTime(new Date()); - } else { - record.setCostPriceNum(record.getCostPriceNum() + costPieceNum); - } - record.setUpdateTime(new Date()); - - if (insert){ - save(record); - } else { - updateById(record); - } - //saveOrUpdate(record); - log.info("更新用户单轮消耗碎片数操作后, uid:{},roundId:{},itemId:{},costPiece:{}", - uid, roundId, item, record.getCostPriceNum()); - } finally { - jedisService.unlock(RedisKey.CALL_BATTLE_UPDATE_COST_PIECE_LOCK.getKey(uid.toString()), lockVal); - } - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/impl/ActCallBattleUserDrawResultServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/impl/ActCallBattleUserDrawResultServiceImpl.java deleted file mode 100644 index fa68d03de..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/impl/ActCallBattleUserDrawResultServiceImpl.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 文 件 名: LuckySeaUserDrawResultServiceImpl - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/5 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.service.callbattle.impl; - -import com.accompany.business.model.callbattle.ActCallBattleUserDrawResult; -import com.accompany.business.mybatismapper.callbattle.ActCallBattleUserDrawResultMapper; -import com.accompany.business.service.callbattle.ActCallBattleUserDrawResultService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -/** - * <br>类描述: - * <br>功能详细描述: - * - * @author H1 - * @date [2021/1/5] - */ -@Service -@Transactional(rollbackFor = Exception.class) -public class ActCallBattleUserDrawResultServiceImpl extends ServiceImpl<ActCallBattleUserDrawResultMapper, ActCallBattleUserDrawResult> - implements ActCallBattleUserDrawResultService { -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/certification/AbstractCertifyService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/certification/AbstractCertifyService.java deleted file mode 100644 index 34e7634d5..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/certification/AbstractCertifyService.java +++ /dev/null @@ -1,332 +0,0 @@ -package com.accompany.business.service.certification; - -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.StrUtil; -import com.accompany.business.constant.withdraw.WithdrawAccountTypeConstant; -import com.accompany.business.model.UserCertifyRecord; -import com.accompany.business.model.UserCertifyRecordExample; -import com.accompany.business.model.withdraw.WithdrawUserAccount; -import com.accompany.business.mybatismapper.UserCertifyRecordMapper; -import com.accompany.business.mybatismapper.UserCertifyRecordMapperExpand; -import com.accompany.business.mybatismapper.withdraw.WithdrawUserAccountMapper; -import com.accompany.business.service.user.UsersService; -import com.accompany.common.constant.Constant; -import com.accompany.common.constant.SmsTypeEnum; -import com.accompany.common.device.DeviceInfo; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.common.utils.GetTimeUtils; -import com.accompany.common.utils.IPUtils; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.model.Users; -import com.accompany.core.mybatismapper.AccountLoginRecordMapper; -import com.accompany.core.mybatismapper.UsersMapper; -import com.accompany.core.service.SysConfService; -import com.accompany.core.service.common.JedisService; -import com.accompany.core.util.StringUtils; -import com.accompany.sms.service.SmsService; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; - -import javax.servlet.http.HttpServletRequest; -import java.util.Calendar; -import java.util.Date; -import java.util.List; -import java.util.UUID; - -@Slf4j -public abstract class AbstractCertifyService { - - private static final int NONE = -1; - - private static final int WAIT = 0; - - public static final int FAIL = 1; - - public static final int SUCCESS = 2; - - public static final int DELETE = 3; - - @Autowired - protected UserCertifyRecordMapper userCertifyRecordMapper; - - @Autowired - private UserCertifyRecordMapperExpand userCertifyRecordMapperExpand; - - @Autowired - private AccountLoginRecordMapper accountLoginRecordMapper; - - @Autowired - private WithdrawUserAccountMapper withdrawUserAccountMapper; - - @Autowired - protected UsersMapper usersMapper; - - @Autowired - protected UsersService usersService; - - @Autowired - protected SmsService smsService; - - @Autowired - protected JedisService jedisService; - - @Autowired - protected SysConfService sysConfService; - - /** - * 发送短信验证码 - * - * @param phone - * @param uid - * @param ip - * @param deviceInfo - */ - public void sendCertificationCode(String phone, Long uid, String ip, DeviceInfo deviceInfo) { - if (deviceInfo == null || StringUtils.isBlank(deviceInfo.getDeviceId())) { - String app = deviceInfo != null ? deviceInfo.getApp() : ""; - deviceInfo = new DeviceInfo(); - deviceInfo.setDeviceId(getDeviceId(uid)); - deviceInfo.setApp(app); - } - // 用户未传入手机号，或手机号中含有*，则去用户信息中查实际的手机号 - if (StringUtils.isBlank(phone) || phone.contains("*")) { - Users users = usersService.getUsersByUid(uid); - phone = users.getPhone(); - } - //判断用户是否超出限额(一个用户身份认证一天只能发十次验证码) - String userLimit = jedisService.hget(RedisKey.sms_user_certify_count.getKey(), uid.toString()); - if (StringUtils.isNotBlank(userLimit) && Integer.parseInt(userLimit) > Constant.USER_CERTIFY_LIMIT_TIMES) { - throw new ServiceException(BusiStatus.SMS_DEVICE_LIMIT); - } - smsService.sendSmsCode(phone, SmsTypeEnum.CERTIFICATION.value, deviceInfo, ip, null, false); - } - - protected String getDeviceId(Long uid) { - return accountLoginRecordMapper.getLastDeviceId(uid); - } - - /** - * 增加用户发送验证码次数 - * - * @param uid - */ - public void increaseUserCount(String uid) { - String key = RedisKey.sms_user_certify_count.getKey(); - long expireTime = GetTimeUtils.getTimesnight(24).getTime() / 1000 - 1; - jedisService.hincr(key, uid); - jedisService.expireAt(key, expireTime); - } - - protected void verify(Long uid, String phone, String code, String username, String identityNumber) { - List<WithdrawUserAccount> withdrawUserAccounts = withdrawUserAccountMapper.selectList(Wrappers.<WithdrawUserAccount>lambdaQuery() - .eq(WithdrawUserAccount::getUid, uid) - .eq(WithdrawUserAccount::getAccountType, WithdrawAccountTypeConstant.CHINA_UNION_PAY)); - if (CollectionUtil.isEmpty(withdrawUserAccounts)) { - throw new ServiceException(BusiStatus.CERTIFY_NEED_BOUND_MAINLAND_ACCOUNT); - } - WithdrawUserAccount withdrawUserAccount = withdrawUserAccounts.get(0); - String name = withdrawUserAccount.getName(); - String idCardNo = withdrawUserAccount.getIdCardNo(); - if (StrUtil.isEmpty(name) || StrUtil.isEmpty(idCardNo)) { - throw new ServiceException(BusiStatus.CERTIFY_ACCOUNT_NOT_MATCH_REAL_NAME); - } - if (!name.equals(username) || !idCardNo.equals(identityNumber)) { - throw new ServiceException(BusiStatus.CERTIFY_ACCOUNT_NOT_MATCH_REAL_NAME); - } - String userCountStr = jedisService.hget(RedisKey.certify_user_count.getKey(DateTimeUtil.convertDate(new Date(), DateTimeUtil.DEFAULT_DATE_PATTERN)), String.valueOf(uid)); - int certificationCount = sysConfService.getIntValueById(Constant.SysConfId.CERTIFICATION_COUNT); - if (certificationCount == 0) { - certificationCount = 5; - } - if (StrUtil.isNotEmpty(userCountStr) && Integer.parseInt(userCountStr) >= certificationCount) { - throw new ServiceException(BusiStatus.CERTIFY_OVER_TODAY_CERTIFY_MAX_TIMES); - } - verify(usersService.getUsersByUid(uid), phone, code, identityNumber); - } - - /** - * 校验请求合法性 - * - * @param users - * @param phone - * @param code - * @param identityNumber - * @throws Exception - */ - protected void verify(Users users, String phone, String code, String identityNumber) { - if (users == null) { - throw new ServiceException(BusiStatus.USERNOTEXISTS); - } - //验证码验证 - boolean verify = smsService.verifySmsCode(phone, code); - if (!verify) { - throw new ServiceException(BusiStatus.SMSCODEERROR); - } - //身份证绑定账号验证 - String bindAccount = jedisService.hget(RedisKey.id_card_bind_user_count.getKey(), identityNumber); - if (StrUtil.isNotEmpty(bindAccount) && Integer.parseInt(bindAccount) >= Constant.usersCertification.ID_CARD_BIND_USER_LIMIT) { - throw new ServiceException(BusiStatus.ID_CARD_BIND_LIMIT); - } - // 2020-03-04 实名认证修改次数超过限制，实名认证后，用户有一次修改认证信息的机会 - if (users.getCertifyModifyTimes() != null && users.getCertifyModifyTimes() >= 1) { - throw new ServiceException(BusiStatus.MODIFY_BIND_TIMES_LIMITS); - } - } - - /** - * 构建身份认证记录 - * - * @param uid - * @param name - * @param identityNum - * @param phone - * @param code - * @param deviceInfo - * @param ip - * @return - */ - protected UserCertifyRecord buildUserCertifyRecord(Long uid, String name, String identityNum, String phone, String code, DeviceInfo deviceInfo, String ip) { - UserCertifyRecord userCertifyRecord = new UserCertifyRecord(); - if (deviceInfo == null || StringUtils.isBlank(deviceInfo.getDeviceId())) { - deviceInfo = new DeviceInfo(); - deviceInfo.setDeviceId(getDeviceId(uid)); - } - userCertifyRecord.setTicket(UUID.randomUUID().toString()); - userCertifyRecord.setDeviceId(deviceInfo.getDeviceId()); - userCertifyRecord.setIp(ip); - userCertifyRecord.setUid(uid); - userCertifyRecord.setName(name); - userCertifyRecord.setIdCardNum(identityNum); - userCertifyRecord.setCreatetime(Calendar.getInstance().getTime()); - userCertifyRecord.setPhone(phone); - userCertifyRecord.setVerifyCode(code); - return userCertifyRecord; - } - - /** - * 增加用户实名认证记录 - * - * @param record - */ - protected void addUserCertifyRecord(UserCertifyRecord record) { - this.userCertifyRecordMapper.insert(record); - } - - protected UserCertifyRecord updateUserCertifyRecord(Long uid, String token, Byte status, String qualityScore) { - UserCertifyRecord record = this.getUserCertifyRecord(uid, token); - record.setUpdateTime(Calendar.getInstance().getTime()); - record.setBindStatus(status); - userCertifyRecordMapper.updateByPrimaryKeySelective(record); - return record; - } - - private UserCertifyRecord getUserCertifyRecord(Long uid, String token) { - UserCertifyRecordExample example = new UserCertifyRecordExample(); - example.createCriteria().andUidEqualTo(uid).andTokenEqualTo(token); - List<UserCertifyRecord> records = userCertifyRecordMapper.selectByExample(example); - if (CollectionUtil.isEmpty(records)) { - throw new ServiceException(BusiStatus.NOTEXISTS); - } - return records.get(0); - } - - public UserCertifyRecord getLatestRecord(Long uid) { - return userCertifyRecordMapperExpand.getLatestRecord(uid); - } - - /** - * 保存用户信息到数据库和缓存 - * - * @param users - */ - protected void updateUsersInDBAndCache(Users users) { - int result = usersMapper.updateByPrimaryKeySelective(users); - if (result > 0) { - this.refreshUserCache(users.getUid()); - } - } - - /** - * 更新用户缓存 - * - * @param uid - */ - protected void refreshUserCache(Long uid) { - jedisService.hdel(RedisKey.user.getKey(), uid.toString()); - jedisService.hdel(RedisKey.user_erban_no.getKey(), uid.toString()); - jedisService.hdel(RedisKey.user_summary.getKey(), uid.toString()); - } - - protected String getIpAddress() { - String ipAddress = StrUtil.EMPTY; - try { - ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); - if (requestAttributes != null) { - HttpServletRequest request = requestAttributes.getRequest(); - ipAddress = IPUtils.getRealIpAddress(request); - } - } catch (Exception e) { - log.error(e.getMessage(), e); - } - return ipAddress; - } - - public void increaseBindCount(String identityNum) { - String key = RedisKey.id_card_bind_user_count.getKey(); - jedisService.hincr(key, identityNum); - } - - /** - * 减少一次实名认证绑定次数 - * - * @param identityNum - */ - public void decreaseBindCount(String identityNum) { - String key = RedisKey.id_card_bind_user_count.getKey(); - jedisService.hincrBy(key, identityNum, -1L); - } - - public void updateCertifyResult(Long uid, String certifyId, Integer certType, Byte bindStatus, boolean isSuccess) { - Users users = usersService.getUsersByUid(uid); - if (users == null) { - log.info("user is null"); - return; - } - String idCardNum = users.getIdCardNum(); - String realName = users.getRealName(); - // 如果已经实名认证过，则不给修改 - if (StringUtils.isNotBlank(idCardNum) && StringUtils.isNotBlank(realName)) { - log.info("idCardNum : {}, realName : {} is exists.", idCardNum, realName); - return; - } - UserCertifyRecord record = getUserCertifyRecord(uid, certifyId); - if (record == null) { - log.error("updateCertifyResult record is null"); - return; - } - Date now = new Date(); - record.setBindStatus(isSuccess ? (byte) SUCCESS : (byte) FAIL); - if (certType != null) { - record.setCertifyType(String.valueOf(certType)); - } - record.setUpdateTime(now); - userCertifyRecordMapper.updateByPrimaryKeySelective(record); - if (isSuccess) { - // 设置实名信息 - users.setRealName(record.getName()); - users.setIdCardNum(record.getIdCardNum()); - users.setUpdateTime(now); - users.setCertifyModifyTimes(Constant.Yes1No0.YES); - this.updateUsersInDBAndCache(users); - // 增加身份证绑定次数 - - this.increaseBindCount(record.getIdCardNum()); - } - } - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/certification/FinancialFaceVerifyService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/certification/FinancialFaceVerifyService.java deleted file mode 100644 index a059fd52d..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/certification/FinancialFaceVerifyService.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.accompany.business.service.certification; - -import cn.hutool.core.collection.CollectionUtil; -import com.accompany.business.constant.withdraw.WithdrawAccountTypeConstant; -import com.accompany.business.dto.certification.CertifyInfo; -import com.accompany.business.enums.certification.CertTypeEnum; -import com.accompany.business.model.UserCertifyRecord; -import com.accompany.business.model.withdraw.WithdrawUserAccount; -import com.accompany.business.mybatismapper.withdraw.WithdrawUserAccountMapper; -import com.accompany.business.service.certification.aliyun.FinancialFaceVerify; -import com.accompany.common.constant.Constant; -import com.accompany.common.device.DeviceInfo; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DESUtils; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.base.DeviceInfoContextHolder; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.util.KeyStore; -import com.aliyun.cloudauth20190307.models.DescribeFaceVerifyResponse; -import com.aliyun.cloudauth20190307.models.InitFaceVerifyResponse; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Date; -import java.util.List; - -/** - * @author: liaozetao - * @date: 2024/1/10 14:21 - * @description: - */ -@Slf4j -@Service -public class FinancialFaceVerifyService extends AbstractCertifyService { - - private static final String CERTIFY_RESULT_FOR_SUCCESS = "T"; - - private static final String CERTIFY_RESULT_FOR_FAILURE = "F"; - - @Autowired - private FinancialFaceVerify financialFaceVerify; - - @Autowired - private WithdrawUserAccountMapper withdrawUserAccountMapper; - - - public CertifyInfo initFace(Long uid, String encryptUsername, String encryptIdentityNumber, String encryptPhone, String code, String metaInfo, Integer certType, String returnUrl) { - String username; - String identityNumber; - String phone; - try { - username = DESUtils.DESAndBase64Decrypt(encryptUsername, KeyStore.DES_ENCRYPT_KEY); - identityNumber = DESUtils.DESAndBase64Decrypt(encryptIdentityNumber, KeyStore.DES_ENCRYPT_KEY); - phone = DESUtils.DESAndBase64Decrypt(encryptPhone, KeyStore.DES_ENCRYPT_KEY); - log.info("username : {}, identityNumber : {}, phone : {}", username, identityNumber, phone); - } catch (Exception e) { - log.error("解密信息时出现异常", e); - throw new ServiceException(BusiStatus.CERTIFY_FAIL); - } - DeviceInfo deviceInfo = DeviceInfoContextHolder.get(); - String deviceId = deviceInfo.getDeviceId(); - String ipAddress = getIpAddress(); - //校验 - verify(uid, phone, code, username, identityNumber); - UserCertifyRecord record = buildUserCertifyRecord(uid, username, identityNumber, phone, code, deviceInfo, ipAddress); - String ticket = record.getTicket(); - InitFaceVerifyResponse.InitFaceVerifyResponseResultObject result = financialFaceVerify.initFaceVerify(ticket, username, identityNumber, returnUrl, metaInfo, phone, ipAddress, uid, certType, deviceId); - if (result == null) { - throw new ServiceException(BusiStatus.CERTIFY_FAIL); - } - String certifyId = result.getCertifyId(); - record.setToken(certifyId); - addUserCertifyRecord(record); - //验证次数加一 - jedisService.hincrBy(RedisKey.certify_user_count.getKey(DateTimeUtil.convertDate(new Date(), DateTimeUtil.DEFAULT_DATE_PATTERN)), String.valueOf(uid), 1L); - //设置60秒标识 - jedisService.set(RedisKey.user_certify.getKey(uid.toString()), Boolean.TRUE.toString(), 10 * 60); - return new CertifyInfo(result.getCertifyUrl()); - } - - public void callback(Long uid, String certifyId, Integer certType, String deviceId) { - DescribeFaceVerifyResponse.DescribeFaceVerifyResponseResultObject responseResultObject = financialFaceVerify.describeFaceVerify(certifyId); - if (responseResultObject == null) { - log.error("callback responseResultObject is null, uid : {}, certifyId : {}, certType : {}, deviceId : {}", uid, certifyId, certType, deviceId); - throw new ServiceException(BusiStatus.CERTIFY_FAIL); - } - String passed = responseResultObject.getPassed(); - updateCertifyResult(uid, certifyId, certType, passed.getBytes()[0], CERTIFY_RESULT_FOR_SUCCESS.equals(passed)); - if (certType == CertTypeEnum.WITHDRAW.ordinal()) { - List<WithdrawUserAccount> withdrawUserAccounts = withdrawUserAccountMapper.selectList(Wrappers.<WithdrawUserAccount>lambdaQuery() - .eq(WithdrawUserAccount::getUid, uid) - .eq(WithdrawUserAccount::getAccountType, WithdrawAccountTypeConstant.CHINA_UNION_PAY)); - if (CollectionUtil.isEmpty(withdrawUserAccounts)) { - return; - } - WithdrawUserAccount withdrawUserAccount = withdrawUserAccounts.get(0); - withdrawUserAccount.setIsRealCertify(CERTIFY_RESULT_FOR_SUCCESS.equals(passed) ? Constant.Yes1No0.YES : Constant.Yes1No0.NO); - withdrawUserAccountMapper.updateById(withdrawUserAccount); - } - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/certification/RealPeopleCertifyService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/certification/RealPeopleCertifyService.java deleted file mode 100644 index f282dcdc3..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/certification/RealPeopleCertifyService.java +++ /dev/null @@ -1,266 +0,0 @@ -package com.accompany.business.service.certification; - -import com.accompany.business.model.UserCertifyRecord; -import com.accompany.business.model.UserCertifyRecordExample; -import com.accompany.business.service.user.UsersService; -import com.accompany.common.config.AliyunRPCertifyConfig; -import com.accompany.common.device.DeviceInfo; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DESUtils; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.model.Users; -import com.accompany.core.util.StringUtils; -import com.alibaba.fastjson.JSON; -import com.aliyuncs.DefaultAcsClient; -import com.aliyuncs.IAcsClient; -import com.aliyuncs.cloudauth.model.v20180916.*; -import com.aliyuncs.exceptions.ClientException; -import com.aliyuncs.http.MethodType; -import com.aliyuncs.profile.DefaultProfile; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.exception.ExceptionUtils; -import org.apache.commons.lang3.math.NumberUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Scope; -import org.springframework.context.annotation.ScopedProxyMode; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; - -import java.util.Calendar; -import java.util.Date; -import java.util.List; -import java.util.UUID; - -/** - * @Author yangziwen - * @Date 2019-01-24 - * @Description 阿里云实人认证 - */ -@Slf4j -@Service -public class RealPeopleCertifyService extends AbstractCertifyService { - - /** - * -1 未认证, 0 认证中, 1 认证通过, 2 认证不通过 - */ - public static final Byte CERTIFY_RESULT_PENDING = -1; - public static final Byte CERTIFY_RESULT_SUCCESS = 2; - public static final Byte CERTIFY_RESULT_FAILED = 1; - public static final Byte CERTIFY_RESULT_DELETE = 3; - - @Autowired - private UsersService userService; - - @Bean - @Scope(value = "session", proxyMode = ScopedProxyMode.TARGET_CLASS) - public IAcsClient getIAcsClient() { -// DefaultProfile profile = DefaultProfile.getProfile(aliyunCertRegion, aliyunCertAccessKeyId, aliyunCertAccessKeySecret); - DefaultProfile profile = DefaultProfile.getProfile(AliyunRPCertifyConfig.regionId, AliyunRPCertifyConfig.accessKeyId, AliyunRPCertifyConfig.accessKeySecret); - return new DefaultAcsClient(profile); - } - - public String getAliyunRPBasicToken(Long uid) throws ClientException { - //认证ID, 由使用方指定, 发起不同的认证任务需要更换不同的认证ID - String ticketId = UUID.randomUUID().toString(); - - //1. 服务端发起认证请求, 获取到token - //GetVerifyToken接口文档：https://help.aliyun.com/document_detail/57050.html - GetVerifyTokenRequest getVerifyTokenRequest = new GetVerifyTokenRequest(); - getVerifyTokenRequest.setBiz(AliyunRPCertifyConfig.bizCode); - getVerifyTokenRequest.setTicketId(ticketId); - - GetVerifyTokenResponse response = getIAcsClient().getAcsResponse(getVerifyTokenRequest); - //token默认30分钟时效，每次发起认证时都必须实时获取 - return response.getData().getVerifyToken().getToken(); - } - - public String getAliyunRPBioOnlyToken(Long uid, String username, String identificationNumber, String phone, String code, DeviceInfo device, String ip) throws Exception { - - //用户信息验证 - Users users = userService.getUsersByUid(uid); - verify(users, phone, code, identificationNumber); - - UserCertifyRecord record = buildUserCertifyRecord(uid, username, identificationNumber, phone, code, device, ip); - GetVerifyTokenRequest request = buildRPBioGetVerifyTokenRequest(record.getTicket(), username, identificationNumber); - GetVerifyTokenResponse response = getIAcsClient().getAcsResponse(request); - String token = response.getData().getVerifyToken().getToken(); - - record.setToken(token); - addUserCertifyRecord(record); - - - //token默认30分钟时效，每次发起认证时都必须实时获取 - return token; - } - - private GetVerifyTokenRequest buildRPBioGetVerifyTokenRequest(String ticketId, String username, String identificationNumber) { - GetVerifyTokenRequest getVerifyTokenRequest = new GetVerifyTokenRequest(); - getVerifyTokenRequest.setBiz(AliyunRPCertifyConfig.bizCode); - getVerifyTokenRequest.setTicketId(ticketId); - getVerifyTokenRequest.setMethod(MethodType.POST); - - //通过binding参数传入业务已经采集的认证资料，其中姓名、身份证号为必要字段 - //若需要binding图片资料，请控制单张图片大小在 2M 内，避免拉取超时 - getVerifyTokenRequest.setBinding("{\"Name\": \"" + username + "\",\"IdentificationNumber\": \"" + identificationNumber + "\"}"); - - return getVerifyTokenRequest; - } - - @Transactional(rollbackFor = Exception.class) - public void updateCertifyResult(Long uid, String token, Byte statusCode) { - UserCertifyRecordExample example = new UserCertifyRecordExample(); - example.createCriteria().andUidEqualTo(uid).andTokenEqualTo(token); - example.setOrderByClause(" createTime desc "); - List<UserCertifyRecord> records = this.userCertifyRecordMapper.selectByExample(example); - if (CollectionUtils.isEmpty(records)) { - throw new ServiceException(BusiStatus.NOTEXISTS); - } - //根据 'createTime' 逆序，此时拿到的是最新的记录 - UserCertifyRecord record = records.get(0); - if (!record.getUid().equals(uid)) { - throw new ServiceException(BusiStatus.ILLEGAL_USER); - } - // 验证是否验证成功 - if (!verifySuccess(record.getTicket())) { - throw new ServiceException(BusiStatus.CERTIFY_FAIL); - } - Users user = userService.getUsersByUid(uid); - // 如果已经实名认证过，则不给修改 2021年06月08日 - if (StringUtils.isNotBlank(user.getIdCardNum()) && StringUtils.isNotBlank(user.getRealName())) { - throw new ServiceException(BusiStatus.BUSIERROR); - } - // 如果用户之前已实名，需要删除之前的实名信息 - if (CERTIFY_RESULT_SUCCESS.equals(statusCode) && StringUtils.isNotBlank(user.getIdCardNum()) && StringUtils.isNotBlank(user.getRealName())) { - int result = deleteSuccessRecordByUidId(uid); - if (result > 0) { - int times = 1; - if (user.getCertifyModifyTimes() != null) { - times += user.getCertifyModifyTimes(); - } - user.setCertifyModifyTimes(times); - } - } - record.setBindStatus(statusCode); - record.setUpdateTime(Calendar.getInstance().getTime()); - this.userCertifyRecordMapper.updateByPrimaryKeySelective(record); - if (CERTIFY_RESULT_SUCCESS.equals(statusCode)) { - // 设置实名信息 - user.setRealName(record.getName()); - user.setIdCardNum(record.getIdCardNum()); - user.setUpdateTime(new Date()); - this.updateUsersInDBAndCache(user); - // 增加身份证绑定次数 - this.increaseBindCount(record.getIdCardNum()); - } - } - - public void updateAliyunCertResult(String ticketId) { - GetStatusRequest getStatusRequest = new GetStatusRequest(); - getStatusRequest.setBiz(AliyunRPCertifyConfig.bizCode); - getStatusRequest.setTicketId(ticketId); - int statusCode = CERTIFY_RESULT_PENDING; - try { - GetStatusResponse response = getIAcsClient().getAcsResponse(getStatusRequest); - statusCode = response.getData().getStatusCode(); - } catch (ClientException e) { - log.error("实名认证失败, ticketId={}", ticketId, e); - } - //认证通过or认证不通过 - if (CERTIFY_RESULT_SUCCESS == statusCode || CERTIFY_RESULT_FAILED == statusCode) { - GetMaterialsRequest getMaterialsRequest = new GetMaterialsRequest(); - getMaterialsRequest.setBiz(AliyunRPCertifyConfig.bizCode); - getMaterialsRequest.setTicketId(ticketId); - try { - GetMaterialsResponse response = getIAcsClient().getAcsResponse(getMaterialsRequest); - // TODO: 后续业务处理 - } catch (ClientException e) { - log.error("实名认证失败, ticketId={}", ticketId, e); - } - } - } - - /** - * 根据用户id 删除一条实名认证成功的记录 - * - * @param uid - * @return - */ - public int deleteSuccessRecordByUidId(Long uid) { - UserCertifyRecordExample example = new UserCertifyRecordExample(); - example.createCriteria().andUidEqualTo(uid).andBindStatusEqualTo(CERTIFY_RESULT_SUCCESS); - List<UserCertifyRecord> list = userCertifyRecordMapper.selectByExample(example); - if (CollectionUtils.isEmpty(list)) { - return 0; - } - UserCertifyRecord record = list.get(0); - //将状态设置为删除 - UserCertifyRecord updateRecord = new UserCertifyRecord(); - updateRecord.setRecordId(record.getRecordId()); - updateRecord.setBindStatus(RealPeopleCertifyService.CERTIFY_RESULT_DELETE); - updateRecord.setUpdateTime(new Date()); - int result = userCertifyRecordMapper.updateByPrimaryKeySelective(updateRecord); - //删除成功后，要减去绑定的次数 - if (result > 0) { - Users user = userService.getUsersByUid(record.getUid()); - user.setRealName(""); - user.setIdCardNum(""); - user.setUpdateTime(new Date()); - this.updateUsersInDBAndCache(user); - decreaseBindCount(record.getIdCardNum()); - } - return result; - } - - public String smsCodeAuth(Long uid, String phone, String code) throws Exception { - if (StringUtils.isBlank(phone) || phone.contains("*")) { - Users users = userService.getUsersByUid(uid); - phone = users.getPhone(); - } - //验证码验证 - boolean verify = smsService.verifySmsCode(phone, code); - if (!verify) { - throw new ServiceException(BusiStatus.SMSCODEERROR); - } - String text = String.format("%s,%s,%s", System.currentTimeMillis(), uid, phone); - return DESUtils.DESAndBase64UrlEncrypt(text, DESUtils.DEFAULT_SECRET_KEY); - } - - public boolean verifyAuth(Long uid, String auth) throws Exception { - String text = DESUtils.DESAndBase64UrlDecrypt(auth, DESUtils.DEFAULT_SECRET_KEY); - String[] array = text.split(","); - if (array.length < 3) { - return false; - } - long time = NumberUtils.toLong(array[0]); - Long decryptUid = NumberUtils.toLong(array[1]); - if (!decryptUid.equals(uid)) { - return false; - } - // 验证时间与本次发起请求的时候，大于10分钟，表示需要重新验证 - long sub = System.currentTimeMillis() - time; - return sub <= 10 * 60 * 1000; - } - - public boolean verifySuccess(String ticket) { - GetStatusRequest getStatusRequest = new GetStatusRequest(); - getStatusRequest.setBiz(AliyunRPCertifyConfig.bizCode); - getStatusRequest.setTicketId(ticket); - getStatusRequest.setMethod(MethodType.POST); - try { - GetStatusResponse response = getIAcsClient().getAcsResponse(getStatusRequest); - log.info("实名认证结果查询：ticket:{},response data:{}", ticket, JSON.toJSONString(response.getData())); - if (null != response && response.getData() != null) { - Integer statusCode = response.getData().getStatusCode(); - // -1: 未认证，0：认证中，1：认证通过，2：认证不通过 - if (null != statusCode && statusCode == 1) { - return true; - } - } - } catch (Exception e) { - log.error("查询实名认证结果失败：{}", ExceptionUtils.getStackTrace(e)); - } - return false; - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/certification/TwoFactorCertifyService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/certification/TwoFactorCertifyService.java deleted file mode 100644 index 1503e62e7..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/certification/TwoFactorCertifyService.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.accompany.business.service.certification; - - -import com.accompany.business.mybatismapper.UserCertifyRecordMapper; -import com.accompany.business.service.user.UsersService; -import com.accompany.common.redis.RedisKey; -import com.accompany.core.model.Users; -import com.accompany.core.util.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -; - -/** - * @author yangming - * @date 2018-12-21 - * @description 阿里云云盾身份认知（二要素） - */ -@Service -public class TwoFactorCertifyService extends AbstractCertifyService { - - @Autowired - private UsersService usersService; - @Autowired - private UserCertifyRecordMapper userCertifyRecordMapper; - - /** - * 判断用户是否已经绑定身份证号码 - * @param uid - * @return - */ - public Boolean isCertifyUser(Long uid) { - Users users = usersService.getUsersByUid(uid); - return users != null && StringUtils.isNotBlank(users.getIdCardNum()) && StringUtils.isNotBlank(users.getRealName()); - } - - /** - * 判断用户是否可以进行实名认证 - * @param uid - * @return - */ - public boolean canCertify(Long uid) { - Users users = usersService.getUsersByUid(uid); - if(users == null) { - return false; - } - // 最多只有一次修改机会 - if(users.getCertifyModifyTimes() == null || users.getCertifyModifyTimes() < 1) { - return true; - } - return false; - } - - /** - * 判断用户是否已经绑定手机号 - * @param uid - * @return - */ - public Boolean isBindPhone(Long uid) { - Users users = usersService.getUsersByUid(uid); - if (users != null && users.getPhone() != null ) { - if (users.getPhone().length()==11){ - return true; - } - } - return false; - } - - - public void increaseBindCount(String identityNum) { - String key = RedisKey.id_card_bind_user_count.getKey(); - jedisService.hincr(key,identityNum); - } -} - - diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/certification/YiDunLivePersonCertifyService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/certification/YiDunLivePersonCertifyService.java deleted file mode 100644 index 9e3ad4b46..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/certification/YiDunLivePersonCertifyService.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.accompany.business.service.certification; - -import com.accompany.business.dto.yidun.YiDunLivePersonResponseDto; -import com.accompany.common.config.YiDunCertConfig; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -/** - * @author: liaozetao - * @date: 2024/1/10 10:35 - * @description: - */ -@Slf4j -@Service -public class YiDunLivePersonCertifyService extends AbstractCertifyService { - - @Autowired - private YiDunCertConfig yiDunCertConfig; - - private YiDunLivePersonResponseDto livePersonAudit(String cardNo, String name, String token, String needAvatar, String picType, String dataId) { - return null; - } - - public String personAudit(Long uid, String username, String identityNumber, String phone, String code) { - return null; - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/certification/aliyun/FinancialFaceVerify.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/certification/aliyun/FinancialFaceVerify.java deleted file mode 100644 index 7b2539d09..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/certification/aliyun/FinancialFaceVerify.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.accompany.business.service.certification.aliyun; - -import com.accompany.common.config.AliYunFinancialFaceConfig; -import com.accompany.core.exception.ServiceException; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.aliyun.cloudauth20190307.models.DescribeFaceVerifyRequest; -import com.aliyun.cloudauth20190307.models.DescribeFaceVerifyResponse; -import com.aliyun.cloudauth20190307.models.InitFaceVerifyRequest; -import com.aliyun.cloudauth20190307.models.InitFaceVerifyResponse; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.stereotype.Component; - -@Slf4j -@Component -public class FinancialFaceVerify { - - private static final String ID_PRO = "ID_PRO"; - - private static final String IDENTITY_CARD = "IDENTITY_CARD"; - - private static final String MULTI_ACTION = "MULTI_ACTION"; - - @Autowired - private AliYunFinancialFaceConfig aliYunFinancialFaceConfig; - - public InitFaceVerifyResponse.InitFaceVerifyResponseResultObject initFaceVerify(String outerOrderNo, String certName, String certNo, String returnUrl, String metaInfo, String mobile, String ip, Long userId, Integer certType, String deviceId) { - String callbackUrl = aliYunFinancialFaceConfig.getCallbackUrl() + "?uid=" + userId + "&certType=" + certType + "&deviceId=" + deviceId; - InitFaceVerifyRequest initFaceVerifyRequest = new InitFaceVerifyRequest(); - initFaceVerifyRequest.setSceneId(aliYunFinancialFaceConfig.getSceneId()); - initFaceVerifyRequest.setOuterOrderNo(outerOrderNo); - initFaceVerifyRequest.setProductCode(ID_PRO); - initFaceVerifyRequest.setModel(MULTI_ACTION); - initFaceVerifyRequest.setCertType(IDENTITY_CARD); - initFaceVerifyRequest.setCertName(certName); - initFaceVerifyRequest.setCertNo(certNo); - initFaceVerifyRequest.setReturnUrl(returnUrl); - initFaceVerifyRequest.setMetaInfo(metaInfo); - initFaceVerifyRequest.setMobile(mobile); - initFaceVerifyRequest.setIp(ip); - initFaceVerifyRequest.setUserId(String.valueOf(userId)); - initFaceVerifyRequest.setCallbackUrl(callbackUrl); - log.info("initFaceVerify request : {}", JSONObject.toJSONString(initFaceVerifyRequest)); - FinancialFaceVerifyClient financialFaceVerifyClient = new FinancialFaceVerifyClient(aliYunFinancialFaceConfig.getAccessKeyId(), aliYunFinancialFaceConfig.getAccessKeySecret(), aliYunFinancialFaceConfig.getEndpoints()); - InitFaceVerifyResponse response = financialFaceVerifyClient.initFaceVerify(initFaceVerifyRequest); - log.info("initFaceVerify response data: {}", JSON.toJSONString(response)); - if (String.valueOf(HttpStatus.OK.value()).equals(response.getCode())) { - return response.getResultObject(); - } else { - throw new ServiceException(response.getMessage()); - } - } - - public DescribeFaceVerifyResponse.DescribeFaceVerifyResponseResultObject describeFaceVerify(String certifyId) { - try { - DescribeFaceVerifyRequest describeFaceVerifyRequest = new DescribeFaceVerifyRequest(); - describeFaceVerifyRequest.setSceneId(aliYunFinancialFaceConfig.getSceneId()); - describeFaceVerifyRequest.setCertifyId(certifyId); - log.info("describeFaceVerify describeFaceVerifyRequest : {}", JSONObject.toJSONString(describeFaceVerifyRequest)); - FinancialFaceVerifyClient financialFaceVerifyClient = new FinancialFaceVerifyClient(aliYunFinancialFaceConfig.getAccessKeyId(), aliYunFinancialFaceConfig.getAccessKeySecret(), aliYunFinancialFaceConfig.getEndpoints()); - DescribeFaceVerifyResponse response = financialFaceVerifyClient.describeFaceVerify(describeFaceVerifyRequest); - log.info("FinancialFaceVerify describeFaceVerify response data: {}", JSON.toJSONString(response)); - if (String.valueOf(HttpStatus.OK.value()).equals(response.getCode())) { - return response.getResultObject(); - } - } catch (Exception e) { - log.error(e.getMessage(), e); - } - return null; - } - -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/certification/aliyun/FinancialFaceVerifyClient.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/certification/aliyun/FinancialFaceVerifyClient.java deleted file mode 100644 index 477133020..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/certification/aliyun/FinancialFaceVerifyClient.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.accompany.business.service.certification.aliyun; - -import cn.hutool.core.util.StrUtil; -import com.aliyun.cloudauth20190307.Client; -import com.aliyun.cloudauth20190307.models.DescribeFaceVerifyRequest; -import com.aliyun.cloudauth20190307.models.DescribeFaceVerifyResponse; -import com.aliyun.cloudauth20190307.models.InitFaceVerifyRequest; -import com.aliyun.cloudauth20190307.models.InitFaceVerifyResponse; -import com.aliyun.tearpc.models.Config; -import com.aliyun.teautil.models.RuntimeOptions; -import lombok.extern.slf4j.Slf4j; -import org.springframework.http.HttpStatus; - -/** - * @author: liaozetao - * @date: 2022/12/23 18:05 - * @description: - */ -@Slf4j -public class FinancialFaceVerifyClient { - - private final String accessKeyId; - - private final String accessKeySecret; - - private final String endpoints; - - private static final int READ_TIMEOUT = 10000; - - private static final int CONNECT_TIMEOUT = 10000; - - public FinancialFaceVerifyClient(String accessKeyId, String accessKeySecret, String endpoints) { - this.accessKeyId = accessKeyId; - this.accessKeySecret = accessKeySecret; - this.endpoints = endpoints; - } - - public InitFaceVerifyResponse initFaceVerify(InitFaceVerifyRequest initFaceVerifyRequest) { - if (StrUtil.isEmpty(endpoints)) { - return null; - } - InitFaceVerifyResponse response = null; - String[] endpointArray = endpoints.split(StrUtil.COMMA); - for (String endpoint : endpointArray) { - try { - Client client = initClient(endpoint.trim()); - // 创建RuntimeObject实例并设置运行参数。 - RuntimeOptions runtime = new RuntimeOptions(); - runtime.readTimeout = READ_TIMEOUT; - runtime.connectTimeout = CONNECT_TIMEOUT; - InitFaceVerifyResponse initFaceVerifyResponse = client.initFaceVerify(initFaceVerifyRequest, runtime); - if (initFaceVerifyResponse == null) { - continue; - } - //服务端错误，切换到下个区域调用。 - if (!(String.valueOf(HttpStatus.INTERNAL_SERVER_ERROR.value()).equals(initFaceVerifyResponse.getCode()))) { - response = initFaceVerifyResponse; - break; - } - } catch (Exception e) { - log.error(e.getMessage(), e); - } - } - return response; - } - - private Client initClient(String endpoint) throws Exception { - Config config = new Config(); - config.setAccessKeyId(accessKeyId); - config.setAccessKeySecret(accessKeySecret); - config.setEndpoint(endpoint); - return new Client(config); - } - - public DescribeFaceVerifyResponse describeFaceVerify(DescribeFaceVerifyRequest describeFaceVerifyRequest) { - if (StrUtil.isEmpty(endpoints)) { - return null; - } - DescribeFaceVerifyResponse response = null; - String[] endpointArray = endpoints.split(StrUtil.COMMA); - for (String endpoint : endpointArray) { - try { - Client client = initClient(endpoint.trim()); - // 创建RuntimeObject实例并设置运行参数。 - RuntimeOptions runtime = new RuntimeOptions(); - runtime.readTimeout = READ_TIMEOUT; - runtime.connectTimeout = CONNECT_TIMEOUT; - DescribeFaceVerifyResponse describeFaceVerifyResponse = client.describeFaceVerify(describeFaceVerifyRequest, runtime); - if (describeFaceVerifyResponse == null) { - continue; - } - //服务端错误，切换到下个区域调用。 - if (!(String.valueOf(HttpStatus.INTERNAL_SERVER_ERROR.value()).equals(describeFaceVerifyResponse.getCode()))) { - response = describeFaceVerifyResponse; - break; - } - } catch (Exception e) { - log.error(e.getMessage(), e); - } - } - return response; - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/chat/PublicChatTopRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/chat/PublicChatTopRecordService.java deleted file mode 100644 index b3b34dcb8..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/chat/PublicChatTopRecordService.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.accompany.business.service.chat; - -import com.accompany.business.model.chat.PublicChatTopRecord; -import com.accompany.business.vo.chat.PublicChatTopRecordVo; -import com.accompany.sharding.vo.UserChatMsgRecordVo; -import com.baomidou.mybatisplus.extension.service.IService; - -import java.util.List; - -/** - * @author: liaozetao - * @date: 2024/5/6 14:28 - * @description: - */ -public interface PublicChatTopRecordService extends IService<PublicChatTopRecord> { - - /** - * 发送头条 - * @param content - */ - void send(String content); - - /** - * 获取头条 - * @return - */ - PublicChatTopRecordVo getTop(); - - /** - * 获取公聊大厅前50条数据 - * @return - */ - List<UserChatMsgRecordVo> getChatForTop50(); - - /** - * 定时器 - */ - void execute(); - - /** - * 获取支付金额 - * @return - */ - Integer payMoney(); - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/chat/impl/PublicChatTopRecordServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/chat/impl/PublicChatTopRecordServiceImpl.java deleted file mode 100644 index 968649798..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/chat/impl/PublicChatTopRecordServiceImpl.java +++ /dev/null @@ -1,321 +0,0 @@ -package com.accompany.business.service.chat.impl; - -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.StrUtil; -import com.accompany.business.dto.chat.PublicChatTimeConfig; -import com.accompany.business.model.UserPurse; -import com.accompany.business.model.chat.PublicChatTopRecord; -import com.accompany.business.mybatismapper.chat.PublicChatTopRecordMapper; -import com.accompany.business.service.SendSysMsgService; -import com.accompany.business.service.chat.PublicChatTopRecordService; -import com.accompany.business.service.netease.YidunCheckUtil; -import com.accompany.business.service.purse.UserPurseService; -import com.accompany.business.service.record.BillRecordService; -import com.accompany.business.service.room.RoomService; -import com.accompany.business.vo.chat.PublicChatTopRecordVo; -import com.accompany.common.constant.Constant; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.common.utils.GsonUtil; -import com.accompany.core.base.SpringContextHolder; -import com.accompany.core.base.UidContextHolder; -import com.accompany.core.enumeration.BillObjTypeEnum; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.model.PartitionInfo; -import com.accompany.core.model.Room; -import com.accompany.core.model.Users; -import com.accompany.core.service.SysConfService; -import com.accompany.core.service.common.JedisService; -import com.accompany.core.service.partition.PartitionInfoService; -import com.accompany.core.service.user.UsersBaseService; -import com.accompany.sharding.mapper.UserChatMsgRecordMapper; -import com.accompany.sharding.model.UserChatMsgRecord; -import com.accompany.sharding.vo.UserChatMsgRecordVo; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -/** - * @author: liaozetao - * @date: 2024/5/6 14:28 - * @description: - */ -@Slf4j -@Service -public class PublicChatTopRecordServiceImpl extends ServiceImpl<PublicChatTopRecordMapper, PublicChatTopRecord> implements PublicChatTopRecordService { - - @Autowired - private UserChatMsgRecordMapper userChatMsgRecordMapper; - - @Autowired - private RoomService roomService; - - @Autowired - private UsersBaseService usersBaseService; - - @Autowired - private JedisService jedisService; - - @Autowired - private SysConfService sysConfService; - - @Autowired - private PartitionInfoService partitionInfoService; - - @Autowired - private SendSysMsgService sendSysMsgService; - - @Autowired - private UserPurseService userPurseService; - - @Autowired - private BillRecordService billRecordService; - - @Override - @Transactional(rollbackFor = Exception.class) - public void send(String content) { - PublicChatTimeConfig config = sysConfService.getJsonValueById(Constant.SysConfId.PUBLIC_CHAT_TIME, PublicChatTimeConfig.class); - if (config == null) { - return; - } - if (StrUtil.isNotEmpty(content)) { - boolean descSensitive = YidunCheckUtil.checkHasSensitiveWord(content); - if (descSensitive) { - throw new ServiceException(BusiStatus.HAS_SENSITIVE); - } - } - Date now = new Date(); - Long uid = UidContextHolder.get(); - Users users = usersBaseService.getUsersByUid(uid); - if (users == null) { - return; - } - Integer partitionId = users.getPartitionId(); - PartitionInfo partitionInfo = partitionInfoService.getById(partitionId); - if (partitionInfo == null) { - return; - } - Long roomId = partitionInfo.getPublicChatRoomId(); - Room publicChatRoom = roomService.getRoomByRoomId(roomId); - //余额校验 - Integer payMoneyNum = config.getPayMoneyNum(); - UserPurse userPurse = userPurseService.queryUserPurse(uid); - double currentDiamonds = userPurse.getDiamonds(); - if (Double.compare(currentDiamonds, payMoneyNum) < 0) { - throw new ServiceException(BusiStatus.DIAMONDNUMNOTENOUGH); - } - //扣减钱包 - userPurseService.subDiamond(uid, payMoneyNum.doubleValue(), BillObjTypeEnum.PUBLIC_CHAT_TOP_OUT); - - //头条记录 - PublicChatTopRecord record = new PublicChatTopRecord(); - if (publicChatRoom != null) { - record.setRoomUid(publicChatRoom.getUid()); - } - record.setUid(uid); - record.setNick(users.getNick()); - record.setContent(content); - record.setIsTop(Constant.Yes1No0.NO); - record.setRecordStatus(Constant.Yes1No0.NO); - record.setPartitionId(partitionId); - record.setPayMoneyNum(payMoneyNum); - record.setCreateTime(now); - record.setUpdateTime(now); - save(record); - - //头条缓存 - jedisService.lpush(RedisKey.public_chat_list.getKey(partitionId.toString()), GsonUtil.getDefGson().toJson(record)); - - SpringContextHolder.getBean(PublicChatTopRecordService.class).execute(); - } - - @Override - public PublicChatTopRecordVo getTop() { - Long uid = UidContextHolder.get(); - Users users = usersBaseService.getUsersByUid(uid); - if (users == null) { - return null; - } - Integer partitionId = users.getPartitionId(); - Date now = new Date(); - List<PublicChatTopRecord> records = list(Wrappers.<PublicChatTopRecord>lambdaQuery() - .eq(PublicChatTopRecord::getIsTop, Constant.Yes1No0.YES) - .eq(PublicChatTopRecord::getRecordStatus, Constant.Yes1No0.NO) - .eq(PublicChatTopRecord::getPartitionId, partitionId) - .le(PublicChatTopRecord::getStartTime, now) - .ge(PublicChatTopRecord::getEndTime, now)); - if (CollectionUtil.isEmpty(records)) { - return null; - } - PublicChatTopRecord record = records.get(0); - PublicChatTopRecordVo vo = new PublicChatTopRecordVo(); - BeanUtils.copyProperties(record, vo); - if (record.getUid() != null) { - Users publicUser = usersBaseService.getUsersByUid(record.getUid()); - if (publicUser != null) { - vo.setErbanNo(publicUser.getErbanNo()); - vo.setNick(publicUser.getNick()); - vo.setAvatar(publicUser.getAvatar()); - } - } - return vo; - } - - @Override - public List<UserChatMsgRecordVo> getChatForTop50() { - Long uid = UidContextHolder.get(); - Users users = usersBaseService.getUsersByUid(uid); - if (users == null) { - return Collections.emptyList(); - } - Integer partitionId = users.getPartitionId(); - List<String> recordStrs = jedisService.lrange(RedisKey.public_chat_top_list.getKey(String.valueOf(partitionId)), 0, -1L); - if (CollectionUtil.isNotEmpty(recordStrs)) { - List<UserChatMsgRecordVo> records = new ArrayList<>(); - for (String recordStr : recordStrs) { - records.add(GsonUtil.getGson().fromJson(recordStr, UserChatMsgRecordVo.class)); - } - return records; - } - String yearMonth = DateTimeUtil.convertDate(new Date(), DateTimeUtil.DATE_FORMAT_YEAR_MONTH); - PartitionInfo partitionInfo = partitionInfoService.getById(partitionId); - if (partitionInfo == null) { - return Collections.emptyList(); - } - Long publicChatRoomId = partitionInfo.getPublicChatRoomId(); - List<UserChatMsgRecord> records = userChatMsgRecordMapper.getMsgRecordsForTop50(yearMonth, publicChatRoomId, partitionId); - if (CollectionUtil.isEmpty(records)) { - return Collections.emptyList(); - } - List<UserChatMsgRecordVo> userChatMsgRecordVos = new ArrayList<>(); - for (UserChatMsgRecord record : records) { - Long fromUid = record.getFromUid(); - Users fromUser = usersBaseService.getUsersByUid(fromUid); - UserChatMsgRecordVo userChatMsgRecordVo = new UserChatMsgRecordVo(); - BeanUtils.copyProperties(record, userChatMsgRecordVo); - if (fromUser != null) { - userChatMsgRecordVo.setFromAvatar(fromUser.getAvatar()); - userChatMsgRecordVo.setFromNick(fromUser.getNick()); - } - userChatMsgRecordVos.add(userChatMsgRecordVo); - } - jedisService.rpushList(RedisKey.public_chat_top_list.getKey(String.valueOf(partitionId)), userChatMsgRecordVos.stream().map(v -> GsonUtil.getGson().toJson(v)).collect(Collectors.toList())); - jedisService.expire(RedisKey.public_chat_top_list.getKey(String.valueOf(partitionId)), 3 * 60); - return userChatMsgRecordVos; - } - - @Async - @Override - public void execute() { - log.info("==== 发布头条 start ===="); - try { - PublicChatTimeConfig config = sysConfService.getJsonValueById(Constant.SysConfId.PUBLIC_CHAT_TIME, PublicChatTimeConfig.class); - if (config == null) { - return; - } - Integer oneTime = config.getOne(); - Integer processTime = config.getProcess(); - if (oneTime == null || processTime == null) { - return; - } - Date now = new Date(); - List<PartitionInfo> partitionInfoList = partitionInfoService.listAll(); - for (PartitionInfo partitionInfo : partitionInfoList) { - Long publicChatRoomId = partitionInfo.getPublicChatRoomId(); - Room publicChatRoom = roomService.getRoomByRoomId(publicChatRoomId); - Integer partitionId = partitionInfo.getId(); - String redisKey = RedisKey.public_chat_list.getKey(partitionId.toString()); - Long size = jedisService.llen(redisKey); - boolean isExpire = false; - PublicChatTopRecord publicChatTopRecord = null; - List<PublicChatTopRecord> publicChatTopRecords = list(Wrappers.<PublicChatTopRecord>lambdaQuery() - .eq(PublicChatTopRecord::getIsTop, Constant.Yes1No0.YES) - .eq(PublicChatTopRecord::getRecordStatus, Constant.Yes1No0.NO) - .eq(PublicChatTopRecord::getPartitionId, partitionId)); - if (CollectionUtil.isNotEmpty(publicChatTopRecords)) { - publicChatTopRecord = publicChatTopRecords.get(0); - Date startTime = publicChatTopRecord.getStartTime(); - Date endTime = publicChatTopRecord.getEndTime(); - if (size > 0) { - List<String> first = jedisService.lrange(redisKey, size - 1, size - 1); - if (CollectionUtil.isNotEmpty(first)) { - PublicChatTopRecord record = GsonUtil.getDefGson().fromJson(first.get(0), PublicChatTopRecord.class); - startTime = record.getCreateTime(); - } - } - if ((size > 0 && now.before(new Date(startTime.getTime() + processTime * 1000))) || (size == 0 && endTime.after(now))) { - continue; - } else { - publicChatTopRecord.setRecordStatus(Constant.Yes1No0.YES); - updateById(publicChatTopRecord); - isExpire = true; - } - } - if (size == 0) { - if (isExpire) { - PublicChatTopRecordVo vo = new PublicChatTopRecordVo(); - BeanUtils.copyProperties(publicChatTopRecord, vo); - if (publicChatTopRecord.getUid() != null) { - Users publicUser = usersBaseService.getUsersByUid(publicChatTopRecord.getUid()); - if (publicUser != null) { - vo.setErbanNo(publicUser.getErbanNo()); - vo.setNick(publicUser.getNick()); - vo.setAvatar(publicUser.getAvatar()); - } - } - sendSysMsgService.sendSingleRoomMessage(publicChatRoom, Constant.DefMsgType.PUBLIC_CHATROOM, Constant.DefMsgType.PUBLIC_CHATROOM_TOP, vo); - } - continue; - } else { - String recordStr = jedisService.rpop(redisKey); - if (StrUtil.isNotEmpty(recordStr)) { - publicChatTopRecord = GsonUtil.getDefGson().fromJson(recordStr, PublicChatTopRecord.class); - Date endTime = new Date(now.getTime() + oneTime * 1000); - publicChatTopRecord.setStartTime(now); - publicChatTopRecord.setEndTime(endTime); - publicChatTopRecord.setIsTop(Constant.Yes1No0.YES); - updateById(publicChatTopRecord); - log.info("uid : {}, content : {}, 头条置顶...", publicChatTopRecord.getUid(), publicChatTopRecord.getContent()); - } - } - PublicChatTopRecordVo vo = new PublicChatTopRecordVo(); - if (publicChatTopRecord != null) { - BeanUtils.copyProperties(publicChatTopRecord, vo); - if (publicChatTopRecord.getUid() != null) { - Users publicUser = usersBaseService.getUsersByUid(publicChatTopRecord.getUid()); - if (publicUser != null) { - vo.setErbanNo(publicUser.getErbanNo()); - vo.setNick(publicUser.getNick()); - vo.setAvatar(publicUser.getAvatar()); - } - } - } - sendSysMsgService.sendSingleRoomMessage(publicChatRoom, Constant.DefMsgType.PUBLIC_CHATROOM, Constant.DefMsgType.PUBLIC_CHATROOM_TOP, vo); - } - } catch (Exception e) { - log.error(e.getMessage(), e); - } - log.info("==== 发布头条 end ===="); - } - - @Override - public Integer payMoney() { - PublicChatTimeConfig config = sysConfService.getJsonValueById(Constant.SysConfId.PUBLIC_CHAT_TIME, PublicChatTimeConfig.class); - if (config == null) { - return 0; - } - return config.getPayMoneyNum(); - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/exchange/WithdrawAccountService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/exchange/WithdrawAccountService.java deleted file mode 100644 index 964146344..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/exchange/WithdrawAccountService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.accompany.business.service.exchange; - -import com.accompany.business.model.WithdrawAccount; -import com.accompany.business.mybatismapper.WithdrawAccountMapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -@Slf4j -@Service -public class WithdrawAccountService extends ServiceImpl<WithdrawAccountMapper, WithdrawAccount> { - - - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/exchange/WithdrawRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/exchange/WithdrawRecordService.java deleted file mode 100644 index 168a9e563..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/exchange/WithdrawRecordService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.accompany.business.service.exchange; - -import com.accompany.business.model.WithdrawRecord; -import com.accompany.business.mybatismapper.WithdrawRecordMapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -@Slf4j -@Service -public class WithdrawRecordService extends ServiceImpl<WithdrawRecordMapper, WithdrawRecord> { - - - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/exchange/WithdrawService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/exchange/WithdrawService.java deleted file mode 100644 index e2969e41d..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/exchange/WithdrawService.java +++ /dev/null @@ -1,190 +0,0 @@ -package com.accompany.business.service.exchange; - -import com.accompany.business.dto.exchange.WithdrawConfigDto; -import com.accompany.business.model.UserPurse; -import com.accompany.business.model.WithdrawAccount; -import com.accompany.business.model.WithdrawRecord; -import com.accompany.business.model.clan.Clan; -import com.accompany.business.service.clan.ClanService; -import com.accompany.business.service.purse.UserPurseService; -import com.accompany.business.service.record.BillRecordService; -import com.accompany.business.service.user.UsersService; -import com.accompany.business.vo.exchange.WithdrawAccountVo; -import com.accompany.common.constant.Constant; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.CronExpression; -import com.accompany.core.enumeration.BillObjTypeEnum; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.model.Users; -import com.accompany.core.service.SysConfService; -import com.accompany.core.util.DateUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.incrementer.DefaultIdentifierGenerator; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.fasterxml.jackson.databind.ObjectMapper; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.StringUtils; - -import java.io.IOException; -import java.math.BigDecimal; -import java.text.ParseException; -import java.util.Date; - -@Slf4j -@Service -public class WithdrawService { - - @Autowired - private ObjectMapper objectMapper; - @Autowired - private SysConfService sysConfService; - @Autowired - private UsersService usersService; - @Autowired - private BillRecordService billRecordService; - @Autowired - private WithdrawAccountService accountService; - @Autowired - private WithdrawRecordService recordService; - @Autowired - private UserPurseService userPurseService; - @Autowired - private ClanService clanService; - - public WithdrawAccountVo buildVo(Long uid) { - WithdrawConfigDto config = checkClanAndGetConfig(uid); - - WithdrawAccountVo vo = new WithdrawAccountVo(); - vo.setFee(config.getFee()); - vo.setMinGolds(config.getMin()); - vo.setMaxGolds(config.getMax()); - - WithdrawAccount account = accountService.getById(uid); - vo.setAccount(account); - - UserPurse userPurse = userPurseService.queryUserPurse(uid); - vo.setGolds(userPurse.getGolds()); - - vo.setRemainTimes(getRemainTimes(uid, config.getTimes())); - - Users users = usersService.getUsersByUid(uid); - vo.setHasPayPwd(null != users && StringUtils.hasText(users.getPaymentPwd())); - - return vo; - } - - private Integer getRemainTimes(Long uid, Integer weekTimes) { - Date now = new Date(); - Date weekStart = DateUtil.beginOfWeek(now); - Date weekEnd = DateUtil.endOfWeek(now); - LambdaQueryWrapper<WithdrawRecord> wrapper = Wrappers.lambdaQuery(); - wrapper.between(WithdrawRecord::getCreateTime, weekStart, weekEnd).eq(WithdrawRecord::getUid, uid); - int weekHasTimes = (int) recordService.count(wrapper); - return Math.max(weekTimes - weekHasTimes, 0); - } - - public void bound(WithdrawAccount account) { - Date now = new Date(); - account.setUpdateTime(now); - - WithdrawAccount db = accountService.getById(account.getUid()); - if (null == db){ - accountService.save(account); - } else { - account.setCreateTime(now); - accountService.updateById(account); - } - } - - @Transactional(rollbackFor = Exception.class) - public void withdraw(Long uid, Double goldNum, String payPwd) { - WithdrawConfigDto config = checkClanAndGetConfig(uid); - if (Double.compare(config.getMin(), goldNum) > 0){ - throw new ServiceException(BusiStatus.WITHDRAW_NUM_LESS, String.format(BusiStatus.WITHDRAW_NUM_LESS.getReasonPhrase(), config.getMin())); - } - if (Double.compare(config.getMax(), goldNum) < 0){ - throw new ServiceException(BusiStatus.WITHDRAW_NUM_MORE, String.format(BusiStatus.WITHDRAW_NUM_MORE.getReasonPhrase(), config.getMax())); - } - - WithdrawAccount account = accountService.getById(uid); - if (null == account){ - throw new ServiceException(BusiStatus.UN_BOUND_WITHDRAW_ACCOUNT); - } - - Users users = usersService.getUsersByUid(uid); - if (null == users){ - throw new ServiceException(BusiStatus.USERNOTEXISTS); - } - - if (getRemainTimes(uid, config.getTimes()) <= 0){ - throw new ServiceException(BusiStatus.WEEK_WITHDRAW_TIMES_OVER); - } - - usersService.checkPaymentPwd(uid, payPwd, true); - - long recordId = DefaultIdentifierGenerator.getInstance().nextId(null); - String recordIdStr = String.valueOf(recordId); - - userPurseService.subGold(uid, goldNum, BillObjTypeEnum.WITHDRAW, BusiStatus.WITHDRAW_NOT_ENOUGH_GOLD, - (userPurse)-> billRecordService.insertGeneralBillRecord(uid, recordIdStr, BillObjTypeEnum.WITHDRAW, goldNum, userPurse)); - - Double actualGolds = BigDecimal.valueOf(goldNum).multiply(BigDecimal.valueOf(1d - config.getFee())).doubleValue(); - Date now = new Date(); - - WithdrawRecord record = new WithdrawRecord(); - record.setUid(uid); - record.setGolds(goldNum); - record.setFee(config.getFee()); - record.setActualGolds(actualGolds); - record.setSwift(account.getSwift()); - record.setBankName(account.getBankName()); - record.setAccountNumber(account.getAccountNumber()); - record.setAccountName(account.getAccountName()); - record.setAddress(account.getAddress()); - record.setCity(account.getCity()); - record.setProvince(account.getProvince()); - record.setPostCode(account.getPostCode()); - record.setRemark(BillObjTypeEnum.WITHDRAW.getDesc()); - record.setStatus(Constant.WithDrawStatus.ing); - record.setCreateTime(now); - record.setUpdateTime(now); - record.setOperator(users.getNick()); - recordService.save(record); - - log.error("[金币提现] {} 提现金币数 {} 费率 {} 成功", uid, goldNum, config.getFee()); - } - - private WithdrawConfigDto checkClanAndGetConfig(Long uid) { - Clan clan = clanService.getByClanElderUid(uid); - if (null == clan){ - throw new ServiceException(BusiStatus.ONLY_CLAN_ELDER_CAN_WITHDRAW); - } - - String configStr = sysConfService.getSysConfValueById(Constant.SysConfId.WITHDRAWAL_CONFIG); - if (!StringUtils.hasText(configStr)){ - log.error("[金币提现] 配置为空 {}", Constant.SysConfId.WITHDRAWAL_CONFIG); - throw new ServiceException(BusiStatus.SERVERBUSY); - } - WithdrawConfigDto config = null; - try { - config = objectMapper.readValue(configStr, WithdrawConfigDto.class); - Date now = new Date(); - CronExpression cronExpression = new CronExpression(config.getCron()); - if (!cronExpression.isSatisfiedBy(now)){ - throw new ServiceException(BusiStatus.NOT_IN_WITHDRAW_TIME, config.getTimeTips()); - } - - } catch (IOException e) { - log.error("[金币提现] 获取配置异常 {}", Constant.SysConfId.WITHDRAWAL_CONFIG); - throw new ServiceException(BusiStatus.SERVERBUSY); - } catch (ParseException e) { - log.error("[金币提现] 解析cron表达式异常 {}", config.getCron(), e); - throw new ServiceException(BusiStatus.SERVERBUSY); - } - return config; - } - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gamepartner/GamePartnerInfoService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gamepartner/GamePartnerInfoService.java deleted file mode 100644 index a47787bfd..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gamepartner/GamePartnerInfoService.java +++ /dev/null @@ -1,132 +0,0 @@ -package com.accompany.business.service.gamepartner; - -import com.accompany.business.model.gamepartner.GamePartnerInfo; -import com.accompany.business.model.gamepartner.GamePartnerInfoTag; -import com.accompany.business.model.gamepartner.UserGamePartnerInfo; -import com.accompany.business.mybatismapper.gamepartner.GamePartnerInfoMapper; -import com.accompany.business.mybatismapper.gamepartner.UserGamePartnerInfoMapper; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.AdminServiceException; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; -import org.redisson.api.RMap; -import org.redisson.api.RedissonClient; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; -import org.springframework.util.StringUtils; - -import java.util.*; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; - -@Service -@Slf4j -public class GamePartnerInfoService implements InitializingBean { - - @Autowired - private RedissonClient redissonClient; - @Autowired - private GamePartnerInfoMapper gamePartnerInfoMapper; - @Autowired - private UserGamePartnerInfoMapper userGamePartnerInfoMapper; - - private RMap<Integer, GamePartnerInfo> cacheMap; - - public Page<GamePartnerInfo> pageGamePartnerInfo(String gameName, int page, int pageSize) { - Page<GamePartnerInfo> pageInfo = new Page<>(page, pageSize); - LambdaQueryWrapper<GamePartnerInfo> queryWrapper = Wrappers.<GamePartnerInfo>lambdaQuery() - .like(StringUtils.hasText(gameName), GamePartnerInfo::getGameName, gameName); - gamePartnerInfoMapper.selectPage(pageInfo, queryWrapper); - return pageInfo; - } - - public List<GamePartnerInfo> listAllGamePartnerInfo(){ - Map<Integer, GamePartnerInfo> cache = cacheMap.readAllMap(); - if (!CollectionUtils.isEmpty(cache)){ - return cache.values().stream().sorted(Comparator.comparing(GamePartnerInfo::getGameId)).collect(Collectors.toList()); - } - return cacheGamePartnerInfoFromDb(); - } - - public GamePartnerInfo getGamePartnerInfo(Integer gameId){ - GamePartnerInfo cache = cacheMap.get(gameId); - if (null != cache){ - return cache; - } - List<GamePartnerInfo> dbList = cacheGamePartnerInfoFromDb(); - if (CollectionUtils.isEmpty(dbList)){ - return null; - } - return dbList.stream().filter(g->gameId.equals(g.getGameId())) - .findAny() - .orElse(null); - } - - public Map<Integer, GamePartnerInfo> mapGamePartnerInfo(Set<Integer> gameIds){ - Map<Integer, GamePartnerInfo> cache = cacheMap.getAll(gameIds); - if (!CollectionUtils.isEmpty(cache)){ - return cache; - } - List<GamePartnerInfo> dbList = cacheGamePartnerInfoFromDb(); - if (CollectionUtils.isEmpty(dbList)){ - return Collections.EMPTY_MAP; - } - return dbList.stream().filter(g->gameIds.contains(g.getGameId())) - .collect(Collectors.toMap(GamePartnerInfo::getGameId, g->g)); - } - - private List<GamePartnerInfo> cacheGamePartnerInfoFromDb(){ - QueryWrapper<GamePartnerInfo> queryWrapper = Wrappers.query(); - List<GamePartnerInfo> dbList = gamePartnerInfoMapper.selectList(queryWrapper); - if (!CollectionUtils.isEmpty(dbList)){ - cacheMap.putAll(dbList.stream().collect(Collectors.toMap(GamePartnerInfo::getGameId, g->g))); - cacheMap.expire(5, TimeUnit.SECONDS); - } - return dbList; - } - - @Override - public void afterPropertiesSet() throws Exception { - cacheMap = redissonClient.getMap(RedisKey.game_partner_info.getKey()); - } - - @Transactional - public void delGame(int gameId) { - gamePartnerInfoMapper.deleteById(gameId); - - UpdateWrapper<UserGamePartnerInfo> updateWrapper = Wrappers.update(); - updateWrapper.lambda().eq(UserGamePartnerInfo::getGameId, gameId); - userGamePartnerInfoMapper.delete(updateWrapper); - } - - public void saveGame(GamePartnerInfo game) { - if (null == game || !StringUtils.hasText(game.getGameName()) - || !StringUtils.hasText(game.getLogo()) - || !StringUtils.hasText(game.getBackground()) - || !StringUtils.hasText(game.getPic())) { - throw new AdminServiceException(BusiStatus.PARAMERROR); - } - - if (game.getGameName().length() > 10){ - throw new AdminServiceException("游戏名称超过10个字符"); - } - - //预设 - List<GamePartnerInfoTag> tagList = new ArrayList<>(); - game.setTags(tagList); - - if (null == game.getGameId()){ - gamePartnerInfoMapper.insert(game); - } else { - gamePartnerInfoMapper.updateById(game); - } - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gamepartner/GamePartnerOrderService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gamepartner/GamePartnerOrderService.java deleted file mode 100644 index 6b66af240..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gamepartner/GamePartnerOrderService.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.accompany.business.service.gamepartner; - -import com.accompany.business.model.gamepartner.GamePartnerOrder; -import com.accompany.business.vo.gamepartner.GamePartnerOrderVo; -import com.baomidou.mybatisplus.extension.service.IService; - -import java.math.BigDecimal; -import java.util.List; -import java.util.Map; - -/** - * @author: liaozetao - * @date: 2023/8/21 14:31 - * @description: - */ -public interface GamePartnerOrderService extends IService<GamePartnerOrder> { - - /** - * 发起邀请 - * - * @param uid - * @param gameUid - * @param gameId - * @param inning - */ - void submit(Long uid, Long gameUid, Integer gameId, Integer inning); - - /** - * 订单记录 - * - * @param uid - * @param searchType - * @param currSize - * @param pageSize - * @return - */ - List<GamePartnerOrderVo> record(Long uid, Integer searchType, Integer currSize, Integer pageSize); - - /** - * 点单流水 - * - * @param uidList - * @return - */ - Map<Long, BigDecimal> getGameOrderAmountByUid(List<Long> uidList, String startTime, String endTime); - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gamepartner/GamePartnerUserService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gamepartner/GamePartnerUserService.java deleted file mode 100644 index 840c47e17..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gamepartner/GamePartnerUserService.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.accompany.business.service.gamepartner; - -import com.accompany.business.model.gamepartner.UserGamePartner; -import com.accompany.business.model.gamepartner.UserGamePartnerInfo; -import com.accompany.business.mybatismapper.gamepartner.UserGamePartnerMapper; -import com.accompany.business.service.user.UsersService; -import com.accompany.business.vo.gamepartner.GamePartnerUserInfoVo; -import com.accompany.business.vo.gamepartner.UserGamePartnerInfoVo; -import com.accompany.core.model.Users; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.util.Collections; -import java.util.Comparator; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -@Service -public class GamePartnerUserService { - - @Autowired - private UsersService usersService; - @Autowired - private UserGamePartnerMapper userGamePartnerMapper; - @Autowired - private UserGamePartnerInfoService userGamePartnerInfoService; - - public Page<GamePartnerUserInfoVo> pageUserGamePartnerInfo(Long uid, int page, int pageSize) { - Page<GamePartnerUserInfoVo> voPageInfo = new Page<>(page, pageSize); - if (!userGamePartnerInfoService.hasGamePartner()){ - return voPageInfo; - } - - Users me = usersService.getNotNullUsersByUid(uid); - - Page<UserGamePartner> poPageInfo = new Page<>(page, pageSize); - userGamePartnerMapper.selectPageByPartitionId(poPageInfo, me.getPartitionId()); - if (CollectionUtils.isEmpty(poPageInfo.getRecords())){ - return voPageInfo; - } - - List<Long> uidList = poPageInfo.getRecords().stream().map(UserGamePartner::getUid).distinct().collect(Collectors.toList()); - List<GamePartnerUserInfoVo> voList = listUserGamePartnerInfo(uidList); - voPageInfo.setTotal(poPageInfo.getTotal()); - voPageInfo.setRecords(voList); - return voPageInfo; - } - - public List<GamePartnerUserInfoVo> listUserGamePartnerInfo(List<Long> uidList) { - QueryWrapper<UserGamePartnerInfo> queryWrapper = Wrappers.query(); - queryWrapper.lambda().in(UserGamePartnerInfo::getUid, uidList); - List<UserGamePartnerInfo> dbList = userGamePartnerInfoService.list(queryWrapper); - if (CollectionUtils.isEmpty(dbList)) { - return Collections.emptyList(); - } - List<UserGamePartnerInfoVo> voList = userGamePartnerInfoService.toVoList(dbList); - Map<Long, List<UserGamePartnerInfoVo>> voListMap = voList.stream().collect(Collectors.groupingBy(UserGamePartnerInfoVo::getUid)); - Map<Long, Users> usersMap = usersService.getUsersMapByUids(uidList); - return uidList.stream().map(uid->{ - GamePartnerUserInfoVo vo = new GamePartnerUserInfoVo(); - vo.setUid(uid); - - Users u = usersMap.get(uid); - if (null != u){ - BeanUtils.copyProperties(u, vo); - } - - List<UserGamePartnerInfoVo> gamePartnerInfoVoList = voListMap.get(uid); - if (!CollectionUtils.isEmpty(gamePartnerInfoVoList)){ - Collections.sort(gamePartnerInfoVoList, Comparator.comparing(UserGamePartnerInfoVo::getSeq)); - } - vo.setGamePartnerInfoList(gamePartnerInfoVoList); - - return vo; - }).collect(Collectors.toList()); - } - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gamepartner/UserGamePartnerInfoService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gamepartner/UserGamePartnerInfoService.java deleted file mode 100644 index 6c3f97e93..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gamepartner/UserGamePartnerInfoService.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.accompany.business.service.gamepartner; - -import cn.hutool.core.collection.CollectionUtil; -import com.accompany.business.model.gamepartner.GamePartnerInfo; -import com.accompany.business.model.gamepartner.UserGamePartnerInfo; -import com.accompany.business.mybatismapper.gamepartner.UserGamePartnerInfoMapper; -import com.accompany.business.vo.gamepartner.UserGamePartnerInfoVo; -import com.accompany.common.constant.Constant; -import com.accompany.core.service.SysConfService; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; -import org.springframework.util.StringUtils; - -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - -@Service -@Slf4j -public class UserGamePartnerInfoService extends ServiceImpl<UserGamePartnerInfoMapper, UserGamePartnerInfo> { - - @Autowired - private SysConfService sysConfService; - @Autowired - private UserGamePartnerService userGamePartnerService; - - @Autowired - private UserGamePartnerInfoMapper userGamePartnerInfoMapper; - @Autowired - private GamePartnerInfoService gamePartnerInfoService; - - public boolean hasGamePartner() { - String configStr = sysConfService.getSysConfValueById(Constant.SysConfId.GAME_PARTNER_SWITCH); - if (!StringUtils.hasText(configStr)) { - return Boolean.FALSE; - } - return Boolean.parseBoolean(configStr); - } - - public boolean hasGamePartner(Long uid) { - return hasGamePartner() && userGamePartnerService.hasGamePartner(uid); - } - - public List<UserGamePartnerInfoVo> listUserGamePartnerInfo(Long uid) { - if (!hasGamePartner(uid)) { - return null; - } - - QueryWrapper<UserGamePartnerInfo> queryWrapper = Wrappers.query(); - queryWrapper.lambda().eq(UserGamePartnerInfo::getUid, uid); - List<UserGamePartnerInfo> dbList = userGamePartnerInfoMapper.selectList(queryWrapper); - if (CollectionUtils.isEmpty(dbList)) { - return null; - } - return toVoList(dbList); - } - - public List<UserGamePartnerInfoVo> toVoList(List<UserGamePartnerInfo> dbList) { - Set<Integer> gameIds = dbList.stream().map(UserGamePartnerInfo::getGameId).collect(Collectors.toSet()); - Map<Integer, GamePartnerInfo> gamePartnerInfoMap = gamePartnerInfoService.mapGamePartnerInfo(gameIds); - return dbList.stream().map(userInfo -> { - GamePartnerInfo gameInfo = gamePartnerInfoMap.get(userInfo.getGameId()); - return new UserGamePartnerInfoVo(userInfo, gameInfo); - }).collect(Collectors.toList()); - } - - public UserGamePartnerInfoVo getUserGamePartnerInfo(Long uid, Integer gameId) { - if (!hasGamePartner(uid)) { - return null; - } - - QueryWrapper<UserGamePartnerInfo> queryWrapper = Wrappers.query(); - queryWrapper.lambda().eq(UserGamePartnerInfo::getUid, uid) - .eq(UserGamePartnerInfo::getGameId, gameId); - List<UserGamePartnerInfo> userGamePartnerInfoList = userGamePartnerInfoMapper.selectList(queryWrapper); - if (CollectionUtil.isEmpty(userGamePartnerInfoList)) { - return null; - } - UserGamePartnerInfo db = userGamePartnerInfoList.get(0); - if (null == db) { - return null; - } - GamePartnerInfo gameInfo = gamePartnerInfoService.getGamePartnerInfo(db.getGameId()); - return new UserGamePartnerInfoVo(db, gameInfo); - } - - public List<UserGamePartnerInfoVo> listUserGamePartnerInfo(List<Long> uidList) { - return listUserGamePartnerInfo(uidList, null); - } - - public List<UserGamePartnerInfoVo> listUserGamePartnerInfo(List<Long> uidList, Integer gameId) { - QueryWrapper<UserGamePartnerInfo> queryWrapper = Wrappers.query(); - queryWrapper.lambda() - .in(UserGamePartnerInfo::getUid, uidList) - .eq(gameId != null, UserGamePartnerInfo::getGameId, gameId); - List<UserGamePartnerInfo> dbList = userGamePartnerInfoMapper.selectList(queryWrapper); - if (CollectionUtils.isEmpty(dbList)) { - return null; - } - return toVoList(dbList); - } - - @Async - public void updateFinishNum(Long uid, Integer gameId) { - userGamePartnerInfoMapper.updateFinishNum(uid, gameId); - } - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gamepartner/UserGamePartnerService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gamepartner/UserGamePartnerService.java deleted file mode 100644 index 482fa0138..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gamepartner/UserGamePartnerService.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.accompany.business.service.gamepartner; - -import com.accompany.business.model.gamepartner.UserGamePartner; -import com.accompany.business.mybatismapper.gamepartner.UserGamePartnerMapper; -import com.accompany.common.constant.Constant; -import com.accompany.common.redis.RedisKey; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import lombok.extern.slf4j.Slf4j; -import org.redisson.api.RMap; -import org.redisson.api.RedissonClient; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - -@Service -@Slf4j -public class UserGamePartnerService implements InitializingBean { - - @Autowired - private RedissonClient redissonClient; - @Autowired - private UserGamePartnerMapper mapper; - - private RMap<Long, UserGamePartner> cacheMap; - - public boolean hasGamePartner(Long uid){ - UserGamePartner config = cacheMap.get(uid); - return null != config && Constant.StatusV2.valid.equals(config.getStatus()); - } - - public List<Long> listHasGamePartnerUids(List<Long> uidList){ - Set<Long> keySet = new HashSet<>(uidList); - Map<Long, UserGamePartner> cache = cacheMap.getAll(keySet); - return cache.values().stream().filter(c->Constant.StatusV2.valid.equals(c.getStatus())) - .map(UserGamePartner::getUid) - .collect(Collectors.toList()); - } - - public void freshCache(){ - QueryWrapper<UserGamePartner> queryWrapper = Wrappers.query(); - queryWrapper.lambda().eq(UserGamePartner::getStatus, Constant.StatusV2.valid); - List<UserGamePartner> dbList = mapper.selectList(queryWrapper); - - cacheMap.clear(); - - if (!CollectionUtils.isEmpty(dbList)){ - Map<Long, UserGamePartner> cache = dbList.stream().collect(Collectors.toMap(UserGamePartner::getUid, d->d)); - cacheMap.putAll(cache); - } - } - - @Override - public void afterPropertiesSet() throws Exception { - cacheMap = redissonClient.getMap(RedisKey.user_game_partner.getKey()); - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gamepartner/impl/GamePartnerOrderServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gamepartner/impl/GamePartnerOrderServiceImpl.java deleted file mode 100644 index 79912f2b9..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gamepartner/impl/GamePartnerOrderServiceImpl.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.accompany.business.service.gamepartner.impl; - -import cn.hutool.core.collection.CollectionUtil; -import com.accompany.business.dto.gamepartner.GameOrderAmountDto; -import com.accompany.business.enums.gamepartner.OrderStatusEnum; -import com.accompany.business.event.gamepartner.GamePartnerFinishEvent; -import com.accompany.business.event.gamepartner.GamePartnerInviteEvent; -import com.accompany.business.model.gamepartner.GamePartnerOrder; -import com.accompany.business.mybatismapper.gamepartner.GamePartnerOrderMapper; -import com.accompany.business.service.gamepartner.GamePartnerOrderService; -import com.accompany.business.service.gamepartner.UserGamePartnerInfoService; -import com.accompany.business.service.purse.UserPurseService; -import com.accompany.business.service.record.BillRecordService; -import com.accompany.business.vo.gamepartner.GamePartnerOrderVo; -import com.accompany.business.vo.gamepartner.UserGamePartnerInfoVo; -import com.accompany.common.utils.UUIDUtil; -import com.accompany.core.base.SpringContextHolder; -import com.accompany.core.enumeration.BillObjTypeEnum; -import com.accompany.core.exception.ServiceException; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.math.BigDecimal; -import java.util.Collections; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -/** - * @author: liaozetao - * @date: 2023/8/21 14:32 - * @description: - */ -@Slf4j -@Service -public class GamePartnerOrderServiceImpl extends ServiceImpl<GamePartnerOrderMapper, GamePartnerOrder> implements GamePartnerOrderService { - - @Autowired - private UserGamePartnerInfoService userGamePartnerInfoService; - @Autowired - @Lazy - private UserPurseService userPurseService; - @Autowired - private BillRecordService billRecordService; - - @Transactional(rollbackFor = Exception.class) - @Override - public void submit(Long uid, Long gameUid, Integer gameId, Integer inning) { - if (inning <= 0) { - throw new ServiceException("局數不能小於零"); - } - UserGamePartnerInfoVo userGamePartnerInfo = userGamePartnerInfoService.getUserGamePartnerInfo(gameUid, gameId); - if (null == userGamePartnerInfo) { - throw new ServiceException("缺少遊戲"); - } - //单价 - Long price = userGamePartnerInfo.getPrice(); - //金额 - BigDecimal amount = BigDecimal.valueOf(price).multiply(BigDecimal.valueOf(inning)); - userPurseService.subDiamond(uid, amount.doubleValue(), BillObjTypeEnum.GAME_PARTNER_DIAMOND_OUT, - (userPurse)-> billRecordService.insertGeneralBillRecord(uid, gameUid, BillObjTypeEnum.GAME_PARTNER_DIAMOND_OUT, amount.doubleValue(), userPurse)); - - Date now = new Date(); - //游戏开黑点单 - GamePartnerOrder order = new GamePartnerOrder(); - order.setOrderNo(UUIDUtil.get()); - order.setFromUid(uid); - order.setToUid(gameUid); - order.setGameId(gameId); - order.setInning(inning); - order.setPrice(price); - order.setAmount(amount); - order.setStatus(OrderStatusEnum.FINISH.ordinal()); - order.setCreateTime(now); - order.setUpdateTime(now); - save(order); - - //发布游戏开黑事件(发起邀请) - SpringContextHolder.getApplicationContext().publishEvent(new GamePartnerInviteEvent(order)); - //发布游戏开黑事件(完成订单) - SpringContextHolder.getApplicationContext().publishEvent(new GamePartnerFinishEvent(order)); - } - - @Override - public List<GamePartnerOrderVo> record(Long uid, Integer searchType, Integer currSize, Integer pageSize) { - Page<GamePartnerOrderVo> pageInfo = new Page<>(currSize, pageSize); - baseMapper.record(pageInfo, uid, searchType); - return pageInfo.getRecords(); - } - - @Override - public Map<Long, BigDecimal> getGameOrderAmountByUid(List<Long> uidList, String startTime, String endTime) { - List<GameOrderAmountDto> amounts = baseMapper.getGameOrderAmountByUid(uidList, startTime, endTime); - if (CollectionUtil.isEmpty(amounts)) { - return Collections.emptyMap(); - } - return amounts.stream().collect(Collectors.toMap(GameOrderAmountDto::getUid, GameOrderAmountDto::getAmount)); - } - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/mycard/MyCardBizService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/mycard/MyCardBizService.java deleted file mode 100644 index 3b9a7fdaa..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/mycard/MyCardBizService.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.accompany.business.service.mycard; - -import com.accompany.payment.mycard.dto.CallbackDto; -import com.accompany.payment.mycard.dto.ReplenishDto; -import com.accompany.payment.mycard.resp.QueryOrderResp; - -import java.util.Date; -import java.util.List; - -/** - * @author: liaozetao - * @date: 2023/12/26 14:08 - * @description: - */ -public interface MyCardBizService { - - /** - * 补单 - * - * @param replenishDto - */ - void replenish(ReplenishDto replenishDto); - - /** - * 订单查询 - * - * @param startTime - * @param endTime - * @param myCardTradeNo - * @return - */ - List<QueryOrderResp> query(Date startTime, Date endTime, String myCardTradeNo); - - /** - * 支付回调 - * - * @param callbackDto - * @return - */ - String callback(CallbackDto callbackDto); - - /** - * 修改订单 - * - * @param chargeRecordId - * @return - */ - boolean updateOrder(String chargeRecordId); -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/mycard/impl/MyCardBizServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/mycard/impl/MyCardBizServiceImpl.java deleted file mode 100644 index ff921f6fa..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/mycard/impl/MyCardBizServiceImpl.java +++ /dev/null @@ -1,316 +0,0 @@ -package com.accompany.business.service.mycard.impl; - -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.StrUtil; -import com.accompany.business.service.ChargeService; -import com.accompany.business.service.mycard.MyCardBizService; -import com.accompany.common.constant.Constant; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.model.Account; -import com.accompany.core.service.account.AccountService; -import com.accompany.payment.constant.PayChannelConstant; -import com.accompany.payment.constant.PayConstant; -import com.accompany.payment.mapper.ChargeRecordMapper; -import com.accompany.payment.model.ChargeProd; -import com.accompany.payment.model.ChargeRecord; -import com.accompany.payment.model.ChargeRecordExample; -import com.accompany.payment.mycard.MyCardService; -import com.accompany.payment.mycard.config.MyCardConfig; -import com.accompany.payment.mycard.dto.CallbackDto; -import com.accompany.payment.mycard.dto.ReplenishDto; -import com.accompany.payment.mycard.resp.AuthGlobalResp; -import com.accompany.payment.mycard.resp.QueryOrderResp; -import com.accompany.payment.mycard.resp.TradeQueryResp; -import com.accompany.payment.service.ChargeProdService; -import com.accompany.payment.service.ChargeRecordService; -import com.alibaba.fastjson.JSONObject; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.codec.digest.DigestUtils; -import org.redisson.api.RLock; -import org.redisson.api.RedissonClient; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.net.URLDecoder; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; -import java.util.concurrent.TimeUnit; - -/** - * @author: liaozetao - * @date: 2023/12/26 14:08 - * @description: - */ -@Slf4j -@Service -public class MyCardBizServiceImpl implements MyCardBizService { - - private static final String PAY_SUCCESS = "3"; - - @Autowired - private MyCardConfig myCardConfig; - - @Autowired - private ChargeRecordMapper chargeRecordMapper; - - @Autowired - private ChargeRecordService chargeRecordService; - - @Autowired - private ChargeProdService chargeProdService; - - @Autowired - private ChargeService chargeService; - - @Autowired - private AccountService accountService; - - @Autowired - private MyCardService myCardService; - - @Autowired - private RedissonClient redissonClient; - - @Override - public void replenish(ReplenishDto replenishDto) { - if (!replenishDto.isSuccess()) { - return; - } - List<String> facTradeSeq = replenishDto.getFacTradeSeq(); - for (String chargeRecordId : facTradeSeq) { - log.info("replenish chargeRecordId : {}", chargeRecordId); - boolean isSuccess = updateOrder(chargeRecordId); - if (isSuccess) { - ChargeRecord chargeRecord = chargeRecordService.getChargeRecordById(chargeRecordId); - if (chargeRecord != null) { - String authCode = chargeRecord.getExtra(); - if (StrUtil.isNotEmpty(authCode)) { - //执行请款 - myCardService.paymentConfirm(authCode); - } - } - } - } - } - - @Override - public List<QueryOrderResp> query(Date startTime, Date endTime, String myCardTradeNo) { - List<QueryOrderResp> orders = new ArrayList<>(); - ChargeRecordExample example = new ChargeRecordExample(); - ChargeRecordExample.Criteria criteria = example.createCriteria(); - criteria.andChannelEqualTo(PayChannelConstant.MY_CARD) - .andChargeStatusEqualTo(Constant.ChargeRecordStatus.finish); - if (StrUtil.isNotEmpty(myCardTradeNo)) { - criteria.andPingxxChargeIdEqualTo(myCardTradeNo); - } else { - criteria.andCreateTimeBetween(startTime, endTime); - } - List<ChargeRecord> chargeRecords = chargeRecordMapper.selectByExample(example); - if (CollectionUtil.isEmpty(chargeRecords)) { - return orders; - } - for (ChargeRecord chargeRecord : chargeRecords) { - String chargeRecordId = chargeRecord.getChargeRecordId(); - String metadata = chargeRecord.getMetadata(); - if (StrUtil.isEmpty(metadata)) { - continue; - } - String paymentType = StrUtil.EMPTY; - String type = chargeRecord.getPaymentType(); - if (StrUtil.isNotEmpty(type)) { - String[] paymentArray = type.split(StrUtil.UNDERLINE); - if (paymentArray.length > 0) { - paymentType = paymentArray[0]; - } - } - AuthGlobalResp authGlobalResp = JSONObject.parseObject(metadata, AuthGlobalResp.class); - QueryOrderResp resp = new QueryOrderResp(); - resp.setPaymentType(paymentType); - resp.setFacTradeSeq(chargeRecordId); - resp.setMyCardTradeNo(chargeRecord.getPingxxChargeId()); - if (authGlobalResp != null) { - resp.setTradeSeq(authGlobalResp.getTradeSeq()); - } - resp.setCustomerId(chargeRecord.getUid().toString()); - String amount = BigDecimal.valueOf(chargeRecord.getLocalAmount()).divide(Constant.HUNDRED, 2, RoundingMode.HALF_UP).toString(); - resp.setAmount(amount); - resp.setCurrency(chargeRecord.getLocalCurrencyCode()); - if (chargeRecord.getChargeStatus().equals(Constant.ChargeRecordStatus.finish)) { - resp.setTradeDateTime(DateTimeUtil.convertDate(chargeRecord.getUpdateTime(), DateTimeUtil.UTC_DEFAULT_DATETIME_PATTERN)); - } - Account account = accountService.getAccountByUid(chargeRecord.getUid()); - if (account != null) { - Date createTime = account.getSignTime(); - resp.setCreateAccountDateTime(DateTimeUtil.convertDate(createTime, DateTimeUtil.UTC_DEFAULT_DATETIME_PATTERN)); - resp.setCreateAccountIP(account.getRegisterIp()); - } - orders.add(resp); - } - return orders; - } - - @Transactional(rollbackFor = Exception.class) - @Override - public String callback(CallbackDto callback) { - String preHashValue = callback.getReturnCode() + callback.getPayResult() + callback.getFacTradeSeq() + callback.getPaymentType() + callback.getAmount() + callback.getCurrency() + callback.getMyCardTradeNo() + callback.getMyCardType() + callback.getPromoCode() + myCardConfig.getSecretKey(); - String encodeHashValue = StrUtil.EMPTY; - try { - encodeHashValue = URLEncoder.encode(preHashValue, StandardCharsets.UTF_8.name()).toLowerCase(); - } catch (Exception e) { - log.error(e.getMessage(), e); - } - String hash = DigestUtils.sha256Hex(encodeHashValue).replaceAll(StrUtil.DASHED, StrUtil.EMPTY).toLowerCase(); - log.info("request hash : {}, preHashValue : {}, encodeHashValue : {}, server hash : {}", callback.getHash(), preHashValue, encodeHashValue, hash); - if (!hash.equals(callback.getHash())) { - throw new ServiceException(BusiStatus.PAYMENT_FAIL); - } - String returnCode = callback.getReturnCode(); - String chargeRecordId = callback.getFacTradeSeq(); - String currency = callback.getCurrency(); - String amount = callback.getAmount(); - String myCardTradeNo = callback.getMyCardTradeNo(); - String returnMsg = callback.getReturnMsg(); - String payResult = callback.getPayResult(); - try { - returnMsg = URLDecoder.decode(returnMsg, StandardCharsets.UTF_8.name()); - } catch (Exception e) { - log.error(e.getMessage(), e); - } - ChargeRecord chargeRecord = chargeRecordMapper.selectByPrimaryKey(chargeRecordId); - if (chargeRecord == null) { - throw new ServiceException(BusiStatus.PAYMENT_FAIL); - } - String authCode = chargeRecord.getExtra(); - String metadata = chargeRecord.getMetadata(); - if (StrUtil.isEmpty(metadata)) { - throw new ServiceException(BusiStatus.PAYMENT_FAIL); - } - AuthGlobalResp authGlobalResp = JSONObject.parseObject(metadata, AuthGlobalResp.class); - authGlobalResp.setReturnCode(returnCode); - authGlobalResp.setReturnMsg(returnMsg); - //更新结果信息 - chargeRecord.setMetadata(JSONObject.toJSONString(authGlobalResp)); - chargeRecordMapper.updateByPrimaryKey(chargeRecord); - //回调链接 - String successUrl = authGlobalResp.getSuccessUrl(); - String failureUrl = authGlobalResp.getFailureUrl(); - log.info("MyCard callback successUrl : {}, failureUrl : {}", successUrl, failureUrl); - if (!callback.isSuccess()) { - return failureUrl; - } - if (StrUtil.isEmpty(payResult) || !payResult.equals(PAY_SUCCESS)) { - log.error("支付非成功状态, payResult : {}", payResult); - return failureUrl; - } - //厂商查询交易结果 - TradeQueryResp tradeQuery = myCardService.tradeQuery(authCode); - if (!tradeQuery.isSuccess()) { - throw new ServiceException(BusiStatus.PAYMENT_FAIL); - } - //更新订单 - boolean isSuccess = updateOrder(chargeRecordId, currency, amount, myCardTradeNo); - if (isSuccess) { - //执行请款 - TradeQueryResp confirm = myCardService.paymentConfirm(authCode); - if (!confirm.isSuccess()) { - throw new ServiceException(BusiStatus.PAYMENT_FAIL); - } - } - return isSuccess ? successUrl : failureUrl; - } - - public boolean updateOrder(String chargeRecordId) { - ChargeRecord chargeRecord = chargeRecordService.getChargeRecordById(chargeRecordId); - if (chargeRecord == null) { - log.error("【MyCard补单】订单 {} 不存在", chargeRecordId); - return false; - } - TradeQueryResp tradeQueryResp = myCardService.tradeQuery(chargeRecord.getExtra()); - if (!tradeQueryResp.isSuccess()) { - return false; - } - String payResult = tradeQueryResp.getPayResult(); - if (StrUtil.isEmpty(payResult) || !payResult.equals(PAY_SUCCESS)) { - log.error("支付非成功状态, payResult : {}", payResult); - return false; - } - return updateOrder(chargeRecordId, tradeQueryResp.getCurrency(), tradeQueryResp.getAmount(), tradeQueryResp.getMyCardTradeNo()); - } - - /** - * 更新订单 - * - * @param chargeRecordId - * @param currency - * @param amount - * @param myCardTradeNo - */ - public boolean updateOrder(String chargeRecordId, String currency, String amount, String myCardTradeNo) { - String lockKey = RedisKey.lock_pay_callback_notify.getKey(chargeRecordId); - RLock lock = redissonClient.getLock(lockKey); - boolean isLocked = false; - try { - isLocked = lock.tryLock(5L, TimeUnit.SECONDS); - if (!isLocked) { - log.error("【MyCard支付回调】加锁失败 chargeRecordId: {}", chargeRecordId); - return false; - } - ChargeRecord chargeRecord = chargeRecordService.getChargeRecordById(chargeRecordId); - if (chargeRecord == null) { - log.error("【MyCard支付回调】订单 {} 不存在", chargeRecordId); - return false; - } - String chargeProdId = chargeRecord.getChargeProdId(); - String country = chargeRecord.getCountry(); - Byte chargeStatus = chargeRecord.getChargeStatus(); - String authCode = chargeRecord.getExtra(); - if (Constant.ChargeRecordStatus.finish.equals(chargeStatus)) { - myCardService.paymentConfirm(authCode); - log.info("订单 {} 已完成", chargeRecordId); - return false; - } - String localCurrencyCode = chargeRecord.getLocalCurrencyCode(); - if (StrUtil.isEmpty(currency) || !currency.equalsIgnoreCase(localCurrencyCode)) { - log.error("【MyCard支付回调】回调的货币代码为空或与订单 {} 中的 {} 不匹配", chargeRecordId, localCurrencyCode); - return false; - } - Long payAmount = new BigDecimal(amount).multiply(PayConstant.HUNDRED).longValue(); - // 校验金额 - boolean validateAmount = payAmount.equals(chargeRecord.getLocalAmount()); - if (!validateAmount) { - log.error("【MyCard支付回调】订单 {} 金额 {} 校验失败", chargeRecordId, payAmount); - return false; - } - if (StrUtil.isEmpty(country)) { - ChargeProd chargeProd = chargeProdService.getChargeProdById(chargeProdId); - if (chargeProd != null) { - country = chargeProd.getCountry(); - } - } - chargeRecord.setCountry(country); - chargeRecord.setLocalCurrencyCode(currency); - chargeRecord.setLocalAmount(payAmount); - chargeRecord.setPingxxChargeId(myCardTradeNo); - chargeRecord.setUpdateTime(Calendar.getInstance().getTime()); - return chargeService.updateAppPayData(chargeRecord) == BusiStatus.SUCCESS.value(); - } catch (Exception e) { - log.error(e.getMessage(), e); - return false; - } finally { - if (isLocked || lock.isLocked()) { - lock.unlock(); - } - } - } - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/newUserStart/NewUserSayHelloChannelService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/newUserStart/NewUserSayHelloChannelService.java deleted file mode 100644 index ff2ea5ba8..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/newUserStart/NewUserSayHelloChannelService.java +++ /dev/null @@ -1,387 +0,0 @@ -package com.accompany.business.service.newUserStart; - -import com.accompany.business.dto.QueueDTO; -import com.accompany.business.dto.QueueValueDTO; -import com.accompany.business.model.newUserStart.NewUserSayHelloChannel; -import com.accompany.business.model.newUserStart.NewUserStartRecord; -import com.accompany.business.model.room.PrivateChatItem; -import com.accompany.business.mybatismapper.newUserStart.NewUserSayHelloChannelMapper; -import com.accompany.business.param.neteasepush.NeteaseSendMsgParam; -import com.accompany.business.service.SendSysMsgService; -import com.accompany.business.service.room.PrivateChatItemService; -import com.accompany.business.service.room.QueryRoomService; -import com.accompany.business.service.room.RoomService; -import com.accompany.business.service.user.UsersService; -import com.accompany.business.vo.home.PlayRoomVo; -import com.accompany.business.vo.newUserStart.NewUserIndexSayHelloVo; -import com.accompany.business.vo.newUserStart.NewUserRoomSayHelloVo; -import com.accompany.common.constant.ApplicationConstant; -import com.accompany.common.constant.Constant; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.RandomUtil; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.model.Room; -import com.accompany.core.model.Users; -import com.accompany.core.service.SysConfService; -import com.accompany.core.service.common.JedisService; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.google.gson.Gson; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -/** - * @author guojicong - * @date 2022/5/31 - */ -@Slf4j -@Service -public class NewUserSayHelloChannelService extends ServiceImpl<NewUserSayHelloChannelMapper, NewUserSayHelloChannel> { - @Autowired - private NewUserSayHelloChannelMapper channelMapper; - - @Autowired - private UsersService usersService; - - @Autowired - private RoomService roomService; - - @Autowired - private NewUserStartRecordService recordService; - - @Autowired - private JedisService jedisService; - - @Autowired - private QueryRoomService queryRoomService; - - @Autowired - private SendSysMsgService sendSysMsgService; - - @Autowired - private SysConfService sysConfService; - - @Autowired - private PrivateChatItemService privateChatItemService; - - Gson gson = new Gson(); - - public NewUserSayHelloChannel add(NewUserSayHelloChannel channel) { - // 校验 渠道来源 - NewUserSayHelloChannel entity = this.getByChannel(channel.getChannel()); - if (entity != null) - throw new ServiceException(BusiStatus.CHANNEL_EXIST); - // 校验 厅号 - String uids = this.checkErbanNosAndReturnUids(channel.getErbanNos()); - // 回写校验后的erbanNos对应的uids - channel.setUids(uids); - channelMapper.insert(channel); - return channel; - } - - public NewUserSayHelloChannel update(NewUserSayHelloChannel channel) { - // 校验 厅号 - String uids = this.checkErbanNosAndReturnUids(channel.getErbanNos()); - // 回写校验后的erbanNos对应的uids - channel.setUids(uids); - channelMapper.updateById(channel); - return channel; - } - - public Boolean delete(Integer id) { - NewUserSayHelloChannel byId = this.getById(id); - if (byId.getChannel().equals(Constant.NewUserStart.OTHER_CHANNEL_SOURCE)) { - throw new ServiceException(BusiStatus.CHANNEL_CANNOT_DELETE, byId.getChannel() + "无法删除"); - } - return channelMapper.deleteById(id) == 1; - } - - public NewUserSayHelloChannel getByChannel(String channel) { - NewUserSayHelloChannel byChannel = channelMapper.selectOne(new LambdaQueryWrapper<NewUserSayHelloChannel>().eq(NewUserSayHelloChannel::getChannel, channel)); - return byChannel; - } - - public IPage<NewUserSayHelloChannel> pageList(Integer pageSize, Integer pageNum) { - return this.page(new Page<>(pageNum, pageSize)); - } - - /** - * 获取 首页弹窗 - * - * @param channelSource - * @param uid - * @return - */ - public NewUserIndexSayHelloVo indexPop(String channelSource, Long uid) { - // 检查渠道是否存在配置 - NewUserSayHelloChannel currentChannel = this.getByChannel(channelSource); - // 渠道未配置 不弹窗 - if (currentChannel == null) { - log.info("uid{} - channelSource{} 渠道无配置", uid, channelSource); - return new NewUserIndexSayHelloVo(false); - } else { // 渠道有配置 - // 检查用户是否完成指引 - NewUserStartRecord currentRecord = recordService.getRecordByUid(uid); - // 用户已完成指引 - if (currentRecord != null && currentRecord.getFinishIndexPopup()) { - log.info("uid{} - channelSource{} 已完成首页弹窗", uid, channelSource); - return new NewUserIndexSayHelloVo(false); - } else { // 用户未完成指引 - NewUserIndexSayHelloVo usableChannel; - // 初始化 当前记录 - currentRecord = currentRecord == null ? NewUserStartRecord.builder().uid(uid).build() : currentRecord; - // 渠道 配置 无需首页弹窗 - if (!currentChannel.getIndexPopup()) { - log.info("uid{} - channelSource{} 配置无需首页弹窗", uid, channelSource); - usableChannel = new NewUserIndexSayHelloVo(false); - } else { // 渠道 配置 需要首页弹窗 - // 获取可用于首页引导的房间 - usableChannel = getUsableChannelIndexPopVo(currentChannel); - if (usableChannel != null) { - // 记录当前渠道 - log.info("uid{} - channelSource{} - 可用房间{}", uid, channelSource, usableChannel.getRoomUid()); - currentRecord.setChannel(currentChannel.getChannel()); - } else { - // 配置渠道无符合要求房间 转入其他渠道 - log.info("uid{} - channelSource{} 配置无可用房间 转入other渠道", uid, channelSource); - usableChannel = getUsableChannelIndexPopVo(getByChannel(Constant.NewUserStart.OTHER_CHANNEL_SOURCE)); - currentRecord.setChannel(Constant.NewUserStart.OTHER_CHANNEL_SOURCE); - } - // 其他渠道 也无房间 符合要求 不弹窗 - if (usableChannel == null) { - log.info("uid{} - other渠道 - 无可用房间 - 不弹窗", uid); - usableChannel = new NewUserIndexSayHelloVo(false); - } - } - // 完成首页指引 - currentRecord.setFinishIndexPopup(true); - currentRecord.setRoomUid(usableChannel.getRoomUid()); - recordService.saveOrUpdate(currentRecord); - return usableChannel; - } - } - } - - /** - * 获取 房间弹窗 信息 - * - * @param channelSource - * @param roomUid - * @param uid - * @return - */ - public NewUserRoomSayHelloVo roomPop(String channelSource, Long roomUid, Long uid) { - // 检查用户是否完成房间弹窗 - NewUserStartRecord currentRecord = recordService.getRecordByUid(uid); - // 用户无引导记录 - if (currentRecord == null) { - currentRecord = NewUserStartRecord.builder().uid(uid).build(); - } else { // 存在引导记录 - // 已完成房间弹窗 - if (currentRecord.getFinishRoomPopup()) { - log.info("{}渠道 - 用户{} - 已完成房间弹窗", channelSource, uid); - return new NewUserRoomSayHelloVo(false); - } else { // 未完成房间弹窗 - // 判断用户是否已经过首页弹窗确认渠道 - if (StringUtils.hasText(currentRecord.getChannel())) { - channelSource = currentRecord.getChannel(); - } - } - } - // 获取渠道房间弹窗配置 - NewUserSayHelloChannel currentChannel = this.getByChannel(channelSource); - // 判断当前房间是否属于配置房间 - if (currentChannel == null || !currentChannel.getUids().contains(String.valueOf(roomUid))) { - log.info("用户{} - roomUid{} 不属于 {}渠道", uid, roomUid, channelSource); - return new NewUserRoomSayHelloVo(false); - } - // 默认不弹窗 仅当发送消息时开启弹窗 - NewUserRoomSayHelloVo roomSayHelloVo = NewUserRoomSayHelloVo.builder().roomPopup(false).build(); - // 发送信息数不为 0 则发送消息 - if (currentChannel.getSendMessageNumber() != 0) { - // 获取 云信房间信息 - Room roomByUid = roomService.getRoomByUid(roomUid); - List<QueueDTO> queueList = queryRoomService.queueList(roomByUid.getRoomId()).getDesc().listDTO(); - // 打招呼麦 - List<QueueValueDTO> valueDTOList = new ArrayList<>(); - // 去除 -1 和 7 号位 - queueList.forEach(queueDTO -> { - QueueValueDTO valueDTO = queueDTO.getValueObject(); - if (valueDTO.getPosition() != -1L && valueDTO.getPosition() != 7) { - valueDTOList.add(queueDTO.getValueObject()); - } - }); - // 云信房间麦位人数不为 0 则发送消息 - if (valueDTOList.size() != 0) { - // 获取配置消息池中的消息 - List<PrivateChatItem> privateChatItems = privateChatItemService.list(); - List<String> sayHelloMsgList = new ArrayList<>(); - for (PrivateChatItem privateChatItem : privateChatItems) { - sayHelloMsgList.add(privateChatItem.getMsg()); - } - // 乱序 - Collections.shuffle(sayHelloMsgList); - Collections.shuffle(valueDTOList); - // 消息池中的有配置消息 则发送消息 - if (sayHelloMsgList.size() != 0) { - // 需要发送消息 - // 打招呼人数与消息池消息数 房间麦上人数 取较小值 - int sayHelloUserNum = currentChannel.getSendMessageNumber(); - sayHelloUserNum = Math.min(sayHelloUserNum, valueDTOList.size()); - sayHelloUserNum = Math.min(sayHelloUserNum, sayHelloMsgList.size()); - // 随机用户下标 - List<Integer> randomUserIndexList = RandomUtil.randomNByRange(sayHelloUserNum, 0, valueDTOList.size() - 1); - // 发送用户消息 - List<String> AvatarList = new ArrayList<>(); - for (int i = 0; i < sayHelloUserNum; i++) { - // 获取 随机下标 用户 - QueueValueDTO valueDTO = valueDTOList.get(0); - // 添加头像 - AvatarList.add(valueDTO.getAvatar()); - // 发送 随机下标 消息 - sendMsgSingle(valueDTO.getUid(), uid, sayHelloMsgList.get(0)); - // 移除已发送的消息和人 - valueDTOList.remove(0); - sayHelloMsgList.remove(0); - } - roomSayHelloVo = new NewUserRoomSayHelloVo(currentChannel.getRoomPopup(), sayHelloUserNum, AvatarList); - } - } - } - currentRecord.setFinishRoomPopup(true); - // 记录完成房间弹窗 - recordService.saveOrUpdate(currentRecord); - return roomSayHelloVo; - } - - /** - * 获取符合条件的首页弹窗信息 - * - * @param currentChannel - * @return - */ - private NewUserIndexSayHelloVo getUsableChannelIndexPopVo(NewUserSayHelloChannel currentChannel) { - List<Double> uidList = gson.fromJson(currentChannel.getUids(), ArrayList.class); - // 未配置 厅号 不可用 - if (uidList.size() < 1) { - log.info("{}渠道 - 未配置房间 - 配置不可用", currentChannel.getChannel()); - return null; - } - String minInMicNum = sysConfService.getDefaultSysConfValueById(Constant.SysConfId.NEW_USER_INDEX_MIN_INMIC_NUM, "3"); - List<Room> ableRoomList = new ArrayList<>(); - for (int i = 0; i < uidList.size(); i++) { - // 判断当前房间 麦上人数>3 && 未上锁 && 未关闭 - Room roomByUid = roomService.getRoomByUid(uidList.get(i).longValue()); - System.out.println(roomByUid == null); - // 房间不存在 || 上锁 || 关闭 - if (roomByUid == null || !StringUtils.isEmpty(roomByUid.getRoomPwd()) || !roomByUid.getValid()) { - continue; - } - // 麦上人数 < 3 - String roomMicInfo = jedisService.hget(RedisKey.room_mic_up.getKey(), String.valueOf(roomByUid.getUid())); - if (StringUtils.isEmpty(roomMicInfo) || ApplicationConstant.NULL_JSON_OBJECT.equalsIgnoreCase(roomMicInfo) - || JSONObject.parseObject(roomMicInfo, PlayRoomVo.class).getMicUserCount() < Integer.parseInt(minInMicNum)) { - continue; - } -// // 获取经校验的云信房间麦位信息 -// List<QueueDTO> queueList = queryRoomService.queueList(roomByUid.getRoomId()).getDesc().listDTO(); -// if (queueList == null || queueList.size() == 0) { -// log.info("渠道 {} 匹配首页弹窗失败 云信 房间 {} 麦位用户不足", currentChannel.getChannel(), roomByUid.getRoomId()); -// continue; -// } - ableRoomList.add(roomByUid); - } - if (ableRoomList.size() == 0) { - log.info("{}渠道 - 可用房间为0 - 配置不可用", currentChannel.getChannel()); - return null; - } - // 符合要求厅>1时，随机选择一个 - int randomRoomIndex = ableRoomList.size() == 1 ? 0 : (int) (Math.random() * (ableRoomList.size() + 1)); - Room room = ableRoomList.get(randomRoomIndex); - List<QueueDTO> queueList = queryRoomService.queueList(room.getRoomId()).getDesc().listDTO(); - if (queueList.size() == 0) { - log.info("{}渠道 - 云信房间{} - 配置不可用", currentChannel.getChannel()); - return null; - } - // 当前房间符合要求，获取指定麦位用户 - QueueValueDTO valueDTO = null; - for (QueueDTO queueDTO : queueList) { - Long position = queueDTO.getValueObject().getPosition(); - // 存在指定麦位 配置 用户 - if (currentChannel.getIndexPopupUserIndex() != null && position.intValue() == currentChannel.getIndexPopupUserIndex()) { - valueDTO = queueDTO.getValueObject(); - } - } - // 配置麦位上无用户时，随机用户 - if (valueDTO == null) { - int randomUserIndex = queueList.size() == 1 ? 0 : (int) (Math.random() * (queueList.size() + 1)); - valueDTO = queueList.get(randomUserIndex).getValueObject(); - } - Users usersByUid = usersService.getUsersByUid(valueDTO.getUid()); - return new NewUserIndexSayHelloVo(true, room.getUid(), usersByUid.getNick(), usersByUid.getAvatar(), usersByUid.getErbanNo(), usersByUid.getUid(), Constant.NewUserStart.INDEX_MSG); - } - - /** - * 发送用户私聊消息 - * - * @param fromUid - * @param toUid - * @param body - */ - @Async - public void sendMsgSingle(Long fromUid, Long toUid, String body) { - NeteaseSendMsgParam msg = new NeteaseSendMsgParam(); - msg.setOpe(0); - msg.setType(0); - msg.setFrom(fromUid.toString()); - msg.setTo(toUid.toString()); - msg.setBody(body); - msg.setMsgSenderNoSense(0); - sendSysMsgService.sendMsg(msg); - } - - /** - * @param erbanNos 厅号集合 - * @return 厅号对应的room所有者uid - */ - private String checkErbanNosAndReturnUids(String erbanNos) { - if (!StringUtils.hasText(erbanNos)) { - throw new ServiceException(BusiStatus.ERBAN_NO_ERROR); - } - // 转为 集合 格式字符串 - erbanNos = erbanNos.indexOf("[") != 0 ? "[" + erbanNos : erbanNos; - erbanNos = erbanNos.indexOf("]") != erbanNos.length() - 1 ? erbanNos + "]" : erbanNos; - List<Double> erbanNoList = gson.fromJson(erbanNos, ArrayList.class); - List<Long> roomUidList = new ArrayList<>(); - - for (int i = 0; i < erbanNoList.size(); i++) { - Long erbanNo = erbanNoList.get(i).longValue(); - Users userByErbanNo = usersService.getUserByErbanNo(erbanNo); - if (userByErbanNo == null) - throw new ServiceException(BusiStatus.ERBAN_NO_ERROR); - Room roomByUid = roomService.getRoomByUid(userByErbanNo.getUid()); - if (roomByUid == null) - throw new ServiceException(BusiStatus.ERBAN_NO_ERROR, erbanNo + "无对应房间"); - // 房间需为 牌照房 或 个播房 - if (!roomByUid.getIsPermitRoom().equals(Constant.PermitType.PERMIT_ROOM) - && !roomByUid.getIsPermitRoom().equals(Constant.PermitType.SINGLE_BROADCAST)) - throw new ServiceException(BusiStatus.ERBAN_NO_ERROR, erbanNo + "房间需为 牌照房 或 个播房"); - roomUidList.add(userByErbanNo.getUid()); - } - if (roomUidList.size() == 0) - throw new ServiceException(BusiStatus.ERBAN_NO_ERROR, "请至少填写一个有效厅号"); - return gson.toJson(roomUidList); - } - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/newUserStart/NewUserStartRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/newUserStart/NewUserStartRecordService.java deleted file mode 100644 index 09c188be6..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/newUserStart/NewUserStartRecordService.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.accompany.business.service.newUserStart; - -import com.accompany.business.model.newUserStart.NewUserStartRecord; -import com.accompany.business.mybatismapper.newUserStart.NewUserStartRecordMapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -/** - * @author guojicong - * @date 2022/5/31 - */ -@Slf4j -@Service -public class NewUserStartRecordService extends ServiceImpl<NewUserStartRecordMapper, NewUserStartRecord> { - @Autowired - private NewUserStartRecordMapper recordMapper; - - public NewUserStartRecord getRecordByUid(Long uid) { - return recordMapper.selectById(uid); - } - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/newbie/NewUserService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/newbie/NewUserService.java deleted file mode 100644 index f84b84f32..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/newbie/NewUserService.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.accompany.business.service.newbie; - -import com.accompany.business.model.UserPurse; -import com.accompany.business.mybatismapper.UserPurseMapper; -import com.accompany.business.service.user.UsersService; -import com.accompany.business.vo.SimpleNewUserVo; -import com.accompany.common.constant.Constant; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.model.Users; -import com.accompany.core.model.UsersExample; -import com.accompany.core.mybatismapper.UsersMapper; -import com.accompany.core.util.StringUtils; -import org.apache.commons.lang3.time.DateUtils; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.util.Collections; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -@Service -public class NewUserService { - - @Autowired - private UsersService usersService; - @Autowired - private UsersMapper usersMapper; - @Autowired - private UserPurseMapper userPurseMapper; - - public List<SimpleNewUserVo> page(Long uid, Integer pageNum, Integer pageSize) { - Users me = usersService.getNotNullUsersByUid(uid); - - pageNum = pageNum == null || pageNum < 1 ? Constant.DEFAULT_PAGE : pageNum; - pageSize = pageSize == null || pageSize < 1 ? Constant.DEFAULT_PAGE_SIZE : pageSize; - - Integer offset = (pageNum - 1) * pageSize; - - Date twoDaysAgo = DateUtils.addDays(new Date(), -2); - - UsersExample example = new UsersExample(); - example.createCriteria() - .andCreateTimeGreaterThanOrEqualTo(twoDaysAgo) - .andPartitionIdEqualTo(me.getPartitionId()) - .andDefUserEqualTo(Constant.DefUser.NORMAL); - example.setLimit(pageSize); - example.setOffset(offset); - example.setOrderByClause(" uid desc "); - - List<Users> userList = usersMapper.selectByExample(example); - if (CollectionUtils.isEmpty(userList)){ - return Collections.emptyList(); - } - - List<Long> uidList = userList.stream().map(Users::getUid).distinct().collect(Collectors.toList()); - - Map<Long, Boolean> firstChargeMap = userPurseMapper.selectBatchIds(uidList).stream() - .collect(Collectors.toMap(UserPurse::getUid, UserPurse::getFirstCharge)); - - return userList.stream().map(u->{ - SimpleNewUserVo vo = new SimpleNewUserVo(); - BeanUtils.copyProperties(u, vo); - vo.setCreateTime(DateTimeUtil.convertDate(u.getCreateTime())); - - if (StringUtils.isNoneBlank(u.getLastLoginRegion())){ - String[] array = u.getLastLoginRegion().split("\\|"); - String region = !"0".equals(array[1])? String.join("-", array[0], array[1]): array[0]; - vo.setRegion(region); - } - - vo.setFirstCharge(!firstChargeMap.getOrDefault(u.getUid(), Boolean.TRUE)); - return vo; - }).collect(Collectors.toList()); - } - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/newbie/NewbieMessageRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/newbie/NewbieMessageRecordService.java deleted file mode 100644 index 62968c986..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/newbie/NewbieMessageRecordService.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.accompany.business.service.newbie; - -import com.accompany.business.model.newbie.NewbieMessageRecord; -import com.accompany.business.mybatismapper.newbie.NewbieMessageRecordMapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -@Service -public class NewbieMessageRecordService extends ServiceImpl<NewbieMessageRecordMapper, NewbieMessageRecord> { - - public long getHelloUidCount(Long helloUid) { - QueryWrapper<NewbieMessageRecord> wrapper = new QueryWrapper<>(); - wrapper.lambda().eq(NewbieMessageRecord::getHelloUid, helloUid); - return count(wrapper); - } - - public List<Long> getUidHelloList(Long uid) { - QueryWrapper<NewbieMessageRecord> wrapper = new QueryWrapper<>(); - wrapper.lambda().eq(NewbieMessageRecord::getUid, uid); - wrapper.select("distinct(hello_uid)"); - List<NewbieMessageRecord> recordList = list(wrapper); - if (recordList == null) { - return new ArrayList<>(); - } - return recordList.stream().map(NewbieMessageRecord::getHelloUid).collect(Collectors.toList()); - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/newbie/NewbieMessageService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/newbie/NewbieMessageService.java deleted file mode 100644 index 2c076e58e..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/newbie/NewbieMessageService.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.accompany.business.service.newbie; - -import com.accompany.business.model.newbie.NewbieMessage; -import com.accompany.business.mybatismapper.newbie.NewbieMessageMapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.HashMap; -import java.util.List; - -@Service -public class NewbieMessageService extends ServiceImpl<NewbieMessageMapper, NewbieMessage> { - - @Autowired - private NewbieMessageMapper newbieMessageMapper; - - /** - * 循环获取打招呼 - * @return - */ - public Object getNewbieMessageList(Integer start, Integer pageSize) { - HashMap<String, Object> data = new HashMap<>(); - if (start.equals(0)) { - Long id = newbieMessageMapper.randomId(); - start = id.intValue(); - } - QueryWrapper<NewbieMessage> wrapper = new QueryWrapper<>(); - wrapper.lambda().gt(NewbieMessage::getId, start).orderByAsc(NewbieMessage::getId); - wrapper.last(String.format("limit %d", pageSize)); - List<NewbieMessage> messageList = list(wrapper); - if (messageList.size() < pageSize) { - QueryWrapper<NewbieMessage> wrapper2 = new QueryWrapper<>(); - wrapper2.lambda().orderByAsc(NewbieMessage::getId); - wrapper2.last(String.format("limit %d", pageSize - messageList.size())); - List<NewbieMessage> messageList2 = list(wrapper2); - messageList.addAll(messageList2); - data.put("start", messageList2.get(messageList2.size() - 1).getId()); - } else { - data.put("start", messageList.get(messageList.size() - 1).getId()); - } - data.put("list", messageList); - return data; - } - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/newbie/NewbiePoolService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/newbie/NewbiePoolService.java deleted file mode 100644 index c3c9f0112..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/newbie/NewbiePoolService.java +++ /dev/null @@ -1,357 +0,0 @@ -package com.accompany.business.service.newbie; - -import cn.hutool.core.collection.CollectionUtil; -import com.accompany.business.model.newbie.FindNewbieConfig; -import com.accompany.business.model.newbie.NewbieMessageRecord; -import com.accompany.business.model.newbie.NewbiePool; -import com.accompany.business.mybatismapper.newbie.NewbiePoolMapper; -import com.accompany.business.param.neteasepush.NeteaseSendMsgParam; -import com.accompany.business.service.AccountLoginRecordService; -import com.accompany.business.service.SendSysMsgService; -import com.accompany.business.service.level.LevelService; -import com.accompany.business.service.user.UserInRoomService; -import com.accompany.business.service.user.UsersService; -import com.accompany.business.vo.RoomVo; -import com.accompany.business.vo.newbie.NewbieHelloVo; -import com.accompany.business.vo.newbie.NewbieListVo; -import com.accompany.common.constant.Attach; -import com.accompany.common.constant.Constant; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.common.utils.StringUtils; -import com.accompany.core.model.AccountLoginRecord; -import com.accompany.core.model.Users; -import com.accompany.core.model.UsersExample; -import com.accompany.core.mybatismapper.UsersMapper; -import com.accompany.core.service.SysConfService; -import com.accompany.core.service.common.JedisService; -import com.accompany.core.vo.UserLevelVo; -import com.accompany.core.vo.UserVo; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.google.gson.Gson; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.util.*; -import java.util.stream.Collectors; - -@Service -@Slf4j -public class NewbiePoolService extends ServiceImpl<NewbiePoolMapper, NewbiePool> { - - private Gson gson = new Gson(); - - @Autowired - UsersMapper usersMapper; - @Autowired - UsersService usersService; - @Autowired - SysConfService sysConfService; - @Autowired - NewbiePoolMapper newbiePoolMapper; - @Autowired - JedisService jedisService; - @Autowired - UserInRoomService userInRoomService; - @Autowired - SendSysMsgService sendMessageService; - @Autowired - AccountLoginRecordService accountLoginRecordService; - @Autowired - NewbieMessageRecordService newbieMessageRecordService; - @Autowired - LevelService levelService; - - /** - * 初始化萌新池 - */ - public void initPool() { - QueryWrapper<NewbiePool> wrapper = new QueryWrapper<>(); - if (count(wrapper) > 0) { - return; - } - Date endTime = DateTimeUtil.getBeginTimeOfDay(new Date()); - Date startTime = DateTimeUtil.addDays(endTime, -6); - addNewbiePool(startTime, endTime); - } - - /** - * 添加时间范围内用户到萌新池 - * - * @param startTime - * @param endTime - */ - public void addNewbiePool(Date startTime, Date endTime) { - UsersExample usersExample = new UsersExample(); - usersExample.createCriteria().andCreateTimeGreaterThanOrEqualTo(startTime).andCreateTimeLessThan(endTime).andDefUserEqualTo(Constant.DefUser.NORMAL) - .andUseStatusEqualTo((byte) Constant.UserStatus.NORMAL); - List<Users> usersList = usersMapper.selectByExample(usersExample); - List<Long> uids = usersList.stream().map(Users::getUid).collect(Collectors.toList()); - List<UserVo> users = usersService.getUsersVoListByUids(uids); - List<NewbiePool> newbiePoolList = new ArrayList<>(uids.size()); - for (UserVo userVo : users) { - NewbiePool newbie = new NewbiePool(); - newbie.setUid(userVo.getUid()); - newbie.setHelloCount(0); - newbie.setCreateTime(endTime); - newbie.setExperience(userVo.getUserLevelVo().getExperAmount()); - newbie.setRegisterTime(userVo.getCreateTime()); - newbiePoolList.add(newbie); - } - saveBatch(newbiePoolList); - log.info("NewbiePoolService.addNewbiePool 萌新池数据库执行成功"); - - String dataStr = DateTimeUtil.convertDate(startTime, DateTimeUtil.DEFAULT_DATE_PATTERN); - String key = RedisKey.new_find_newbie_list_cache.getKey(dataStr); - List<Long> newbiePoolUidList = users.stream().map(UserVo::getUid).collect(Collectors.toList()); - jedisService.saddSet(key, newbiePoolUidList); - jedisService.expire(key, DateTimeUtil.getSecondsOfDays(5)); - log.info("NewbiePoolService.addNewbiePool 萌新池缓存执行成功"); - } - - public FindNewbieConfig getConfig() { - String value = sysConfService.getSysConfValueById(Constant.SysConfId.FIND_NEWBIE_CONFIG); - log.info("FindNewbieConfig: " + value); - if (StringUtils.isNotEmpty(value)) { - return gson.fromJson(value, FindNewbieConfig.class); - } - FindNewbieConfig config = new FindNewbieConfig(); - config.setCharmLevel(2); - config.setListNum(30); - config.setToastNum(2); - return config; - } - - /** - * 随机获取 配置 个萌新用户 - * - * @return - */ - public List<NewbieListVo> getNewbieList(Long uid) { - Date date = new Date(); - FindNewbieConfig config = getConfig(); - // 1、从当日的萌新池中随机获取 配置数量 用户 - String cacheKey = RedisKey.new_find_newbie_list_cache.getKey(DateTimeUtil.convertDate(date, DateTimeUtil.DEFAULT_DATE_PATTERN)); - // 防止排除自己后少于需要获取数量 - List<String> uidStr = jedisService.srandmember(cacheKey, config.getListNum() + 1); - List<Long> uidList = uidStr.stream().filter(v -> !v.equals(String.valueOf(uid))).map(Long::valueOf).collect(Collectors.toList()); - List<NewbieListVo> list = new LinkedList<>(); - // 2、当日萌新池数量不足时拼接昨日萌新池数据 - if (CollectionUtils.isEmpty(uidList) || uidList.size() < config.getListNum()) { - int getNum = config.getListNum() - uidList.size(); - String lastDay = DateTimeUtil.convertDate(DateTimeUtil.addDays(date, -1), DateTimeUtil.DEFAULT_DATE_PATTERN); - List<String> lastUidStr = jedisService.srandmember(RedisKey.new_find_newbie_list_cache.getKey(lastDay), getNum); - List<Long> lastUidList = lastUidStr.stream().map(Long::valueOf).collect(Collectors.toList()); - uidList.addAll(lastUidList); - if (CollectionUtils.isEmpty(uidList)) { - return list; - } - } - if (uidList.size() > config.getListNum()) { - uidList = uidList.subList(0, config.getListNum()); - } else { - int limitNum = config.getListNum() - uidList.size(); - if (limitNum > 0) { - List<Long> newbies = usersMapper.getNewbies(uidList, limitNum); - if (CollectionUtil.isNotEmpty(newbies)) { - uidList.addAll(newbies); - } - } - } - List<UserVo> userVoList = usersService.getUsersVoListByUids(uidList); - HashMap<Long, UserVo> userVoHashMap = new HashMap<>(); - userVoList.forEach(it -> userVoHashMap.put(it.getUid(), it)); - List<Long> helloUidList = newbieMessageRecordService.getUidHelloList(uid); - uidList.forEach(it -> { - UserVo userVo = userVoHashMap.get(it); - if (null == userVo) { - return; - } - NewbieListVo vo = new NewbieListVo(); - BeanUtils.copyProperties(userVo, vo); - vo.setExperLevelSeq(userVo.getUserLevelVo().getExperLevelSeq()); - vo.setCharmLevelSeq(userVo.getUserLevelVo().getCharmLevelSeq()); - vo.setExperUrl(userVo.getUserLevelVo().getExperUrl()); - vo.setCharmUrl(userVo.getUserLevelVo().getCharmUrl()); - // 是否有打过招呼 - vo.setHello(!helloUidList.contains(it)); - list.add(vo); - }); - return list.stream().sorted(Comparator.comparing(NewbieListVo::getHello).reversed() - .thenComparing(NewbieListVo::getExperLevelSeq, Comparator.reverseOrder()) - .thenComparing(NewbieListVo::getCreateTime, Comparator.reverseOrder())) - .collect(Collectors.toList()); - } - - public List<NewbieListVo> getNewbieListByPage(Long uid, Integer page) { - // 旧版本兼容防止安卓无限刷新 - if (page >= 2) { - return Collections.emptyList(); - } - List<NewbieListVo> newbieList = getNewbieList(uid); - if (CollectionUtils.isEmpty(newbieList)) { - return Collections.emptyList(); - } - return newbieList; - } - - /** - * 更新萌新池 - */ - public void updateNewbiePool() { - Date date = DateTimeUtil.getBeginTimeOfDay(new Date()); - removeOldNewbie(date); - updateNewbieExperience(); - } - - /** - * 更新萌新池用户经验值等级 - */ - public void updateNewbieExperience() { - QueryWrapper<NewbiePool> wrapper = new QueryWrapper<>(); - List<NewbiePool> newbiePoolList = list(wrapper); - if (CollectionUtil.isEmpty(newbiePoolList)) { - return; - } - List<String> uids = new ArrayList<>(newbiePoolList.size()); - newbiePoolList.stream().forEach(it -> uids.add(it.getUid().toString())); - String[] uidsStr = new String[uids.size()]; - uids.toArray(uidsStr); - Map<Long, UserLevelVo> levelMap = levelService.getUserLevelVoMap(uidsStr); - newbiePoolList.stream().forEach(it -> { - UserLevelVo vo = levelMap.get(it.getUid()); - if (vo != null) { - it.setExperience(vo.getExperAmount()); - } - }); - updateBatchById(newbiePoolList); - } - - /** - * 移除最早一天萌新池 - */ - public void removeOldNewbie(Date date) { - Date endTime = DateTimeUtil.addDays(date, -5); - QueryWrapper<NewbiePool> wrapper = new QueryWrapper<>(); - wrapper.lambda().lt(NewbiePool::getRegisterTime, endTime); - remove(wrapper); - } - - /** - * 增加昨天新用户到萌新池 - */ - public void addYesterdayNewbie(Date date) { - Date startTime = DateTimeUtil.addHours(date, -1); - addNewbiePool(startTime, date); - } - - /** - * 打招呼 - * - * @param helloUid - */ - public String sayHello(Long uid, Long helloUid, String message) { - FindNewbieConfig config = getConfig(); - // 判断被打招呼次数 - if (newbieMessageRecordService.getHelloUidCount(helloUid) >= config.getToastNum()) { - return "这个人太受欢迎啦，换个人打招呼试试吧"; - } - // 更新打招呼次数，超过配置移出萌新池 - QueryWrapper<NewbiePool> wrapper = new QueryWrapper<>(); - wrapper.lambda().eq(NewbiePool::getUid, helloUid); - NewbiePool newbiePool = getOne(wrapper); - if (newbiePool != null) { - if (newbiePool.getHelloCount() >= config.getToastNum()) { - return null; // 下面不再打招呼 - } else { - newbiePool.setHelloCount(newbiePool.getHelloCount() + 1); - if (newbiePool.getHelloCount() >= config.getToastNum()) { - String key = RedisKey.new_find_newbie_list_cache.getKey(DateTimeUtil.getTodayStr()); - jedisService.srem(key, helloUid.toString()); - removeById(newbiePool.getId()); - } else { - updateById(newbiePool); - } - } - } - // 发送消息 - Users users = usersService.getUsersByUid(uid); - NewbieHelloVo vo = new NewbieHelloVo(); - vo.setUid(uid); - vo.setAvatar(users.getAvatar()); - vo.setNick(users.getNick()); - vo.setGender(users.getGender()); - // 当前用户所在房间 - RoomVo roomVo = userInRoomService.getUserInRoomInfoCache(uid); - if (roomVo != null) { - vo.setInRoomUid(roomVo.getUid()); - message += " >>"; - } - vo.setMessage(message); - // 打招呼 - sendHelloMessage(vo, helloUid); - // 记录 - NewbieMessageRecord newbieMessageRecord = new NewbieMessageRecord(); - newbieMessageRecord.setUid(uid); - newbieMessageRecord.setHelloUid(helloUid); - newbieMessageRecord.setMessage(message); - newbieMessageRecord.setCreateTime(new Date()); - newbieMessageRecordService.save(newbieMessageRecord); - return null; - } - - /** - * 发送云信打招呼自定义消息 - */ - public void sendHelloMessage(NewbieHelloVo vo, Long helloUid) { - Attach attach = new Attach(); - attach.setFirst(Constant.DefineProtocol.CUSTOM_PRIVATE_CHAT_MESSAGE); - attach.setSecond(Constant.DefineProtocol.CUSTOM_PRIVATE_CHAT_MESSAGE_HELLO); - attach.setData(vo); - Boolean customMsg = true; - // 给旧版本用户发送普通文本消息 - String appVersion = "1.4.0"; - AccountLoginRecord accountLoginRecord = accountLoginRecordService.getLastLoginRecord(helloUid); - if (accountLoginRecord != null) { - log.info(accountLoginRecord.getAppVersion()); - } - if (accountLoginRecord != null && StringUtils.isNotEmpty(accountLoginRecord.getAppVersion()) - && (appVersion.compareTo(accountLoginRecord.getAppVersion()) > 0)) { - customMsg = false; - } - - NeteaseSendMsgParam neteaseSendMsgParam = new NeteaseSendMsgParam(); - neteaseSendMsgParam.setType(customMsg ? Constant.DefineProtocol.CUSTOM_MESS_DEFINE : 0); - neteaseSendMsgParam.setFrom(vo.getUid().toString()); - neteaseSendMsgParam.setOpe(0); - neteaseSendMsgParam.setTo(helloUid.toString()); - if (customMsg) { - neteaseSendMsgParam.setAttach(attach); - } else { - neteaseSendMsgParam.setBody(vo.getMessage()); - } - this.sendMessageService.sendMsg(neteaseSendMsgParam); - } - - /** - * 新版本初始化萌新 - */ - public void initPoolV2() { - Date lastDate = DateTimeUtil.addDays(new Date(), -1); - Date beginTimeOfDay = DateTimeUtil.getBeginTimeOfDay(lastDate); - Date endTimeOfDay = DateTimeUtil.getEndTimeOfDay(lastDate); - QueryWrapper<NewbiePool> wrapper = new QueryWrapper<>(); - wrapper.lambda().ge(NewbiePool::getCreateTime, beginTimeOfDay).le(NewbiePool::getCreateTime, endTimeOfDay); - List<NewbiePool> newbiePools = newbiePoolMapper.selectList(wrapper); - - String dataStr = DateTimeUtil.convertDate(endTimeOfDay, DateTimeUtil.DEFAULT_DATE_PATTERN); - String key = RedisKey.new_find_newbie_list_cache.getKey(dataStr); - List<Long> newbiePoolUidList = newbiePools.stream().map(NewbiePool::getUid).collect(Collectors.toList()); - jedisService.saddSet(key, newbiePoolUidList); - jedisService.expire(key, DateTimeUtil.getSecondsOfDays(5)); - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/newuser/NewUserInRoomGiftRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/newuser/NewUserInRoomGiftRecordService.java deleted file mode 100644 index b90598413..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/newuser/NewUserInRoomGiftRecordService.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.accompany.business.service.newuser; - -import com.accompany.business.model.newuser.NewUserInRoomGift; -import com.accompany.business.model.newuser.NewUserInRoomGiftRecord; -import com.accompany.business.mybatismapper.newuser.NewUserInRoomGiftRecordMapper; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.util.List; - -/** - * @author guojicong - * @description - * @date 2022-07-26 - */ -@Service -@Slf4j -public class NewUserInRoomGiftRecordService extends ServiceImpl<NewUserInRoomGiftRecordMapper, NewUserInRoomGiftRecord> { - public Boolean addRecord(NewUserInRoomGift newUserInRoomGift, Long roomUid, Long uid, String deviceId) { - NewUserInRoomGiftRecord record = new NewUserInRoomGiftRecord(); - record.setRoomUid(roomUid); - record.setUid(uid); - record.setDeviceId(deviceId); - record.setGiftId(newUserInRoomGift.getId()); - record.setGiftNum(newUserInRoomGift.getGiftNum()); - record.setChannel(newUserInRoomGift.getChannel()); - return this.save(record); - } - - /** - * 判断是否需要发放新用户进房奖励 - * @param uid - * @param deviceId - * @return - */ - public Boolean needSendGift(Long uid, String deviceId) { - List<NewUserInRoomGiftRecord> list = this.list(new LambdaQueryWrapper<NewUserInRoomGiftRecord>() - .eq(NewUserInRoomGiftRecord::getUid, uid) - .or() - .eq(NewUserInRoomGiftRecord::getDeviceId, deviceId)); - if (CollectionUtils.isEmpty(list)) { - return true; - } - return false; - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/newuser/NewUserInRoomGiftService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/newuser/NewUserInRoomGiftService.java deleted file mode 100644 index e34781009..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/newuser/NewUserInRoomGiftService.java +++ /dev/null @@ -1,120 +0,0 @@ -package com.accompany.business.service.newuser; - -import com.accompany.business.model.Gift; -import com.accompany.business.model.newuser.NewUserInRoomGift; -import com.accompany.business.mybatismapper.newuser.NewUserInRoomGiftMapper; -import com.accompany.business.param.UserBackpackParam; -import com.accompany.business.service.gift.GiftService; -import com.accompany.business.service.user.UserBackpackService; -import com.accompany.business.vo.GiftVo; -import com.accompany.business.vo.config.NewUserConfig; -import com.accompany.business.vo.gift.NewUserGift; -import com.accompany.business.vo.gift.NewUserGiftVo; -import com.accompany.common.constant.Constant; -import com.accompany.common.model.PageReq; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.model.Account; -import com.accompany.core.service.SysConfService; -import com.accompany.core.service.account.AccountService; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.google.gson.Gson; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - -/** - * @author guojicong - * @description - * @date 2022-07-25 - */ -@Service -@Slf4j -public class NewUserInRoomGiftService extends ServiceImpl<NewUserInRoomGiftMapper, NewUserInRoomGift> { - @Autowired - private NewUserInRoomGiftMapper newUserInRoomGiftMapper; - @Autowired - private GiftService giftService; - @Autowired - private AccountService accountService; - @Autowired - private SysConfService sysConfService; - @Autowired - private NewUserInRoomGiftRecordService newUserInRoomGiftRecordService; - @Autowired - private UserBackpackService userBackpackService; - private Gson gson = new Gson(); - - @Transactional(rollbackFor = Exception.class, transactionManager = "mybatisplusTransactionManager") - public NewUserGift getNewUserInRoomGift(Long roomUid, Long uid, String channel, String deviceId) { - NewUserConfig config = this.getConfig(); - Account account = accountService.getAccountByUid(uid); - if (account != null && account.getSignTime().after(config.getStartTime())) { - NewUserInRoomGift giftConfig = this.getOne(new LambdaQueryWrapper<NewUserInRoomGift>().eq(NewUserInRoomGift::getChannel, channel)); - if (giftConfig != null) { - GiftVo giftVoById = giftService.getGiftVoById(giftConfig.getGiftId()); - if (giftVoById != null) { - Boolean needSendGift = newUserInRoomGiftRecordService.needSendGift(uid, deviceId); - if (needSendGift) { - Boolean addRecord = newUserInRoomGiftRecordService.addRecord(giftConfig, roomUid, uid, deviceId); - if (addRecord) { - this.sendGift(giftVoById, uid, giftConfig.getGiftNum()); - return new NewUserGift(giftVoById, giftConfig.getGiftNum()); - } - } - } - } - } - throw new ServiceException(BusiStatus.PARAMERROR, "该设备/用户已获得过礼物"); - } - - public PageInfo<NewUserGiftVo> getPage(PageReq pageReq) { - PageHelper.startPage(pageReq.getPage(), pageReq.getPageSize()); - List<NewUserGiftVo> list = newUserInRoomGiftMapper.getList(); - PageInfo<NewUserGiftVo> info = new PageInfo<>(list); - return info; - } - - public NewUserGiftVo getVoById(Long id) { - NewUserInRoomGift byId = this.getById(id); - Gift giftById = giftService.getGiftByIdFromDb(byId.getGiftId()); - return new NewUserGiftVo(byId, giftById.getGiftName()); - } - - public NewUserInRoomGift addOrUpdate(NewUserInRoomGift entity) { - Gift giftById = giftService.getGiftByIdFromDb(entity.getGiftId()); - if (giftById == null) - throw new ServiceException(BusiStatus.PARAMERROR, "giftId不存在"); - NewUserInRoomGift one = this.getOne(new LambdaQueryWrapper<NewUserInRoomGift>().eq(NewUserInRoomGift::getChannel, entity.getChannel())); - if (entity.getId() == null && one != null) - throw new ServiceException(BusiStatus.PARAMERROR, "该渠道已存在配置"); - this.saveOrUpdate(entity); - return entity; - } - - private NewUserConfig getConfig() { - String newUserConfigStr = sysConfService.getSysConfValueById(Constant.SysConfId.NEW_USER_CONFIG); - log.info("new user config :{}", newUserConfigStr); - if (StringUtils.isBlank(newUserConfigStr)) { - return new NewUserConfig(); - } - return gson.fromJson(newUserConfigStr, NewUserConfig.class); - } - - public void sendGift(GiftVo gift, Long userId, Integer giftNum) { - UserBackpackParam backpackParam = new UserBackpackParam(); - backpackParam.setGiftSeq(gift.getSeqNo()); - backpackParam.setGiftId(gift.getGiftId()); - backpackParam.setCount(giftNum); - backpackParam.setUid(userId); - backpackParam.setGiftType(gift.getGiftType()); - userBackpackService.saveOrUpdateUserBackpack(backpackParam); - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/official/OfficialBrowseRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/official/OfficialBrowseRecordService.java deleted file mode 100644 index 2ae53ce8c..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/official/OfficialBrowseRecordService.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.accompany.business.service.official; - -import com.accompany.business.model.official.OfficialBrowseRecord; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * @author: liaozetao - * @date: 2024/1/17 10:39 - * @description: - */ -public interface OfficialBrowseRecordService extends IService<OfficialBrowseRecord> { -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/official/OfficialClickRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/official/OfficialClickRecordService.java deleted file mode 100644 index 31677853d..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/official/OfficialClickRecordService.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.accompany.business.service.official; - -import com.accompany.business.model.official.OfficialClickRecord; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * @author: liaozetao - * @date: 2024/1/18 10:44 - * @description: - */ -public interface OfficialClickRecordService extends IService<OfficialClickRecord> { -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/official/OfficialConfigService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/official/OfficialConfigService.java deleted file mode 100644 index e73ce6d24..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/official/OfficialConfigService.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.accompany.business.service.official; - -import com.accompany.business.model.official.OfficialConfig; -import com.accompany.business.vo.official.OfficialConfigVo; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * @author: liaozetao - * @date: 2024/1/16 17:56 - * @description: - */ -public interface OfficialConfigService extends IService<OfficialConfig> { - - /** - * 获取配置 - * - * @return - */ - OfficialConfigVo getConfig(); - - /** - * 点击 - * - * @param downloadType - * @param downloadUrl - */ - void click(Integer downloadType, String downloadUrl); -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/official/impl/OfficialBrowseRecordServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/official/impl/OfficialBrowseRecordServiceImpl.java deleted file mode 100644 index 145edf9de..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/official/impl/OfficialBrowseRecordServiceImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.accompany.business.service.official.impl; - -import com.accompany.business.model.official.OfficialBrowseRecord; -import com.accompany.business.mybatismapper.official.OfficialBrowseRecordMapper; -import com.accompany.business.service.official.OfficialBrowseRecordService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -/** - * @author: liaozetao - * @date: 2024/1/17 10:39 - * @description: - */ -@Slf4j -@Service -public class OfficialBrowseRecordServiceImpl extends ServiceImpl<OfficialBrowseRecordMapper, OfficialBrowseRecord> implements OfficialBrowseRecordService { -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/official/impl/OfficialClickRecordServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/official/impl/OfficialClickRecordServiceImpl.java deleted file mode 100644 index f908c9f6d..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/official/impl/OfficialClickRecordServiceImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.accompany.business.service.official.impl; - -import com.accompany.business.model.official.OfficialClickRecord; -import com.accompany.business.mybatismapper.official.OfficialClickRecordMapper; -import com.accompany.business.service.official.OfficialClickRecordService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -/** - * @author: liaozetao - * @date: 2024/1/18 10:44 - * @description: - */ -@Slf4j -@Service -public class OfficialClickRecordServiceImpl extends ServiceImpl<OfficialClickRecordMapper, OfficialClickRecord> implements OfficialClickRecordService { -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/official/impl/OfficialConfigServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/official/impl/OfficialConfigServiceImpl.java deleted file mode 100644 index d65670d49..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/official/impl/OfficialConfigServiceImpl.java +++ /dev/null @@ -1,170 +0,0 @@ -package com.accompany.business.service.official.impl; - -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.StrUtil; -import com.accompany.business.model.official.OfficialBrowseRecord; -import com.accompany.business.model.official.OfficialClickRecord; -import com.accompany.business.model.official.OfficialConfig; -import com.accompany.business.mybatismapper.official.OfficialConfigMapper; -import com.accompany.business.service.official.OfficialBrowseRecordService; -import com.accompany.business.service.official.OfficialClickRecordService; -import com.accompany.business.service.official.OfficialConfigService; -import com.accompany.business.vo.official.OfficialConfigVo; -import com.accompany.common.utils.IPUtils; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import eu.bitwalker.useragentutils.OperatingSystem; -import eu.bitwalker.useragentutils.UserAgent; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpHeaders; -import org.springframework.stereotype.Service; -import org.springframework.web.context.request.RequestAttributes; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; - -import javax.servlet.http.HttpServletRequest; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -/** - * @author: liaozetao - * @date: 2024/1/16 17:57 - * @description: - */ -@Slf4j -@Service -public class OfficialConfigServiceImpl extends ServiceImpl<OfficialConfigMapper, OfficialConfig> implements OfficialConfigService { - - private static final int SKIP_TYPE_FOR_STORE = 0; - - private static final int DOWNLOAD_TYPE_FOR_IOS = 0; - - private static final int DOWNLOAD_TYPE_FOR_ANDROID = 1; - - @Autowired - private OfficialBrowseRecordService officialBrowseRecordService; - - @Autowired - private OfficialClickRecordService officialClickRecordService; - - @Override - public OfficialConfigVo getConfig() { - OfficialConfigVo config = new OfficialConfigVo(); - List<OfficialConfig> configs = list(Wrappers.<OfficialConfig>lambdaQuery() - .orderByDesc(OfficialConfig::getCreateTime) - .orderByDesc(OfficialConfig::getUpdateTime)); - if (CollectionUtil.isEmpty(configs)) { - return config; - } - OfficialConfig officialConfig = configs.get(0); - config.setIosSkipType(officialConfig.getIosSkipType()); - config.setAndroidSkipType(officialConfig.getAndroidSkipType()); - config.setIosUrl(officialConfig.getIosSkipUrl()); - config.setContact0(officialConfig.getContact0()); - config.setContact1(officialConfig.getContact1()); - config.setContact2(officialConfig.getContact2()); - Integer androidSkipType = officialConfig.getAndroidSkipType(); - // goggle play - if (androidSkipType == SKIP_TYPE_FOR_STORE) { - config.setAndroidUrl(officialConfig.getAndroidSkipUrl()); - } else { - String androidNormalUrl = officialConfig.getAndroidNormalUrl(); - String androidReserveUrl = officialConfig.getAndroidReserveUrl(); - List<String> androidUrls = Stream.of(androidNormalUrl, androidReserveUrl).filter(StrUtil::isNotEmpty).collect(Collectors.toList()); - if (androidUrls.size() != 2) { - config.setAndroidUrl(androidUrls.get(0)); - } else { - // 1/2的概率切换是否返回下载链接 - if (StrUtil.isEmpty(config.getAndroidUrl())) { - config.setAndroidUrl(officialConfig.getAndroidNormalUrl()); - List<OfficialClickRecord> records = officialClickRecordService.list(Wrappers.<OfficialClickRecord>lambdaQuery() - .like(OfficialClickRecord::getDownloadType, DOWNLOAD_TYPE_FOR_ANDROID) - .orderByDesc(OfficialClickRecord::getCreateTime) - .last("limit 1")); - if (CollectionUtil.isNotEmpty(records)) { - OfficialClickRecord officialClickRecord = records.get(0); - if (config.getAndroidUrl().equals(officialClickRecord.getDownloadUrl())) { - config.setAndroidUrl(officialConfig.getAndroidReserveUrl()); - } - } - } - } - } - try { - RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes(); - if (requestAttributes == null) { - return config; - } - ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) requestAttributes; - HttpServletRequest request = servletRequestAttributes.getRequest(); - String os = StrUtil.EMPTY; - String osVersion = StrUtil.EMPTY; - String model = StrUtil.EMPTY; - //设备 - String userAgentStr = request.getHeader(HttpHeaders.USER_AGENT); - if (StrUtil.isNotEmpty(userAgentStr)) { - UserAgent userAgent = UserAgent.parseUserAgentString(userAgentStr); - OperatingSystem operatingSystem = userAgent.getOperatingSystem(); - os = operatingSystem.getName(); - osVersion = String.valueOf(operatingSystem.getId()); - model = operatingSystem.getDeviceType().getName(); - } - //IP - String ipAddress = IPUtils.getRealIpAddress(request); - //记录 - OfficialBrowseRecord record = new OfficialBrowseRecord(); - record.setUserAgent(userAgentStr); - record.setClientIp(ipAddress); - record.setOs(os); - record.setOsVersion(osVersion); - record.setModel(model); - record.setCreateTime(new Date()); - officialBrowseRecordService.save(record); - } catch (Exception e) { - log.error(e.getMessage(), e); - } - return config; - } - - @Override - public void click(Integer downloadType, String downloadUrl) { - try { - RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes(); - if (requestAttributes == null) { - return; - } - ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) requestAttributes; - HttpServletRequest request = servletRequestAttributes.getRequest(); - String os = StrUtil.EMPTY; - String osVersion = StrUtil.EMPTY; - String model = StrUtil.EMPTY; - //设备 - String userAgentStr = request.getHeader(HttpHeaders.USER_AGENT); - if (StrUtil.isNotEmpty(userAgentStr)) { - UserAgent userAgent = UserAgent.parseUserAgentString(userAgentStr); - OperatingSystem operatingSystem = userAgent.getOperatingSystem(); - os = operatingSystem.getName(); - osVersion = String.valueOf(operatingSystem.getId()); - model = operatingSystem.getDeviceType().getName(); - } - //IP - String ipAddress = IPUtils.getRealIpAddress(request); - //记录 - OfficialClickRecord record = new OfficialClickRecord(); - record.setDownloadType(downloadType); - record.setDownloadUrl(downloadUrl); - record.setUserAgent(userAgentStr); - record.setClientIp(ipAddress); - record.setOs(os); - record.setOsVersion(osVersion); - record.setModel(model); - record.setCreateTime(new Date()); - officialClickRecordService.save(record); - } catch (Exception e) { - log.error(e.getMessage(), e); - } - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/purse/UserPurseService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/purse/UserPurseService.java index dd3a90afc..9b349307b 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/purse/UserPurseService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/purse/UserPurseService.java @@ -10,7 +10,6 @@ import com.accompany.business.service.clan.ClanService; import com.accompany.business.service.gift.GiftSendConsumeGoldService; import com.accompany.business.service.record.BillRecordService; import com.accompany.business.service.user.UsersService; -import com.accompany.business.service.withdraw.WithdrawUserLimitService; import com.accompany.business.vo.UserPurseVo; import com.accompany.business.vo.UserPurseWithRoomTypeVo; import com.accompany.common.annotation.Frozen; @@ -69,8 +68,6 @@ public class UserPurseService extends ServiceImpl<UserPurseMapper,UserPurse> { @Autowired private GiftSendConsumeGoldService giftSendConsumeGoldService; @Autowired - private WithdrawUserLimitService withdrawUserLimitService; - @Autowired private PartitionInfoService partitionInfoService; @Autowired private FamilyDiamondSettlementPurseService familyDiamondSettlementPurseService; @@ -463,8 +460,6 @@ public class UserPurseService extends ServiceImpl<UserPurseMapper,UserPurse> { if (totalCurrencyNum.compareTo(num) < 0){ throw new ServiceException(BusiStatus.PURSE_MONEY_NOT_ENOUGH); } - //兑换钻石校验 - withdrawUserLimitService.checkDiamond(uid); return withLock(uid, RedisKey.lock_user_gold, up -> { // double check Double totalNum = DoubleUtil.add(up.getDiamonds(), up.getGolds()); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomSearchLogService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomSearchLogService.java deleted file mode 100644 index 53c8a85b5..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomSearchLogService.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.accompany.business.service.room; - -import com.accompany.business.model.room.RoomSearchLog; -import com.accompany.business.mybatismapper.RoomSearchLogMapper; -import com.accompany.common.device.DeviceInfo; -import com.accompany.core.base.SpringContextHolder; -import com.accompany.core.vo.user.SearchVo; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.extern.slf4j.Slf4j; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Queue; -import java.util.concurrent.ConcurrentLinkedQueue; -import java.util.stream.Collectors; - -/** - * @author xiaoyuyou - * @since 2020-04-24 - * 房间搜索 - */ -@Slf4j -@Service -public class RoomSearchLogService extends ServiceImpl<RoomSearchLogMapper, RoomSearchLog> { - - private final Queue<RoomSearchLog> queue = new ConcurrentLinkedQueue<>(); - - public void log(Date createTime, Long uid, DeviceInfo deviceInfo, String key, Integer type, - Integer page, Integer pageSize, - List<SearchVo> searchVos) { - RoomSearchLog l = new RoomSearchLog(); - l.setCreateTime(createTime); - l.setUid(uid); - l.setAppVersion(deviceInfo.getAppVersion()); - l.setAppChannel(deviceInfo.getChannel()); - l.setSearchKey(key); - l.setSearchType(type); - l.setPage(page); - l.setPageSize(pageSize); - l.setResultUids(searchVos.stream().map(SearchVo::getUid).collect(Collectors.toList())); - - queue.add(l); - } - - @Scheduled(initialDelay = 5000, fixedRate = 1000) - public void insertToDb() { - List<RoomSearchLog> list = new ArrayList<>(); - for (int i = 0; i < 200; i++) { - RoomSearchLog params = queue.poll(); - if (params == null) { - break; - } - list.add(params); - } - if (list.isEmpty()) { - return; - } - SpringContextHolder.getBean(RoomSearchLogService.class).saveBatch(list); - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/BlindDateServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/BlindDateServiceImpl.java index ad05fe925..a9858bf85 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/BlindDateServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/BlindDateServiceImpl.java @@ -23,7 +23,6 @@ import com.accompany.common.netease.neteaseacc.result.RoomRet; import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.UUIDUtil; -import com.accompany.core.annotation.LogTime; import com.accompany.core.exception.ServiceException; import com.accompany.core.model.Room; import com.accompany.core.model.Users; @@ -100,8 +99,7 @@ public class BlindDateServiceImpl implements BlindDateService { private ApplicationContext applicationContext; protected Gson gson = new Gson(); - - @LogTime + @Override public List<BlindDatePickDTO> matchView(Long roundId) { BlindDateRoundDTO blindDateRoundDTO = blindDateRoundService.getById(roundId); @@ -202,7 +200,6 @@ public class BlindDateServiceImpl implements BlindDateService { return linkedList; } - @LogTime @Override public List<DatingNotifyInfoDTO> buildNotifyDTO(Long roundId) { BlindDatePhaseStateEnum latestStateByRoundId = blindDateRoundHistoryService.latestStateByRoundId(roundId); @@ -305,14 +302,12 @@ public class BlindDateServiceImpl implements BlindDateService { log.error("publishBlindDateNotifyMsg error", e); } } - - @LogTime + @Override public void publish(Long roundId) { notifyRound(roundId); } - - @LogTime + private void notifyRound(long roundId) { BlindDateRoundDTO blindDateRoundDTO = blindDateRoundService.getById(roundId); List<DatingNotifyInfoDTO> notifyDTOs = buildNotifyDTO(roundId); @@ -330,8 +325,7 @@ public class BlindDateServiceImpl implements BlindDateService { sendRoomMsgTemplate.setAttach(JsonUtil.parseToString(attach)); pushRoomService.sendRoomMsg(sendRoomMsgTemplate); } - - @LogTime + @Override public void cleanQueue(Long roundId) { // 队列还原 @@ -505,8 +499,7 @@ public class BlindDateServiceImpl implements BlindDateService { blindDataConfigVO.setJoinHandList(joinHandList); return blindDataConfigVO; } - - @LogTime + @Override public void testAA() { List<BlindDatePickDTO> list = new ArrayList<>(); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/PushRoomServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/PushRoomServiceImpl.java index 5957d58ef..4e92e561f 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/PushRoomServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/PushRoomServiceImpl.java @@ -5,7 +5,6 @@ import com.accompany.business.dto.SendRoomMsgTemplate; import com.accompany.business.service.room.PushRoomService; import com.accompany.business.util.NetEaseHttpUtil; import com.accompany.common.netease.util.NetEaseConstant; -import com.accompany.core.annotation.LogTime; import com.accompany.core.util.JsonUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -36,8 +35,7 @@ public class PushRoomServiceImpl implements PushRoomService { sendRoomMsgDTO.setAttach(sendRoomMsgTemplate.getAttach()); send(sendRoomMsgDTO); } - - @LogTime + @Override public void sendTip(SendRoomMsgTemplate sendRoomMsgTemplate) { SendRoomMsgDTO sendRoomMsgDTO = new SendRoomMsgDTO(); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/TopicBoxItemService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/TopicBoxItemService.java deleted file mode 100644 index ee7801051..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/TopicBoxItemService.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.accompany.business.service.user; - -import com.accompany.business.model.TopicBoxItem; -import com.accompany.business.model.TopicBoxItemExample; -import com.accompany.business.model.TopicBoxItemVo; -import com.accompany.business.mybatismapper.TopicBoxItemMapper; -import com.accompany.common.redis.RedisKey; -import com.accompany.core.service.base.BaseService; -import com.accompany.core.service.common.JedisService; -import com.accompany.core.util.StringUtils; -import com.google.common.collect.Lists; -import com.google.gson.reflect.TypeToken; -import org.apache.commons.collections.CollectionUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.stream.Collectors; - -/** - * ｛这里添加描述｝ - * - * @author fangchengyan - * @date 2019-05-30 17:10 - */ -@Service -public class TopicBoxItemService extends BaseService { - - @Autowired - private TopicBoxItemMapper topicBoxItemMapper; - @Autowired - private JedisService jedisService; - - public List<TopicBoxItemVo> list(Byte status) { - String json = jedisService.get(RedisKey.topic_box_msg_items.getKey()); - if(StringUtils.isNotBlank(json)) { - return gson.fromJson(json, new TypeToken<List<TopicBoxItemVo>>(){}.getType()); - } - List<TopicBoxItem> topicBoxItems = queryTopicBoxItem(status); - if(null == topicBoxItems) { - return Lists.newArrayList(); - } - //应产品要求，最多显示11个 - List<TopicBoxItemVo> results = topicBoxItems.stream().limit(11).map(item -> { - TopicBoxItemVo vo = new TopicBoxItemVo(); - vo.setId(item.getId()); - vo.setContent(item.getContent()); - return vo; - }).collect(Collectors.toList()); - if(CollectionUtils.isNotEmpty(results)) { - jedisService.set(RedisKey.topic_box_msg_items.getKey(), gson.toJson(results)); - } - return results; - } - - public List<TopicBoxItem> queryTopicBoxItem(Byte status) { - TopicBoxItemExample example = new TopicBoxItemExample(); - example.setOrderByClause(" seq_no asc, create_time desc"); - TopicBoxItemExample.Criteria criteria = example.createCriteria(); - if(null != status) { - criteria.andStatusEqualTo(status); - } - return topicBoxItemMapper.selectByExample(example); - } - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/TopicBoxMsgService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/TopicBoxMsgService.java deleted file mode 100644 index c0b9bf145..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/TopicBoxMsgService.java +++ /dev/null @@ -1,200 +0,0 @@ -package com.accompany.business.service.user; - -import com.accompany.business.model.TopicBoxMsg; -import com.accompany.business.model.TopicBoxMsgExample; -import com.accompany.business.mybatismapper.TopicBoxMsgMapper; -import com.accompany.common.constant.Constant; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.StringUtils; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.service.base.BaseService; -import com.accompany.core.service.common.JedisService; -import org.apache.commons.lang3.exception.ExceptionUtils; -import org.apache.commons.lang3.math.NumberUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.*; -import java.util.concurrent.ThreadPoolExecutor; - -/** - * ｛这里添加描述｝ - * - * @author fangchengyan - * @date 2019-05-30 17:35 - */ -@Service -public class TopicBoxMsgService extends BaseService { - - @Autowired - private JedisService jedisService; - @Autowired - private TopicBoxMsgMapper topicBoxMsgMapper; - @Resource(name = "async-executor") - private ThreadPoolExecutor asyncExecutor; - - /** 话匣子消息标识 */ - private final String FIELD_CAN_SEND_FLAG = "canSendFlag"; - /** 话匣子时间标识 */ - private final String FIELD_TIMESTMP = "timestamp"; - - /** 话题消息存在标识 */ - private final String FLAG_CAN_SEND = "1"; - /** 话题消息不存在标识 */ - private final String FLAG_CAN_NOT_SEND = "0"; - - /** 以秒为单位的3天时长 */ - private final int SECOND_3_DAYS = 3 * 24 * 60 * 60; - - private final String RETURN_VAL_REASON = "reason"; - private final String RETURN_VAL_RESULT = "result"; - - /** - * 话匣子消息上报 - * 消息上报时，上报到redis的map中, from对应的field次数加1 - * - * map结构如下： - * - map的key: - * erban_topic_box_msg_record_uid1_uid2: uid1、uid2为通信的双方，按数值大小排序 - * - canSendFlag: 是否可以发送标识 - * - timestamp: 时间戳 - * - uid1 : uid1向uid2发送的记录数 - * - uid2： uid2向uid1发送的记录数 - * - * map设置为3天过期 - * - * map示例： - * { - * "canSendFlag": 1, - * "timestamp": 12345343454, - * "1111": "10", - * "2222": "10" - * } - * - * @param from - * @param to - * @return - */ - public boolean report(Long from, Long to, Integer type) { - String lockKey = RedisKey.topic_box_msg_lock.getKey(String.valueOf(from), String.valueOf(to)); - String lockVal = jedisService.lock(lockKey); - if(StringUtils.isEmpty(lockVal)) { - throw new ServiceException(BusiStatus.THE_MESSAGE_IS_BEING_PROCESSED_PLEASE_WAIT); - } - try { - String key = RedisKey.topic_box_msg_record.getKey(getSuffix(from, to)); - jedisService.hset(key, FIELD_TIMESTMP, String.valueOf(System.currentTimeMillis())); - jedisService.expire(key, SECOND_3_DAYS); - if(type == Constant.TopicBoxMsgType.TOPIC_BOX) { - jedisService.hset(key, FIELD_CAN_SEND_FLAG, FLAG_CAN_NOT_SEND); - } else if(type == Constant.TopicBoxMsgType.THROW_POINT) { - jedisService.hincrBy(key, String.valueOf(from), 1L); - long fromSendTime = NumberUtils.toLong(jedisService.hget(key, String.valueOf(from))); - long toSendTime = NumberUtils.toLong(jedisService.hget(key, String.valueOf(to))); - if(fromSendTime == toSendTime) { - jedisService.hset(key, FIELD_CAN_SEND_FLAG, FLAG_CAN_SEND); - } else { - jedisService.hset(key, FIELD_CAN_SEND_FLAG, FLAG_CAN_NOT_SEND); - } - } - TopicBoxMsg topicBoxMsg = new TopicBoxMsg(); - topicBoxMsg.setFromUid(from); - topicBoxMsg.setToUid(to); - topicBoxMsg.setType(type.byteValue()); - topicBoxMsg.setCreateTime(new Date()); - //异步插入 - asyncExecutor.execute(() -> topicBoxMsgMapper.insertSelective(topicBoxMsg)); - return true; - } catch (Exception e) { - logger.error("处理消息上报失败！from:{}, to:{}, exception:{}", from, to, ExceptionUtils.getStackTrace(e)); - return false; - } finally { - jedisService.unlock(lockKey, lockVal); - } - } - - /** - * 话匣子消息是否可以发送 - * @param from - * @param to - * @return - */ - public Map<String, Object> canSend(Long from, Long to) { - Map<String, Object> result = new HashMap<>(4); - String lockKey = RedisKey.topic_box_msg_lock.getKey(String.valueOf(from), String.valueOf(to)); - String lockVal = jedisService.lock(lockKey); - if(StringUtils.isEmpty(lockVal)) { - throw new ServiceException(BusiStatus.THE_MESSAGE_IS_BEING_PROCESSED_PLEASE_WAIT); - } - try { - String key = RedisKey.topic_box_msg_record.getKey(getSuffix(from, to)); - Map<String, String> allParam = jedisService.hgetAll(key); - long time = NumberUtils.toLong(allParam.get(FIELD_TIMESTMP), 0); - // 表示键已过期 - if(time != 0 && System.currentTimeMillis() - time > SECOND_3_DAYS * 1000) { - logger.error("key{}过期，当前时间：{}, 最近更新时间:{}, 时间差大于{}", key, System.currentTimeMillis(), - time, SECOND_3_DAYS * 1000); - jedisService.del(key); - result.put(RETURN_VAL_RESULT, true); - result.put(RETURN_VAL_REASON, "已过期"); - return result; - } - String canSendFlag = allParam.get(FIELD_CAN_SEND_FLAG); - logger.info("判断是否可以发送话匣子消息，canSendFlag:{}", canSendFlag); - boolean sendFlag = StringUtils.isEmpty(canSendFlag) || FLAG_CAN_SEND.equals(canSendFlag); - result.put(RETURN_VAL_RESULT, sendFlag); - if(sendFlag) { - result.put(RETURN_VAL_REASON, "成功"); - } else { - int fromTime = NumberUtils.toInt(allParam.get(String.valueOf(from)), 0); - int toTime = NumberUtils.toInt(allParam.get(String.valueOf(to)), 0); - result.put(RETURN_VAL_REASON, (fromTime > toTime) ? "需要对方回答后，才能再次发起哦" : "需要回答后，才能再次发起哦"); - } - return result; - } catch (Exception e) { - logger.error("处理消息上报失败！from:{}, to:{}, exception:{}", from, to, ExceptionUtils.getStackTrace(e)); - result.put(RETURN_VAL_RESULT, false); - result.put(RETURN_VAL_REASON, BusiStatus.SERVERERROR.getReasonPhrase()); - } finally { - jedisService.unlock(lockKey, lockVal); - } - return result; - } - - /** - * 排序后，得到redis key 的suffix - * - * 通过排序的方式，不过是1111发给2222，还是2222发给1111，得到的suffix都是“1111_2222” - * @param from - * @param to - * @return - */ - private String getSuffix(Long from, Long to) { - Long[] uids = {from, to}; - Arrays.sort(uids); - return String.format("%s_%s", uids[0], uids[1]); - } - - public List<TopicBoxMsg> queryTopicBoxMsg(Long from, Long to, Byte type, Date startTime, Date endTime) { - TopicBoxMsgExample example = new TopicBoxMsgExample(); - TopicBoxMsgExample.Criteria criteria = example.createCriteria(); - if(null != from) { - criteria.andFromUidEqualTo(from); - } - if(null != to) { - criteria.andToUidEqualTo(to); - } - if(null != type) { - criteria.andTypeEqualTo(type); - } - if(null != startTime) { - criteria.andCreateTimeGreaterThanOrEqualTo(startTime); - } - if(null != endTime) { - criteria.andCreateTimeLessThanOrEqualTo(endTime); - } - return topicBoxMsgMapper.selectByExample(example); - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserDetailsService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserDetailsService.java index 51f0a0ae4..33c5c5159 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserDetailsService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserDetailsService.java @@ -10,7 +10,6 @@ import com.accompany.business.service.community.DynamicService; import com.accompany.business.service.dress.UserPersonalBackgroundService; import com.accompany.business.service.family.FamilyManagerService; import com.accompany.business.service.follow.FansService; -import com.accompany.business.service.gamepartner.UserGamePartnerInfoService; import com.accompany.business.service.guild.GuildManagerService; import com.accompany.business.service.medal.UserMedalService; import com.accompany.business.service.relation.RelationUserService; @@ -82,8 +81,6 @@ public class UserDetailsService extends BaseService { @Resource(name = "biz-executor") private ThreadPoolExecutor taskExecutor; @Autowired - private UserGamePartnerInfoService userGamePartnerInfoService; - @Autowired private UserMedalService userMedalService; @Autowired private RelationUserService relationUserService; @@ -187,7 +184,6 @@ public class UserDetailsService extends BaseService { //勋章 userDetailsVo.setMedals(userMedalService.getUserMedalWithDetail(uid)); - userDetailsVo.setUserGamePartner(userGamePartnerInfoService.listUserGamePartnerInfo(uid)); userDetailsVo.setIsRechargeUser(rechargeUserService.isRechargeUser(uid)); }catch (Exception e){ diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserYearReportService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserYearReportService.java deleted file mode 100644 index e7936be86..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserYearReportService.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.accompany.business.service.user; - -import com.accompany.business.model.UserYearReport; -import com.accompany.business.mybatismapper.UserYearReportMapper; -import com.accompany.business.vo.SimpleUserVo; -import com.accompany.business.vo.user.UserYearReportVo; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.enumeration.PartitionEnum; -import com.accompany.core.model.Users; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Date; - -@Service -public class UserYearReportService extends ServiceImpl<UserYearReportMapper, UserYearReport> { - - @Autowired - private UsersService usersService; - - private Date year = DateTimeUtil.convertStrToDate("2025-01-01 00:00:00"); - - public UserYearReportVo getUserYearReport(Long uid) { - UserYearReport po = this.getById(uid); - if (null == po){ - return null; - } - - UserYearReportVo vo = new UserYearReportVo(); - BeanUtils.copyProperties(po, vo); - - Users u = usersService.getNotNullUsersByUid(vo.getUid()); - vo.setMe(usersService.getSimpleUserVo(u)); - - PartitionEnum partitionEnum = PartitionEnum.getByPartitionId(u.getPartitionId()); - - Date createTime = DateTimeUtil.withZoneSameInstant(u.getCreateTime(), partitionEnum.getZoneId()); - vo.setCreateTime(DateTimeUtil.convertDateTime(createTime)); - vo.setCreateDays(DateTimeUtil.diffDayByDateV2(createTime, year)); - - if (null != po.getCpUid()){ - vo.setCpUid(po.getCpUid()); - Date cpCreateTime = DateTimeUtil.withZoneSameInstant(po.getCpCreateTime(), partitionEnum.getZoneId()); - vo.setCpCreateTime(DateTimeUtil.convertDateTime(cpCreateTime)); - vo.setCpCreateDays(DateTimeUtil.diffDayByDateV2(cpCreateTime, year)); - vo.setCpValue(po.getCpValue()); - - SimpleUserVo cp = usersService.getSimpleUserByUid(po.getCpUid()); - vo.setCp(cp); - } - - vo.setGiftWallCount(po.getGiftWallCount()); - vo.setGiftId(po.getGiftId()); - vo.setGiftName(po.getGiftName()); - - vo.setGiveDiamond(po.getGiveDiamond()); - - return vo; - } - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UsersService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UsersService.java index 3a6bb7011..26164737b 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UsersService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UsersService.java @@ -24,7 +24,6 @@ import com.accompany.business.service.guild.GuildH5InviteRecordService; import com.accompany.business.service.hall.HallService; import com.accompany.business.service.headwear.HeadwearService; import com.accompany.business.service.level.LevelService; -import com.accompany.business.service.live.LiveAttestationService; import com.accompany.business.service.nameplate.UserNameplateService; import com.accompany.business.service.netease.YidunCheckUtil; import com.accompany.business.service.purse.UserPurseService; @@ -59,7 +58,6 @@ import com.accompany.core.service.account.AccountService; import com.accompany.core.service.base.BaseService; import com.accompany.core.service.common.JedisService; import com.accompany.core.service.partition.PartitionInfoService; -import com.accompany.core.service.phone.PhoneAuthApplyRecordService; import com.accompany.core.service.region.RegionInfoService; import com.accompany.core.service.region.RegionService; import com.accompany.core.service.user.UsersBaseService; @@ -77,7 +75,6 @@ import com.accompany.email.service.EmailService; import com.accompany.payment.service.RechargeUserService; import com.accompany.sms.service.SmsService; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import lombok.extern.slf4j.Slf4j; @@ -128,8 +125,6 @@ public class UsersService extends BaseService { @Autowired private HallService hallService; @Autowired - private LiveAttestationService liveAttestationService; - @Autowired private ApplicationContext applicationContext; @Autowired private UserFrozenRecordMapper userFrozenRecordMapper; @@ -154,8 +149,6 @@ public class UsersService extends BaseService { @Autowired private UserRoomCardService userRoomCardService; @Autowired - private PhoneAuthApplyRecordService phoneAuthApplyRecordService; - @Autowired private RegionService regionService; @Autowired private RechargeUserService rechargeUserService; @@ -319,10 +312,9 @@ public class UsersService extends BaseService { UserHeadwearVo userHeadwearVo = this.headwearService.getUserUsingHeadwearVo(uid); UserNameplateVo userNameplateVo = userNameplateService.getUserUsingNameplateVo(uid); HallMember hallMember = hallService.getHallMember(uid); - LiveUserInfoSkillVo userInfoSkillVo = liveAttestationService.getUserSkill(uid); userVo = converToUserVo(user, userLevelVo, carport, userHeadwearVo, hallMember == null ? null : hallMember.getHallId(), - userInfoSkillVo); + null); userVo.setIsBindPhone(CommonUtil.checkPhoneFormat(account.getPhoneAreaCode(), account.getPhone()) || user.getDefUser().byteValue() == Constant.DefUser.LABOR_UNION); // 是否绑定了登录密码 @@ -1214,9 +1206,6 @@ public class UsersService extends BaseService { throw new ServiceException(BusiStatus.THE_PHONE_NUMBER_HAS_BEEN_REGISTERED); } - if (Constant.CHINA_MAINLAND_PHONE_AREA_CODE.equals(phoneAreaCode)) { - phoneAuthApplyRecordService.isVaild(phone, phoneAreaCode); - } if (smsService.verifySmsCode(phone, code)) { usersBaseService.boundPhone(uid, phone, phoneAreaCode); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/usersign/impl/UserSignRecordServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/usersign/impl/UserSignRecordServiceImpl.java index 3e54f4abd..496dab979 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/usersign/impl/UserSignRecordServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/usersign/impl/UserSignRecordServiceImpl.java @@ -4,18 +4,10 @@ import com.accompany.business.model.usersign.UserSignRecord; import com.accompany.business.mybatismapper.usersign.UserSignRecordMapper; import com.accompany.business.service.usersign.UserSignRecordService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.redisson.api.RBucket; -import org.redisson.api.RSet; -import org.redisson.api.RedissonClient; -import org.redisson.client.codec.IntegerCodec; -import org.redisson.client.codec.StringCodec; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Date; -import static com.accompany.business.constant.dailytask.DailyTaskConstant.SignRedisKey.*; - /** * 签到记录表 服务实现类 * diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/vip/VipDiamondOpenService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/vip/VipDiamondOpenService.java index b48479b1e..4a2e6687b 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/vip/VipDiamondOpenService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/vip/VipDiamondOpenService.java @@ -8,7 +8,6 @@ import com.accompany.business.service.user.UsersService; import com.accompany.common.constant.Constant; import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.AssertUtil; import com.accompany.common.utils.StringUtils; import com.accompany.core.enumeration.BillObjTypeEnum; import com.accompany.core.exception.ServiceException; @@ -54,7 +53,6 @@ public class VipDiamondOpenService { */ @Transactional(rollbackFor = Exception.class, transactionManager = "mybatisplusTransactionManager") public void openVipWithDiamond(Long roomUid, Long uid, Integer vipLevel) { - AssertUtil.isTrue(null != uid, new ServiceException(BusiStatus.PARAMETERILLEGAL)); VipInfo vipInfo = vipInfoService.getByVipLevel(vipLevel); if (null == vipInfo) { throw new ServiceException(BusiStatus.PARAMETERILLEGAL); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/ExchangeRateService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/ExchangeRateService.java deleted file mode 100644 index 12e00c894..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/ExchangeRateService.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.accompany.business.service.withdraw; - -import com.accompany.business.model.withdraw.ExchangeRate; -import com.baomidou.mybatisplus.extension.service.IService; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * @author: liaozetao - * @date: 2023/7/7 14:08 - * @description: - */ -public interface ExchangeRateService extends IService<ExchangeRate> { - - Date getLastRateTime(); - - /** - * 更新汇率 - * - * @param currency - * @param rate - */ - void updateRate(String currency, BigDecimal rate); -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/SmsWithdrawService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/SmsWithdrawService.java deleted file mode 100644 index 38a059e4c..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/SmsWithdrawService.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.accompany.business.service.withdraw; - -/** - * @author: liaozetao - * @date: 2023/7/25 18:03 - * @description: - */ -public interface SmsWithdrawService { - - /** - * 绑定手机号码 - * - * @param uid - * @param phone - * @param code - * @param phoneAreaCode - * @return - */ - Boolean boundPhone(Long uid, String phone, String code, String phoneAreaCode); -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/WithdrawAccountDtlService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/WithdrawAccountDtlService.java deleted file mode 100644 index 49a2ab09a..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/WithdrawAccountDtlService.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.accompany.business.service.withdraw; - -import com.accompany.business.model.withdraw.WithdrawAccountDtl; -import com.accompany.business.vo.withdraw.WithdrawAccountDtlVo; -import com.baomidou.mybatisplus.extension.service.IService; - -import java.util.List; - -/** - * @author: liaozetao - * @date: 2023/7/7 11:17 - * @description: - */ -public interface WithdrawAccountDtlService extends IService<WithdrawAccountDtl> { - - /** - * 账户列表 - * - * @param uid - * @return - */ - List<WithdrawAccountDtlVo> getAccounts(Long uid); -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/WithdrawConfigService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/WithdrawConfigService.java deleted file mode 100644 index a710c663b..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/WithdrawConfigService.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.accompany.business.service.withdraw; - -import com.accompany.business.model.withdraw.WithdrawConfig; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * @author: liaozetao - * @date: 2023/7/7 11:18 - * @description: - */ -public interface WithdrawConfigService extends IService<WithdrawConfig> { -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/WithdrawUserAccountService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/WithdrawUserAccountService.java deleted file mode 100644 index 0c72f28f0..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/WithdrawUserAccountService.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.accompany.business.service.withdraw; - -import com.accompany.business.dto.withdraw.WithdrawAmountHolder; -import com.accompany.business.model.withdraw.WithdrawConfig; -import com.accompany.business.model.withdraw.WithdrawUserAccount; -import com.accompany.business.vo.withdraw.WithdrawUserAccountVo; -import com.baomidou.mybatisplus.extension.service.IService; - -import java.util.List; - -/** - * @author: liaozetao - * @date: 2023/7/7 14:54 - * @description: - */ -public interface WithdrawUserAccountService extends IService<WithdrawUserAccount> { - - /** - * 保存 - * - * @param account - */ - void saveAccount(WithdrawUserAccount account); - - /** - * 列表 - * - * @param uid - * @return - */ - List<WithdrawUserAccountVo> accountList(Long uid); - - /** - * 汇率计算 - * - * @param uid - * @param accountType - * @param goldNum - * @return - */ - WithdrawAmountHolder calculate(Long uid, Integer accountType, Integer goldNum); - - /** - * 提现申请 - * - * @param uid - * @param accountType - * @param goldNum - */ - void apply(Long uid, Integer accountType, Integer goldNum); - - /** - * 提现配置 - * - * @param uid - * @return - */ - WithdrawConfig config(Long uid); -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/WithdrawUserLimitService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/WithdrawUserLimitService.java deleted file mode 100644 index 6f0576f92..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/WithdrawUserLimitService.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.accompany.business.service.withdraw; - -import com.accompany.business.model.withdraw.WithdrawUserLimit; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * @author: liaozetao - * @date: 2023/7/10 14:32 - * @description: - */ -public interface WithdrawUserLimitService extends IService<WithdrawUserLimit> { - - /** - * 兑换钻石校验 - * - * @param uid - */ - void checkDiamond(Long uid); -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/WithdrawUserRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/WithdrawUserRecordService.java deleted file mode 100644 index 121ad7fd3..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/WithdrawUserRecordService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.accompany.business.service.withdraw; - -import com.accompany.business.model.withdraw.WithdrawUserRecord; -import com.accompany.business.vo.withdraw.WithdrawUserRecordVo; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.IService; - -import java.util.Date; -import java.util.List; - -/** - * @author: liaozetao - * @date: 2023/7/10 14:32 - * @description: - */ -public interface WithdrawUserRecordService extends IService<WithdrawUserRecord> { - - /** - * 分页 - * - * @param page - * @param recordStatus - * @param erBanNo - * @param accountType - * @param applyStartTime - * @param applyEndTime - * @return - */ - List<WithdrawUserRecordVo> page(Page<WithdrawUserRecord> page, Integer recordStatus, String erBanNo, Integer accountType, Date applyStartTime, Date applyEndTime); - - /** - * 统计 - * - * @param recordStatus - * @param erBanNo - * @param accountType - * @param applyStartTime - * @param applyEndTime - * @return - */ - Long totalCount(Integer recordStatus, String erBanNo, Integer accountType, Date applyStartTime, Date applyEndTime); -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/WithdrawUserService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/WithdrawUserService.java deleted file mode 100644 index 5da058802..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/WithdrawUserService.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.accompany.business.service.withdraw; - -import com.accompany.business.model.withdraw.WithdrawUser; -import com.accompany.business.model.withdraw.WithdrawUserAccount; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * @author: liaozetao - * @date: 2023/7/7 14:53 - * @description: - */ -public interface WithdrawUserService extends IService<WithdrawUser> { - - /** - * 提现用户 - * - * @param account - */ - void saveUser(WithdrawUserAccount account); -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/ExchangeRateServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/ExchangeRateServiceImpl.java deleted file mode 100644 index 1d627b3ee..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/ExchangeRateServiceImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.accompany.business.service.withdraw.impl; - -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.StrUtil; -import com.accompany.business.model.withdraw.ExchangeRate; -import com.accompany.business.mybatismapper.withdraw.ExchangeRateMapper; -import com.accompany.business.service.withdraw.ExchangeRateService; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * @author: liaozetao - * @date: 2023/7/7 14:09 - * @description: - */ -@Slf4j -@Service -public class ExchangeRateServiceImpl extends ServiceImpl<ExchangeRateMapper, ExchangeRate> implements ExchangeRateService { - @Override - public Date getLastRateTime() { - return baseMapper.getLastRateTime(); - } - - @Override - public void updateRate(String currency, BigDecimal rate) { - if (StrUtil.isEmpty(currency) || rate == null) { - return; - } - Date now = new Date(); - ExchangeRate exchangeRate = null; - List<ExchangeRate> exchangeRates = baseMapper.selectList(Wrappers.<ExchangeRate>lambdaQuery() - .eq(ExchangeRate::getCurrency, currency)); - if (CollectionUtil.isNotEmpty(exchangeRates)) { - exchangeRate = exchangeRates.get(0); - } else { - exchangeRate = new ExchangeRate(); - exchangeRate.setCurrency(currency); - exchangeRate.setCreateTime(now); - } - exchangeRate.setRate(rate); - exchangeRate.setUpdateTime(now); - saveOrUpdate(exchangeRate); - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/SmsWithdrawServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/SmsWithdrawServiceImpl.java deleted file mode 100644 index 0db7b6bc9..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/SmsWithdrawServiceImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.accompany.business.service.withdraw.impl; - -import com.accompany.business.service.withdraw.SmsWithdrawService; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.service.common.JedisService; -import com.accompany.core.service.user.UsersBaseService; -import com.accompany.sms.service.SmsService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Date; - -/** - * @author: liaozetao - * @date: 2023/7/25 18:03 - * @description: - */ -@Slf4j -@Service -public class SmsWithdrawServiceImpl implements SmsWithdrawService { - - @Autowired - private UsersBaseService usersBaseService; - - @Autowired - private SmsService smsService; - - @Autowired - private JedisService jedisService; - - - @Override - public Boolean boundPhone(Long uid, String phone, String code, String phoneAreaCode) { - if (smsService.verifySmsCode(phone, code)) { - try { - usersBaseService.boundPhone(uid, phone, phoneAreaCode); - } catch (Exception e) { - throw new ServiceException(e.getMessage()); - } - //记录最近30天内绑定手机号 - jedisService.setex(RedisKey.blind_phone_sign.getKey(String.valueOf(uid)), 30 * 24 * 60 * 60, String.valueOf(new Date().getTime())); - return true; - } else { - throw new ServiceException(BusiStatus.SMSCODEERROR); - } - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/WithdrawAccountDtlServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/WithdrawAccountDtlServiceImpl.java deleted file mode 100644 index 519fe1086..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/WithdrawAccountDtlServiceImpl.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.accompany.business.service.withdraw.impl; - -import cn.hutool.core.collection.CollectionUtil; -import com.accompany.business.constant.withdraw.WithdrawAccountTypeConstant; -import com.accompany.business.model.withdraw.WithdrawAccountDtl; -import com.accompany.business.model.withdraw.WithdrawUserAccount; -import com.accompany.business.model.withdraw.WithdrawUserRecord; -import com.accompany.business.mybatismapper.withdraw.WithdrawAccountDtlMapper; -import com.accompany.business.service.withdraw.WithdrawAccountDtlService; -import com.accompany.business.service.withdraw.WithdrawUserAccountService; -import com.accompany.business.service.withdraw.WithdrawUserRecordService; -import com.accompany.business.vo.withdraw.WithdrawAccountDtlVo; -import com.accompany.common.constant.Constant; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.function.Function; -import java.util.stream.Collectors; - -/** - * @author: liaozetao - * @date: 2023/7/7 11:20 - * @description: - */ -@Slf4j -@Service -public class WithdrawAccountDtlServiceImpl extends ServiceImpl<WithdrawAccountDtlMapper, WithdrawAccountDtl> implements WithdrawAccountDtlService { - - @Autowired - private WithdrawAccountDtlService withdrawAccountDtlService; - - @Autowired - private WithdrawUserAccountService withdrawUserAccountService; - - @Autowired - private WithdrawUserRecordService withdrawUserRecordService; - - @Override - public List<WithdrawAccountDtlVo> getAccounts(Long uid) { - List<WithdrawUserAccount> userAccounts = withdrawUserAccountService.list(Wrappers.<WithdrawUserAccount>lambdaQuery() - .eq(WithdrawUserAccount::getUid, uid) - .in(WithdrawUserAccount::getAccountType, - WithdrawAccountTypeConstant.ORDER_ACCOUNT, - WithdrawAccountTypeConstant.CHINA_UNION_PAY, - WithdrawAccountTypeConstant.MAY_BANK, - WithdrawAccountTypeConstant.BANK_OF_SINGAPORE, - WithdrawAccountTypeConstant.TAI_WAN_BANK - )); - Map<Integer, WithdrawUserAccount> accountMap = null; - if (CollectionUtil.isNotEmpty(userAccounts)) { - accountMap = userAccounts.stream().collect(Collectors.toMap(WithdrawUserAccount::getAccountType, Function.identity(), (v1, v2) -> v1)); - } - int prevAccountType = 0; - List<WithdrawUserRecord> records = withdrawUserRecordService.list(Wrappers.<WithdrawUserRecord>lambdaQuery() - .eq(WithdrawUserRecord::getUid, uid) - .orderByDesc(WithdrawUserRecord::getCreateTime) - .last("limit 1")); - if (CollectionUtil.isNotEmpty(records)) { - WithdrawUserRecord record = records.get(0); - prevAccountType = record.getAccountType(); - } - List<WithdrawAccountDtlVo> accounts = new ArrayList<>(); - List<WithdrawAccountDtl> accountDtls = withdrawAccountDtlService.list(); - for (WithdrawAccountDtl accountDtl : accountDtls) { - Integer accountType = accountDtl.getAccountType(); - WithdrawAccountDtlVo account = new WithdrawAccountDtlVo(); - account.setId(account.getId()); - account.setAccountName(accountDtl.getAccountName()); - account.setAccountType(accountType); - if (accountMap != null && accountMap.containsKey(accountType)) { - WithdrawUserAccount withdrawUserAccount = accountMap.get(accountType); - BeanUtils.copyProperties(withdrawUserAccount, account); - } - account.setIsBind(accountMap != null && accountMap.containsKey(accountType) ? Constant.Yes1No0.YES : Constant.Yes1No0.NO); - if (prevAccountType != 0 && prevAccountType == accountType) { - account.setIsPrev(Constant.Yes1No0.YES); - } - accounts.add(account); - } - return accounts; - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/WithdrawConfigServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/WithdrawConfigServiceImpl.java deleted file mode 100644 index a9a31bc90..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/WithdrawConfigServiceImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.accompany.business.service.withdraw.impl; - -import com.accompany.business.model.withdraw.WithdrawConfig; -import com.accompany.business.mybatismapper.withdraw.WithdrawConfigMapper; -import com.accompany.business.service.withdraw.WithdrawConfigService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -/** - * @author: liaozetao - * @date: 2023/7/7 11:19 - * @description: - */ -@Slf4j -@Service -public class WithdrawConfigServiceImpl extends ServiceImpl<WithdrawConfigMapper, WithdrawConfig> implements WithdrawConfigService { -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/WithdrawUserAccountServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/WithdrawUserAccountServiceImpl.java deleted file mode 100644 index f7217c86b..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/WithdrawUserAccountServiceImpl.java +++ /dev/null @@ -1,342 +0,0 @@ -package com.accompany.business.service.withdraw.impl; - -import cn.hutool.core.collection.CollectionUtil; -import com.accompany.business.constant.withdraw.WithdrawAccountTypeConstant; -import com.accompany.business.constant.withdraw.WithdrawUserLimitConstant; -import com.accompany.business.dto.withdraw.WithdrawAmountHolder; -import com.accompany.business.enums.withdraw.RecordStatusEnum; -import com.accompany.business.model.withdraw.*; -import com.accompany.business.mybatismapper.withdraw.WithdrawUserAccountMapper; -import com.accompany.business.service.purse.UserPurseService; -import com.accompany.business.service.record.BillRecordService; -import com.accompany.business.service.withdraw.*; -import com.accompany.business.vo.withdraw.WithdrawUserAccountVo; -import com.accompany.common.constant.Constant; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.enumeration.BillObjTypeEnum; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.service.SysConfService; -import com.alibaba.fastjson.TypeReference; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.validation.constraints.NotNull; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.LocalTime; -import java.time.temporal.WeekFields; -import java.util.*; - -/** - * @author: liaozetao - * @date: 2023/7/7 14:55 - * @description: - */ -@Slf4j -@Service -public class WithdrawUserAccountServiceImpl extends ServiceImpl<WithdrawUserAccountMapper, WithdrawUserAccount> implements WithdrawUserAccountService { - - @Autowired - private WithdrawUserService withdrawUserService; - - @Autowired - private WithdrawConfigService withdrawConfigService; - - @Autowired - private ExchangeRateService exchangeRateService; - - @Autowired - private WithdrawAccountDtlService withdrawAccountDtlService; - - @Autowired - private WithdrawUserAccountService withdrawUserAccountService; - - @Autowired - private WithdrawUserRecordService withdrawUserRecordService; - - @Autowired - private UserPurseService userPurseService; - - @Autowired - private BillRecordService billRecordService; - - @Autowired - private WithdrawUserLimitService withdrawUserLimitService; - - @Autowired - private SysConfService sysConfService; - - @Transactional(rollbackFor = Exception.class) - @Override - public void saveAccount(WithdrawUserAccount account) { - Date now = new Date(); - Long id = account.getId(); - if (id != null) { - WithdrawUserAccount userAccount = getById(id); - if (userAccount != null) { - Integer updateNum = userAccount.getUpdateNum(); - if (updateNum != null && updateNum == 0) { - throw new ServiceException(BusiStatus.MODIFICATION_NOT_ALLOWED); - } - if (updateNum != null) { - updateNum -= 1; - account.setUpdateNum(updateNum); - } - Integer isRealCertify = userAccount.getIsRealCertify(); - if (isRealCertify != null && isRealCertify == Constant.Yes1No0.YES) { - if (!account.getName().equals(userAccount.getName()) || !account.getIdCardNo().equals(userAccount.getIdCardNo())) { - throw new ServiceException(BusiStatus.THE_AUTHENTICATION_IDENTITY_INFORMATION_IS_DIFFERENT_FROM_THE_LINKED_WITHDRAWAL_ACCOUNT_IDENTITY_INFORMATION); - } - } - account.setIsRealCertify(userAccount.getIsRealCertify()); - } - account.setUpdateTime(now); - updateById(account); - } else { - Long uid = account.getUid(); - Integer accountType = account.getAccountType(); - long count = count(Wrappers.<WithdrawUserAccount>lambdaQuery().eq(WithdrawUserAccount::getUid, uid).eq(WithdrawUserAccount::getAccountType, accountType)); - if (count > 0L) { - throw new ServiceException(BusiStatus.THE_WITHDRAWAL_METHOD_HAS_BEEN_ADDED); - } - int updateNum = 1; - if ((WithdrawAccountTypeConstant.CHINA_UNION_PAY & accountType) != 0) { - updateNum = sysConfService.getIntValueById(Constant.SysConfId.WITHDRAW_UPDATE_NUM); - } - if (updateNum == 0) { - updateNum = 1; - } - account.setUpdateNum(updateNum); - save(account); - } - //保存用户信息 - withdrawUserService.saveUser(account); - } - - @Override - public List<WithdrawUserAccountVo> accountList(Long uid) { - List<WithdrawAccountDtl> accountDtls = withdrawAccountDtlService.list(); - List<WithdrawUserAccount> userAccounts = list(Wrappers.<WithdrawUserAccount>lambdaQuery().eq(WithdrawUserAccount::getUid, uid)); - List<WithdrawUserAccountVo> accounts = new ArrayList<>(); - if (CollectionUtil.isNotEmpty(userAccounts)) { - for (WithdrawUserAccount userAccount : userAccounts) { - Long id = userAccount.getId(); - Integer accountType = userAccount.getAccountType(); - Integer isRealCertify = userAccount.getIsRealCertify(); - WithdrawUserAccountVo account = new WithdrawUserAccountVo(); - account.setId(id); - account.setAccountType(accountType); - account.setIsRealCertify(isRealCertify); - if (CollectionUtil.isNotEmpty(accountDtls)) { - Optional<WithdrawAccountDtl> any = accountDtls.stream().filter(v -> v.getAccountType().equals(accountType)).findAny(); - if (any.isPresent()) { - WithdrawAccountDtl withdrawAccountDtl = any.get(); - account.setAccountName(withdrawAccountDtl.getAccountName()); - account.setCurrencyType(withdrawAccountDtl.getCurrencyType()); - - } - } - accounts.add(account); - } - } - return accounts; - } - - @Override - public WithdrawAmountHolder calculate(Long uid, Integer accountType, Integer goldNum) { - WithdrawAmountHolder holder = new WithdrawAmountHolder(); - if (uid == null || accountType == null || goldNum == null) { - return holder; - } - List<WithdrawConfig> configs = withdrawConfigService.list(Wrappers.<WithdrawConfig>lambdaQuery().eq(WithdrawConfig::getIsEnabled, Constant.Yes1No0.YES)); - if (CollectionUtil.isEmpty(configs)) { - return holder; - } - long count = withdrawUserAccountService.count(Wrappers.<WithdrawUserAccount>lambdaQuery().eq(WithdrawUserAccount::getUid, uid).eq(WithdrawUserAccount::getAccountType, accountType)); - if (count <= 0L) { - throw new ServiceException(BusiStatus.ILLEGAL_ACCOUNT); - } - List<WithdrawAccountDtl> accountDtls = withdrawAccountDtlService.list(Wrappers.<WithdrawAccountDtl>lambdaQuery().eq(WithdrawAccountDtl::getAccountType, accountType)); - if (CollectionUtil.isEmpty(accountDtls)) { - return holder; - } - WithdrawAccountDtl withdrawAccountDtl = accountDtls.get(0); - String accountName = withdrawAccountDtl.getAccountName(); - String currencyType = withdrawAccountDtl.getCurrencyType(); - List<ExchangeRate> exchangeRates = exchangeRateService.list(Wrappers.<ExchangeRate>lambdaQuery().eq(ExchangeRate::getCurrency, currencyType)); - WithdrawConfig withdrawConfig = configs.get(0); - ExchangeRate exchangeRate = exchangeRates.get(0); - String currency = exchangeRate.getCurrency(); - BigDecimal rate = exchangeRate.getRate(); - //提现手续费 - BigDecimal handlingRate = withdrawConfig.getChargeRate(); - //扣除手续费后的金币 - BigDecimal afterGoldNum = new BigDecimal(goldNum).subtract(new BigDecimal(goldNum).multiply(handlingRate.divide(new BigDecimal(100), 4, RoundingMode.HALF_UP))); - //金币:美元 = 1:7000 - BigDecimal dollarAmount = afterGoldNum.divide(BigDecimal.valueOf(10000), 4, RoundingMode.HALF_UP); - //美元乘于汇率 - BigDecimal amount = (dollarAmount.multiply(rate)).divide(BigDecimal.ONE, 0, RoundingMode.DOWN); - log.info("rate : {}, handlingRate : {}, afterGoldNum : {}, dollarAmount : {}, amount : {}", rate, handlingRate, afterGoldNum, dollarAmount, amount); - holder.setAccountName(accountName); - holder.setExchangeRate(rate); - holder.setHandlingRate(handlingRate); - holder.setAfterGoldNum(afterGoldNum); - holder.setCashAmount(dollarAmount); - holder.setCurrency(currency); - holder.setCurrencyAmount(amount); - return holder; - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void apply(Long uid, Integer accountType, Integer goldNum) { - boolean isCashSwitch = sysConfService.getBoolValueById(Constant.SysConfId.CASH_SWITCH); - if (!isCashSwitch) { - throw new ServiceException(BusiStatus.CURRENTLY_UNABLE_TO_PERFORM_PICK_UP_OPERATION); - } - List<WithdrawUserLimit> withdrawUserLimits = withdrawUserLimitService.list(Wrappers.<WithdrawUserLimit>lambdaQuery() - .eq(WithdrawUserLimit::getUid, uid)); - if (CollectionUtil.isNotEmpty(withdrawUserLimits)) { - for (WithdrawUserLimit withdrawUserLimit : withdrawUserLimits) { - Integer limitType = withdrawUserLimit.getLimitType(); - if ((limitType & WithdrawUserLimitConstant.LIMIT_TYPE_OF_CASH) != 0) { - throw new ServiceException(BusiStatus.YOU_ARE_UNABLE_TO_USE_THIS_FEATURE_PLEASE_CONTACT_YOUR_GUILD_LEADER_YOU_ARE_UNABLE_TO_USE_THIS_FEATURE); - } - } - } - if ((goldNum % 10000) != 0) { - throw new ServiceException(BusiStatus.WITHDRAWAL_OF_GOLD_COINS_MUST_BE_IN_MULTIPLES_OF_1000); - } - List<WithdrawUserAccount> userAccounts = withdrawUserAccountService.list(Wrappers.<WithdrawUserAccount>lambdaQuery().eq(WithdrawUserAccount::getUid, uid).eq(WithdrawUserAccount::getAccountType, accountType)); - if (CollectionUtil.isEmpty(userAccounts)) { - throw new ServiceException(BusiStatus.ACCOUNT_DOES_NOT_EXIST); - } - WithdrawUserAccount withdrawUserAccount = userAccounts.get(0); - if (withdrawUserAccount.getAccountType() != null && withdrawUserAccount.getAccountType() == WithdrawAccountTypeConstant.CHINA_UNION_PAY) { - Integer isRealCertify = withdrawUserAccount.getIsRealCertify(); - if (isRealCertify == null || isRealCertify == Constant.Yes1No0.NO) { - throw new ServiceException(BusiStatus.THE_ACCOUNT_HAS_NOT_UNDERGONE_REAL_NAME_AUTHENTICATION); - } - } - List<WithdrawConfig> configs = withdrawConfigService.list(Wrappers.<WithdrawConfig>lambdaQuery().eq(WithdrawConfig::getIsEnabled, Constant.Yes1No0.YES)); - if (CollectionUtil.isEmpty(configs)) { - throw new ServiceException(BusiStatus.THE_SYSTEM_IS_MISSING_CONFIGURATION_PLEASE_CONTACT_THE_ADMINISTRATOR); - } - WithdrawConfig withdrawConfig = configs.get(0); - Long minValue = withdrawConfig.getMinValue(); - Long weekMaxValue = withdrawConfig.getWeekMaxValue(); - Integer weekLimitCount = withdrawConfig.getWeekLimitCount(); - if (goldNum < minValue) { - throw new ServiceException(BusiStatus.THE_NUMBER_OF_COINS_CANNOT_BE_LOWER_THAN_THE_LIMIT_MINVALUE.format(minValue)); - } - //提现账户限制（大陆提现限制） - if (accountType != null && (accountType & WithdrawAccountTypeConstant.CHINA_UNION_PAY) != 0) { - int dayOfWeek = LocalDateTime.now().getDayOfWeek().getValue(); - List<Integer> dayOfWeeks = sysConfService.getJsonValueById(Constant.SysConfId.WITHDRAW_DAY_OF_WEEK, new TypeReference<List<Integer>>() { - }); - if (CollectionUtil.isNotEmpty(dayOfWeeks)) { - StringBuilder sb = getDayOfWeeks(dayOfWeeks); - if (!dayOfWeeks.contains(dayOfWeek)) { - throw new ServiceException(BusiStatus.THE_MAINLAND_BANK_CARD_WITHDRAWAL_TIME_IS_INITIATED_BY_SB_AND_WILL_BE_ISSUED_THE_NEXT_DAY_PLEASE_TRY_AGAIN_AT_THE_SPECIFIED_TIME.format(sb.toString())); - } - } - } - int totalGoldNum = 0; - //每周周一 - WeekFields weekFields = WeekFields.ISO; - LocalDate mondayDate = LocalDate.now().with(weekFields.dayOfWeek(), 1L); - LocalTime time = LocalTime.of(0, 0, 0); - LocalDateTime monday = LocalDateTime.of(mondayDate, time); - LocalDateTime now = LocalDateTime.now(); - List<WithdrawUserRecord> records = withdrawUserRecordService.list(Wrappers.<WithdrawUserRecord>lambdaQuery().eq(WithdrawUserRecord::getUid, uid).between(WithdrawUserRecord::getCreateTime, monday, now)); - if (CollectionUtil.isNotEmpty(records)) { - totalGoldNum = records.stream().mapToInt(WithdrawUserRecord::getGoldNum).sum(); - if (records.size() >= weekLimitCount) { - throw new ServiceException(BusiStatus.DELIVERY_HAS_NOW_REACHED_THE_WEEKLY_LIMIT); - } - } - if ((totalGoldNum + goldNum) > weekMaxValue) { - throw new ServiceException(BusiStatus.THE_TOTAL_NUMBER_OF_GOLD_COINS_PER_WEEK_EXCEEDS_THE_LIMIT_WEEKMAXVALUE.format(weekMaxValue)); - } - //扣减钱包 - userPurseService.subGold(uid, goldNum.doubleValue(), BillObjTypeEnum.WITHDRAW, BusiStatus.WITHDRAW_NOT_ENOUGH_GOLD, - (up)-> billRecordService.insertGeneralBillRecord(uid, BillObjTypeEnum.WITHDRAW, goldNum.doubleValue(), up)); - //汇率金额 - WithdrawAmountHolder holder = calculate(uid, accountType, goldNum); - String accountName = holder.getAccountName(); - String currency = holder.getCurrency(); - BigDecimal cashAmount = holder.getCashAmount(); - BigDecimal exchangeRate = holder.getExchangeRate(); - BigDecimal handlingRate = holder.getHandlingRate(); - BigDecimal currencyAmount = holder.getCurrencyAmount(); - Date currentDate = new Date(); - withdrawUserAccount.setId(null); - //保存记录 - WithdrawUserRecord record = new WithdrawUserRecord(); - BeanUtils.copyProperties(withdrawUserAccount, record); - record.setCreateTime(currentDate); - record.setUpdateTime(currentDate); - record.setUid(uid); - record.setAccountName(accountName); - record.setGoldNum(goldNum); - record.setCashAmount(cashAmount); - record.setCurrency(currency); - record.setCurrencyAmount(currencyAmount); - record.setHandlingRate(handlingRate); - record.setExchangeRate(exchangeRate); - record.setRecordStatus((byte) RecordStatusEnum.WAIT.ordinal()); - withdrawUserRecordService.save(record); - - log.info("[金币提现] {} 提现金币数 {} 费率 {} 成功", uid, goldNum, handlingRate); - } - - @NotNull - private static StringBuilder getDayOfWeeks(List<Integer> dayOfWeeks) { - Map<Integer, String> alertMap = new HashMap<>(); - alertMap.put(1, "每週一"); - alertMap.put(2, "每週二"); - alertMap.put(3, "每週三"); - alertMap.put(4, "每週四"); - alertMap.put(5, "每週五"); - alertMap.put(6, "每週六"); - alertMap.put(7, "每週日"); - StringBuilder sb = new StringBuilder(); - for (int i = 0, len = dayOfWeeks.size(); i < len; i++) { - sb.append(alertMap.get(dayOfWeeks.get(i))); - if (i != len - 1) { - sb.append("、"); - } - } - return sb; - } - - @Override - public WithdrawConfig config(Long uid) { - List<WithdrawConfig> configs = withdrawConfigService.list(Wrappers.<WithdrawConfig>lambdaQuery().eq(WithdrawConfig::getIsEnabled, Constant.Yes1No0.YES)); - if (CollectionUtil.isEmpty(configs)) { - return new WithdrawConfig(); - } - WithdrawConfig withdrawConfig = configs.get(0); - //每周周一 - WeekFields weekFields = WeekFields.ISO; - LocalDate mondayDate = LocalDate.now().with(weekFields.dayOfWeek(), 1L); - LocalTime time = LocalTime.of(0, 0, 0); - LocalDateTime monday = LocalDateTime.of(mondayDate, time); - LocalDateTime now = LocalDateTime.now(); - long count = withdrawUserRecordService.count(Wrappers.<WithdrawUserRecord>lambdaQuery() - .eq(WithdrawUserRecord::getUid, uid) - .eq(WithdrawUserRecord::getRecordStatus, RecordStatusEnum.PASS.ordinal()) - .between(WithdrawUserRecord::getCreateTime, monday, now)); - Integer weekLimitCount = withdrawConfig.getWeekLimitCount(); - withdrawConfig.setWeekLimitCount((int) (weekLimitCount - count)); - return withdrawConfig; - } - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/WithdrawUserLimitServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/WithdrawUserLimitServiceImpl.java deleted file mode 100644 index dbfb75805..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/WithdrawUserLimitServiceImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.accompany.business.service.withdraw.impl; - -import cn.hutool.core.collection.CollectionUtil; -import com.accompany.business.constant.withdraw.WithdrawUserLimitConstant; -import com.accompany.business.model.withdraw.WithdrawUserLimit; -import com.accompany.business.mybatismapper.withdraw.WithdrawUserLimitMapper; -import com.accompany.business.service.withdraw.WithdrawUserLimitService; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.ServiceException; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @author: liaozetao - * @date: 2023/7/10 14:33 - * @description: - */ -@Slf4j -@Service -public class WithdrawUserLimitServiceImpl extends ServiceImpl<WithdrawUserLimitMapper, WithdrawUserLimit> implements WithdrawUserLimitService { - - @Override - public void checkDiamond(Long uid) { - List<WithdrawUserLimit> withdrawUserLimits = list(Wrappers.<WithdrawUserLimit>lambdaQuery() - .eq(WithdrawUserLimit::getUid, uid)); - if (CollectionUtil.isNotEmpty(withdrawUserLimits)) { - for (WithdrawUserLimit withdrawUserLimit : withdrawUserLimits) { - Integer limitType = withdrawUserLimit.getLimitType(); - if ((limitType & WithdrawUserLimitConstant.LIMIT_TYPE_OF_DIAMOND) != 0) { - throw new ServiceException(BusiStatus.YOU_ARE_UNABLE_TO_USE_THIS_FEATURE_PLEASE_CONTACT_YOUR_GUILD_LEADER_YOU_ARE_UNABLE_TO_USE_THIS_FEATURE); - } - } - } - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/WithdrawUserRecordServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/WithdrawUserRecordServiceImpl.java deleted file mode 100644 index 979a5dc43..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/WithdrawUserRecordServiceImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.accompany.business.service.withdraw.impl; - -import com.accompany.business.model.withdraw.WithdrawUserRecord; -import com.accompany.business.mybatismapper.withdraw.WithdrawUserRecordMapper; -import com.accompany.business.service.withdraw.WithdrawUserRecordService; -import com.accompany.business.vo.withdraw.WithdrawUserRecordVo; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Date; -import java.util.List; - -/** - * @author: liaozetao - * @date: 2023/7/10 14:34 - * @description: - */ -@Slf4j -@Service -public class WithdrawUserRecordServiceImpl extends ServiceImpl<WithdrawUserRecordMapper, WithdrawUserRecord> implements WithdrawUserRecordService { - - @Autowired - private WithdrawUserRecordMapper withdrawUserRecordMapper; - - @Override - public List<WithdrawUserRecordVo> page(Page<WithdrawUserRecord> page, Integer recordStatus, String erBanNo, Integer accountType, Date applyStartTime, Date applyEndTime) { - return withdrawUserRecordMapper.page(page, recordStatus, erBanNo, accountType, applyStartTime, applyEndTime); - } - - @Override - public Long totalCount(Integer recordStatus, String erBanNo, Integer accountType, Date applyStartTime, Date applyEndTime) { - return withdrawUserRecordMapper.totalCount(recordStatus, erBanNo, accountType, applyStartTime, applyEndTime); - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/WithdrawUserServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/WithdrawUserServiceImpl.java deleted file mode 100644 index c3092d025..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/WithdrawUserServiceImpl.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.accompany.business.service.withdraw.impl; - -import cn.hutool.core.collection.CollectionUtil; -import com.accompany.business.model.withdraw.WithdrawUser; -import com.accompany.business.model.withdraw.WithdrawUserAccount; -import com.accompany.business.mybatismapper.withdraw.WithdrawUserMapper; -import com.accompany.business.service.withdraw.WithdrawUserService; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.util.Date; -import java.util.List; - -/** - * @author: liaozetao - * @date: 2023/7/7 14:55 - * @description: - */ -@Slf4j -@Service -public class WithdrawUserServiceImpl extends ServiceImpl<WithdrawUserMapper, WithdrawUser> implements WithdrawUserService { - @Override - public void saveUser(WithdrawUserAccount account) { - Long uid = account.getUid(); - Integer accountType = account.getAccountType(); - WithdrawUser withdrawUser = null; - List<WithdrawUser> withdrawUsers = list(Wrappers.<WithdrawUser>lambdaQuery() - .eq(WithdrawUser::getUid, uid)); - if (CollectionUtil.isNotEmpty(withdrawUsers)) { - withdrawUser = withdrawUsers.get(0); - withdrawUser.setAccountFlag(withdrawUser.getAccountFlag() | accountType); - withdrawUser.setUpdateTime(new Date()); - } else { - withdrawUser = new WithdrawUser(); - withdrawUser.setUid(uid); - withdrawUser.setAccountFlag(accountType); - } - saveOrUpdate(withdrawUser); - } -} diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/ActCallBattleMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/ActCallBattleMapper.xml deleted file mode 100644 index 6ec38f9ee..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/ActCallBattleMapper.xml +++ /dev/null @@ -1,165 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="com.accompany.business.mybatismapper.callbattle.ActCallBattleMapper"> - <resultMap id="actCallBattleRankListVo" type="com.accompany.business.vo.callbattle.ActCallBattleRankListVo"> - <result column="erban_no" property="erbanNo" jdbcType="BIGINT"/> - <result column="nick" property="nick" jdbcType="VARCHAR"/> - <result column="avatar" property="avatar" jdbcType="VARCHAR"/> - <result column="num" property="num" jdbcType="DOUBLE"/> - </resultMap> - - <select id="listDiamondRank" resultMap="actCallBattleRankListVo"> - select u.avatar, u.erban_no, u.nick, - IFNULL(SUM(cost_piece_num * item_multiple),0) num - from act_call_battle_draw_record d, users u, act_call_battle_info a - where draw_status = 1 and d.uid = u.uid and d.round_id = a.round_id - <if test="null != startTime"> - and a.end_time >= #{startTime} - </if> - <if test="null != endTime"> - and a.end_time <= #{endTime} - </if> - group by d.uid, u.erban_no, u.nick - order BY num desc, u.erban_no - limit #{start}, #{pageSize} - </select> - - <select id="listLuckyManRank" resultMap="actCallBattleRankListVo"> - select u.avatar, u.erban_no, u.nick, count(1) num - from act_call_battle_draw_record d, users u, act_call_battle_info a - where draw_status = 1 and d.uid = u.uid and d.round_id = a.round_id - <if test="null != startTime"> - and a.end_time >= #{startTime} - </if> - <if test="null != endTime"> - and a.end_time <= #{endTime} - </if> - group by d.uid - order by num desc, u.erban_no - limit #{start}, #{pageSize} - </select> - - - <select id="listUserDiamondRank" resultMap="actCallBattleRankListVo"> - SELECT u.avatar, u.erban_no, u.nick, IFNULL(t.num, 0) num - FROM users u - LEFT JOIN - (SELECT r.uid, IFNULL(SUM(r.cost_piece_num * r.item_multiple),0) num FROM - act_call_battle_draw_record r LEFT JOIN act_call_battle_info a ON r.round_id = a.round_id - WHERE r.draw_status = 1 - <if test="null != startTime"> - and a.end_time >= #{startTime} - </if> - <if test="null != endTime"> - and a.end_time <= #{endTime} - </if> - GROUP BY r.uid) t ON u.uid = t.uid - WHERE u.uid = #{uid} - </select> - - <select id="listUserLuckyManRank" resultMap="actCallBattleRankListVo"> - SELECT u.avatar, u.erban_no, u.nick, IFNULL(t.num, 0) num - FROM users u - LEFT JOIN - (SELECT r.uid, count(1) num FROM - act_call_battle_draw_record r LEFT JOIN act_call_battle_info a ON r.round_id = a.round_id - WHERE r.draw_status = 1 - <if test="null != startTime"> - and a.end_time >= #{startTime} - </if> - <if test="null != endTime"> - and a.end_time <= #{endTime} - </if> - GROUP BY r.uid) t ON u.uid = t.uid - WHERE u.uid = #{uid} - </select> - - <select id="countUserDiamondIncome" resultType="java.lang.Double"> - SELECT IFNULL(SUM(d.cost_piece_num * d.item_multiple),0) - FROM `act_call_battle_draw_record` d , act_call_battle_info a where d.uid = #{uid} and d.draw_status = 1 - and d.round_id = a.round_id - and DATE(a.end_time) >= #{startTime} - and DATE(a.end_time) < #{endTime} - </select> - - <select id="listTopThreeInOneRound" resultType="java.lang.String"> - SELECT u.avatar FROM `act_call_battle_draw_record` d, users u - where d.round_id = #{roundId} - and d.draw_status = 1 - and d.uid = u.uid - ORDER BY d.cost_piece_num DESC, d.uid ASC - LIMIT 3 - </select> - - <select id="countUserInputPiece" resultType="java.math.BigDecimal"> - SELECT IFNULL(SUM(cost_piece_num),0) FROM act_call_battle_draw_record where round_id = #{roundId}; - </select> - - - <resultMap id="actCallBattleRoundStatVo" type="com.accompany.business.vo.callbattle.ActCallBattleRoundStatVo"> - <result column="item_id" property="itemId" jdbcType="BIGINT"/> - <result column="item_multiple" property="itemMultiple" jdbcType="VARCHAR"/> - <result column="uid" property="uid" jdbcType="BIGINT"/> - <result column="total_piece" property="totalPiece" jdbcType="VARCHAR"/> - </resultMap> - - <select id="listUserRoundStat" resultMap="actCallBattleRoundStatVo"> - SELECT item_id, item_multiple, uid, SUM(cost_piece_num) total_piece - FROM act_call_battle_draw_record - where round_id = #{roundId} - GROUP BY item_id, item_multiple, uid; - </select> - - <update id="batchUpdateUserDrawRecord"> - UPDATE act_call_battle_draw_record - SET draw_status = 1 , update_time = NOW() - WHERE round_id = #{roundId} - and item_id = #{drawId} - </update> - - <resultMap id="actCallBattleUserDrawItemVO" type="com.accompany.business.vo.callbattle.ActCallBattleUserDrawItemVO"> - <result column="id" property="id" jdbcType="BIGINT"/> - <result column="name" property="name" jdbcType="VARCHAR"/> - <result column="image_url" property="imgUrl" jdbcType="VARCHAR"/> - <result column="multiple" property="multiple" jdbcType="INTEGER"/> - <result column="costPieceNum" property="costPieceNum" jdbcType="INTEGER"/> - <result column="restraintName" property="restraintName" jdbcType="VARCHAR"/> - <result column="restraintImageUrl" property="restraintImageUrl" jdbcType="VARCHAR"/> - </resultMap> - - <select id="listUserDrawItemInfo" resultMap="actCallBattleUserDrawItemVO"> - SELECT i.id, i.name,i.image_url,i.multiple, i.restraint_name restraintName, i.restraint_image_url restraintImageUrl, - IFNULL(r.cost_piece_num,0) costPieceNum - from act_call_battle_item i LEFT JOIN - act_call_battle_draw_record r ON i.id = r.item_id - AND r.round_id = #{roundId} - and r.uid = #{uid} - WHERE i.status = 1 - ORDER BY i.multiple ASC, i.id; - </select> - - - <resultMap id="actCallBattleUserRoundStatDTO" type="com.accompany.business.dto.callbattle.ActCallBattleUserRoundStatDTO"> - <result column="uid" property="uid" jdbcType="BIGINT"/> - <result column="costPieceNum" property="costPieceNum" jdbcType="BIGINT"/> - </resultMap> - <select id="listUserDrawStatDtoOneRound" resultMap="actCallBattleUserRoundStatDTO"> - SELECT IFNULL(SUM(cost_piece_num), 0) costPieceNum, uid - from act_call_battle_draw_record where round_id = #{roundId} - GROUP BY uid - </select> - - <resultMap id="actCallBattleUserOneRoundDrawResult" type="com.accompany.business.vo.callbattle.ActCallBattleUserOneRoundDrawResult"> - <result column="drawStatus" property="drawStatus" jdbcType="TINYINT"/> - <result column="prizeDiamonds" property="prizeDiamonds" jdbcType="BIGINT"/> - </resultMap> - - <select id="getUserActStatus" resultMap="actCallBattleUserOneRoundDrawResult"> - SELECT draw_status drawStatus, - SUM(IF(draw_status = 1, item_multiple * cost_piece_num,0)) prizeDiamonds - from act_call_battle_draw_record where round_id = #{roundId} and uid = #{uid} - GROUP BY draw_status - ORDER BY draw_status - </select> - -</mapper> \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/ActCallBattlePreWarningMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/ActCallBattlePreWarningMapper.xml deleted file mode 100644 index 3961912c3..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/ActCallBattlePreWarningMapper.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="com.accompany.business.mybatismapper.callbattle.ActCallBattlePreWarningMapper"> - <select id="getPreRoundStat" resultType="com.accompany.business.dto.callbattle.ActCallBattleGoldPreWarningDTO"> - select ifnull(sum(r.cost_piece_num),0) as goldIn, - ifnull(sum(if(r.draw_status = 1, r.cost_piece_num * r.item_multiple, 0 )), 0) as goldOut - from - (select round_id from act_call_battle_info where status = 3 order by round_id desc limit #{roundNum}) a, act_call_battle_draw_record r - where a.round_id = r.round_id; - </select> - - <select id="getBroadCastStat" resultType="com.accompany.business.dto.callbattle.ActCallBattleBroadCastDTO"> - select - ifnull(sum(r.cost_piece_num),0) as goldIn, - ifnull(sum(if(r.draw_status = 1, r.cost_piece_num * r.item_multiple, 0 )), 0) as goldOut, - count(distinct a.round_id) roundNum, - count(distinct r.uid) peopleNum - from - (select round_id from act_call_battle_info where status = 3 - and start_time between #{startTime} and #{endTime}) a - left join - act_call_battle_draw_record r - on a.round_id = r.round_id - ; - </select> -</mapper> \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/ActivityConfigMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/ActivityConfigMapper.xml deleted file mode 100644 index a555fe42c..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/ActivityConfigMapper.xml +++ /dev/null @@ -1,173 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="com.accompany.business.mybatismapper.ActivityConfigMapper" > - <resultMap id="BaseResultMap" type="com.accompany.business.model.ActivityConfig" > - <result column="akey" property="akey" jdbcType="VARCHAR" /> - <result column="aval" property="aval" jdbcType="VARCHAR" /> - <result column="description" property="description" jdbcType="VARCHAR" /> - <result column="status" property="status" jdbcType="TINYINT" /> - </resultMap> - <sql id="Example_Where_Clause" > - <where > - <foreach collection="oredCriteria" item="criteria" separator="or" > - <if test="criteria.valid" > - <trim prefix="(" suffix=")" prefixOverrides="and" > - <foreach collection="criteria.criteria" item="criterion" > - <choose > - <when test="criterion.noValue" > - and ${criterion.condition} - </when> - <when test="criterion.singleValue" > - and ${criterion.condition} #{criterion.value} - </when> - <when test="criterion.betweenValue" > - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - </when> - <when test="criterion.listValue" > - and ${criterion.condition} - <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," > - #{listItem} - </foreach> - </when> - </choose> - </foreach> - </trim> - </if> - </foreach> - </where> - </sql> - <sql id="Update_By_Example_Where_Clause" > - <where > - <foreach collection="example.oredCriteria" item="criteria" separator="or" > - <if test="criteria.valid" > - <trim prefix="(" suffix=")" prefixOverrides="and" > - <foreach collection="criteria.criteria" item="criterion" > - <choose > - <when test="criterion.noValue" > - and ${criterion.condition} - </when> - <when test="criterion.singleValue" > - and ${criterion.condition} #{criterion.value} - </when> - <when test="criterion.betweenValue" > - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - </when> - <when test="criterion.listValue" > - and ${criterion.condition} - <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," > - #{listItem} - </foreach> - </when> - </choose> - </foreach> - </trim> - </if> - </foreach> - </where> - </sql> - <sql id="Base_Column_List" > - akey, aval, description, status - </sql> - <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.accompany.business.model.ActivityConfigExample" > - select - <if test="distinct" > - distinct - </if> - 'true' as QUERYID, - <include refid="Base_Column_List" /> - from activity_config - <if test="_parameter != null" > - <include refid="Example_Where_Clause" /> - </if> - <if test="orderByClause != null" > - order by ${orderByClause} - </if> - <if test="limit != null" > - <if test="offset != null" > - limit ${offset}, ${limit} - </if> - <if test="offset == null" > - limit ${limit} - </if> - </if> - </select> - <delete id="deleteByExample" parameterType="com.accompany.business.model.ActivityConfigExample" > - delete from activity_config - <if test="_parameter != null" > - <include refid="Example_Where_Clause" /> - </if> - </delete> - <insert id="insert" parameterType="com.accompany.business.model.ActivityConfig" > - insert into activity_config (akey, aval, description, - status) - values (#{akey,jdbcType=VARCHAR}, #{aval,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, - #{status,jdbcType=TINYINT}) - </insert> - <insert id="insertSelective" parameterType="com.accompany.business.model.ActivityConfig" > - insert into activity_config - <trim prefix="(" suffix=")" suffixOverrides="," > - <if test="akey != null" > - akey, - </if> - <if test="aval != null" > - aval, - </if> - <if test="description != null" > - description, - </if> - <if test="status != null" > - status, - </if> - </trim> - <trim prefix="values (" suffix=")" suffixOverrides="," > - <if test="akey != null" > - #{akey,jdbcType=VARCHAR}, - </if> - <if test="aval != null" > - #{aval,jdbcType=VARCHAR}, - </if> - <if test="description != null" > - #{description,jdbcType=VARCHAR}, - </if> - <if test="status != null" > - #{status,jdbcType=TINYINT}, - </if> - </trim> - </insert> - <select id="countByExample" parameterType="com.accompany.business.model.ActivityConfigExample" resultType="java.lang.Integer" > - select count(*) from activity_config - <if test="_parameter != null" > - <include refid="Example_Where_Clause" /> - </if> - </select> - <update id="updateByExampleSelective" parameterType="map" > - update activity_config - <set > - <if test="record.akey != null" > - akey = #{record.akey,jdbcType=VARCHAR}, - </if> - <if test="record.aval != null" > - aval = #{record.aval,jdbcType=VARCHAR}, - </if> - <if test="record.description != null" > - description = #{record.description,jdbcType=VARCHAR}, - </if> - <if test="record.status != null" > - status = #{record.status,jdbcType=TINYINT}, - </if> - </set> - <if test="_parameter != null" > - <include refid="Update_By_Example_Where_Clause" /> - </if> - </update> - <update id="updateByExample" parameterType="map" > - update activity_config - set akey = #{record.akey,jdbcType=VARCHAR}, - aval = #{record.aval,jdbcType=VARCHAR}, - description = #{record.description,jdbcType=VARCHAR}, - status = #{record.status,jdbcType=TINYINT} - <if test="_parameter != null" > - <include refid="Update_By_Example_Where_Clause" /> - </if> - </update> -</mapper> \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/AdminPictureMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/AdminPictureMapper.xml deleted file mode 100644 index d3c6f1cfe..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/AdminPictureMapper.xml +++ /dev/null @@ -1,275 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.accompany.business.mybatismapper.AdminPictureMapper"> - <resultMap id="BaseResultMap" type="com.accompany.business.model.AdminPicture"> - <id column="pic_id" jdbcType="INTEGER" property="picId" /> - <result column="img_url" jdbcType="VARCHAR" property="imgUrl" /> - <result column="game_result_type" jdbcType="INTEGER" property="gameResultType" /> - <result column="type" jdbcType="INTEGER" property="type" /> - <result column="state" jdbcType="INTEGER" property="state" /> - <result column="app_id" jdbcType="VARCHAR" property="appId" /> - <result column="remark" jdbcType="VARCHAR" property="remark" /> - <result column="create_time" jdbcType="TIMESTAMP" property="createTime" /> - <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" /> - </resultMap> - <sql id="Example_Where_Clause"> - <where> - <foreach collection="oredCriteria" item="criteria" separator="or"> - <if test="criteria.valid"> - <trim prefix="(" prefixOverrides="and" suffix=")"> - <foreach collection="criteria.criteria" item="criterion"> - <choose> - <when test="criterion.noValue"> - and ${criterion.condition} - </when> - <when test="criterion.singleValue"> - and ${criterion.condition} #{criterion.value} - </when> - <when test="criterion.betweenValue"> - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - </when> - <when test="criterion.listValue"> - and ${criterion.condition} - <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=","> - #{listItem} - </foreach> - </when> - </choose> - </foreach> - </trim> - </if> - </foreach> - </where> - </sql> - <sql id="Update_By_Example_Where_Clause"> - <where> - <foreach collection="example.oredCriteria" item="criteria" separator="or"> - <if test="criteria.valid"> - <trim prefix="(" prefixOverrides="and" suffix=")"> - <foreach collection="criteria.criteria" item="criterion"> - <choose> - <when test="criterion.noValue"> - and ${criterion.condition} - </when> - <when test="criterion.singleValue"> - and ${criterion.condition} #{criterion.value} - </when> - <when test="criterion.betweenValue"> - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - </when> - <when test="criterion.listValue"> - and ${criterion.condition} - <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=","> - #{listItem} - </foreach> - </when> - </choose> - </foreach> - </trim> - </if> - </foreach> - </where> - </sql> - <sql id="Base_Column_List"> - pic_id, img_url, game_result_type, type, state, app_id, remark, create_time, update_time - </sql> - <select id="selectByExample" parameterType="com.accompany.business.model.AdminPictureExample" resultMap="BaseResultMap"> - select - <if test="distinct"> - distinct - </if> - <include refid="Base_Column_List" /> - from admin_picture - <if test="_parameter != null"> - <include refid="Example_Where_Clause" /> - </if> - <if test="orderByClause != null"> - order by ${orderByClause} - </if> - </select> - <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap"> - select - <include refid="Base_Column_List" /> - from admin_picture - where pic_id = #{picId,jdbcType=INTEGER} - </select> - <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer"> - delete from admin_picture - where pic_id = #{picId,jdbcType=INTEGER} - </delete> - <delete id="deleteByExample" parameterType="com.accompany.business.model.AdminPictureExample"> - delete from admin_picture - <if test="_parameter != null"> - <include refid="Example_Where_Clause" /> - </if> - </delete> - <insert id="insert" parameterType="com.accompany.business.model.AdminPicture"> - insert into admin_picture (pic_id, img_url, game_result_type, - type, state, app_id, - remark, create_time, update_time - ) - values (#{picId,jdbcType=INTEGER}, #{imgUrl,jdbcType=VARCHAR}, #{gameResultType,jdbcType=INTEGER}, - #{type,jdbcType=INTEGER}, #{state,jdbcType=INTEGER}, #{appId,jdbcType=VARCHAR}, - #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP} - ) - </insert> - <insert id="insertSelective" parameterType="com.accompany.business.model.AdminPicture"> - insert into admin_picture - <trim prefix="(" suffix=")" suffixOverrides=","> - <if test="picId != null"> - pic_id, - </if> - <if test="imgUrl != null"> - img_url, - </if> - <if test="gameResultType != null"> - game_result_type, - </if> - <if test="type != null"> - type, - </if> - <if test="state != null"> - state, - </if> - <if test="appId != null"> - app_id, - </if> - <if test="remark != null"> - remark, - </if> - <if test="createTime != null"> - create_time, - </if> - <if test="updateTime != null"> - update_time, - </if> - </trim> - <trim prefix="values (" suffix=")" suffixOverrides=","> - <if test="picId != null"> - #{picId,jdbcType=INTEGER}, - </if> - <if test="imgUrl != null"> - #{imgUrl,jdbcType=VARCHAR}, - </if> - <if test="gameResultType != null"> - #{gameResultType,jdbcType=INTEGER}, - </if> - <if test="type != null"> - #{type,jdbcType=INTEGER}, - </if> - <if test="state != null"> - #{state,jdbcType=INTEGER}, - </if> - <if test="appId != null"> - #{appId,jdbcType=VARCHAR}, - </if> - <if test="remark != null"> - #{remark,jdbcType=VARCHAR}, - </if> - <if test="createTime != null"> - #{createTime,jdbcType=TIMESTAMP}, - </if> - <if test="updateTime != null"> - #{updateTime,jdbcType=TIMESTAMP}, - </if> - </trim> - </insert> - <select id="countByExample" parameterType="com.accompany.business.model.AdminPictureExample" resultType="java.lang.Long"> - select count(*) from admin_picture - <if test="_parameter != null"> - <include refid="Example_Where_Clause" /> - </if> - </select> - <update id="updateByExampleSelective" parameterType="map"> - update admin_picture - <set> - <if test="record.picId != null"> - pic_id = #{record.picId,jdbcType=INTEGER}, - </if> - <if test="record.imgUrl != null"> - img_url = #{record.imgUrl,jdbcType=VARCHAR}, - </if> - <if test="record.gameResultType != null"> - game_result_type = #{record.gameResultType,jdbcType=INTEGER}, - </if> - <if test="record.type != null"> - type = #{record.type,jdbcType=INTEGER}, - </if> - <if test="record.state != null"> - state = #{record.state,jdbcType=INTEGER}, - </if> - <if test="record.appId != null"> - app_id = #{record.appId,jdbcType=VARCHAR}, - </if> - <if test="record.remark != null"> - remark = #{record.remark,jdbcType=VARCHAR}, - </if> - <if test="record.createTime != null"> - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - </if> - <if test="record.updateTime != null"> - update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - </if> - </set> - <if test="_parameter != null"> - <include refid="Update_By_Example_Where_Clause" /> - </if> - </update> - <update id="updateByExample" parameterType="map"> - update admin_picture - set pic_id = #{record.picId,jdbcType=INTEGER}, - img_url = #{record.imgUrl,jdbcType=VARCHAR}, - game_result_type = #{record.gameResultType,jdbcType=INTEGER}, - type = #{record.type,jdbcType=INTEGER}, - state = #{record.state,jdbcType=INTEGER}, - app_id = #{record.appId,jdbcType=VARCHAR}, - remark = #{record.remark,jdbcType=VARCHAR}, - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - update_time = #{record.updateTime,jdbcType=TIMESTAMP} - <if test="_parameter != null"> - <include refid="Update_By_Example_Where_Clause" /> - </if> - </update> - <update id="updateByPrimaryKeySelective" parameterType="com.accompany.business.model.AdminPicture"> - update admin_picture - <set> - <if test="imgUrl != null"> - img_url = #{imgUrl,jdbcType=VARCHAR}, - </if> - <if test="gameResultType != null"> - game_result_type = #{gameResultType,jdbcType=INTEGER}, - </if> - <if test="type != null"> - type = #{type,jdbcType=INTEGER}, - </if> - <if test="state != null"> - state = #{state,jdbcType=INTEGER}, - </if> - <if test="appId != null"> - app_id = #{appId,jdbcType=VARCHAR}, - </if> - <if test="remark != null"> - remark = #{remark,jdbcType=VARCHAR}, - </if> - <if test="createTime != null"> - create_time = #{createTime,jdbcType=TIMESTAMP}, - </if> - <if test="updateTime != null"> - update_time = #{updateTime,jdbcType=TIMESTAMP}, - </if> - </set> - where pic_id = #{picId,jdbcType=INTEGER} - </update> - <update id="updateByPrimaryKey" parameterType="com.accompany.business.model.AdminPicture"> - update admin_picture - set img_url = #{imgUrl,jdbcType=VARCHAR}, - game_result_type = #{gameResultType,jdbcType=INTEGER}, - type = #{type,jdbcType=INTEGER}, - state = #{state,jdbcType=INTEGER}, - app_id = #{appId,jdbcType=VARCHAR}, - remark = #{remark,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP} - where pic_id = #{picId,jdbcType=INTEGER} - </update> -</mapper> \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/ChannelDistributeMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/ChannelDistributeMapper.xml deleted file mode 100644 index 7b46082a0..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/ChannelDistributeMapper.xml +++ /dev/null @@ -1,261 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="com.accompany.business.mybatismapper.ChannelDistributeMapper" > - <resultMap id="BaseResultMap" type="com.accompany.business.model.ChannelDistribute" > - <id column="id" property="id" jdbcType="BIGINT" /> - <result column="app_id" property="appId" jdbcType="VARCHAR" /> - <result column="channel" property="channel" jdbcType="VARCHAR" /> - <result column="route_type" property="routeType" jdbcType="INTEGER" /> - <result column="route_value" property="routeValue" jdbcType="VARCHAR" /> - <result column="create_time" property="createTime" jdbcType="TIMESTAMP" /> - <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" /> - <result column="operator" property="operator" jdbcType="VARCHAR" /> - </resultMap> - <sql id="Example_Where_Clause" > - <where > - <foreach collection="oredCriteria" item="criteria" separator="or" > - <if test="criteria.valid" > - <trim prefix="(" suffix=")" prefixOverrides="and" > - <foreach collection="criteria.criteria" item="criterion" > - <choose > - <when test="criterion.noValue" > - and ${criterion.condition} - </when> - <when test="criterion.singleValue" > - and ${criterion.condition} #{criterion.value} - </when> - <when test="criterion.betweenValue" > - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - </when> - <when test="criterion.listValue" > - and ${criterion.condition} - <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," > - #{listItem} - </foreach> - </when> - </choose> - </foreach> - </trim> - </if> - </foreach> - </where> - </sql> - <sql id="Update_By_Example_Where_Clause" > - <where > - <foreach collection="example.oredCriteria" item="criteria" separator="or" > - <if test="criteria.valid" > - <trim prefix="(" suffix=")" prefixOverrides="and" > - <foreach collection="criteria.criteria" item="criterion" > - <choose > - <when test="criterion.noValue" > - and ${criterion.condition} - </when> - <when test="criterion.singleValue" > - and ${criterion.condition} #{criterion.value} - </when> - <when test="criterion.betweenValue" > - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - </when> - <when test="criterion.listValue" > - and ${criterion.condition} - <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," > - #{listItem} - </foreach> - </when> - </choose> - </foreach> - </trim> - </if> - </foreach> - </where> - </sql> - <sql id="Base_Column_List" > - id, app_id, channel, route_type, route_value, create_time, update_time, `operator` - </sql> - <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.accompany.business.model.ChannelDistributeExample" > - select - <if test="distinct" > - distinct - </if> - 'true' as QUERYID, - <include refid="Base_Column_List" /> - from channel_distribute - <if test="_parameter != null" > - <include refid="Example_Where_Clause" /> - </if> - <if test="orderByClause != null" > - order by ${orderByClause} - </if> - <if test="limit != null" > - <if test="offset != null" > - limit ${offset}, ${limit} - </if> - <if test="offset == null" > - limit ${limit} - </if> - </if> - </select> - <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" > - select - <include refid="Base_Column_List" /> - from channel_distribute - where id = #{id,jdbcType=BIGINT} - </select> - <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" > - delete from channel_distribute - where id = #{id,jdbcType=BIGINT} - </delete> - <delete id="deleteByExample" parameterType="com.accompany.business.model.ChannelDistributeExample" > - delete from channel_distribute - <if test="_parameter != null" > - <include refid="Example_Where_Clause" /> - </if> - </delete> - <insert id="insert" parameterType="com.accompany.business.model.ChannelDistribute" useGeneratedKeys="true" keyProperty="id" > - insert into channel_distribute (app_id, channel, route_type, - route_value, create_time, update_time, - `operator`) - values (#{appId,jdbcType=VARCHAR}, #{channel,jdbcType=VARCHAR}, #{routeType,jdbcType=INTEGER}, - #{routeValue,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, - #{operator,jdbcType=VARCHAR}) - </insert> - <insert id="insertSelective" parameterType="com.accompany.business.model.ChannelDistribute" useGeneratedKeys="true" keyProperty="id" > - insert into channel_distribute - <trim prefix="(" suffix=")" suffixOverrides="," > - <if test="appId != null" > - app_id, - </if> - <if test="channel != null" > - channel, - </if> - <if test="routeType != null" > - route_type, - </if> - <if test="routeValue != null" > - route_value, - </if> - <if test="createTime != null" > - create_time, - </if> - <if test="updateTime != null" > - update_time, - </if> - <if test="operator != null" > - `operator`, - </if> - </trim> - <trim prefix="values (" suffix=")" suffixOverrides="," > - <if test="appId != null" > - #{appId,jdbcType=VARCHAR}, - </if> - <if test="channel != null" > - #{channel,jdbcType=VARCHAR}, - </if> - <if test="routeType != null" > - #{routeType,jdbcType=INTEGER}, - </if> - <if test="routeValue != null" > - #{routeValue,jdbcType=VARCHAR}, - </if> - <if test="createTime != null" > - #{createTime,jdbcType=TIMESTAMP}, - </if> - <if test="updateTime != null" > - #{updateTime,jdbcType=TIMESTAMP}, - </if> - <if test="operator != null" > - #{operator,jdbcType=VARCHAR}, - </if> - </trim> - </insert> - <select id="countByExample" parameterType="com.accompany.business.model.ChannelDistributeExample" resultType="java.lang.Integer" > - select count(*) from channel_distribute - <if test="_parameter != null" > - <include refid="Example_Where_Clause" /> - </if> - </select> - <update id="updateByExampleSelective" parameterType="map" > - update channel_distribute - <set > - <if test="record.id != null" > - id = #{record.id,jdbcType=BIGINT}, - </if> - <if test="record.appId != null" > - app_id = #{record.appId,jdbcType=VARCHAR}, - </if> - <if test="record.channel != null" > - channel = #{record.channel,jdbcType=VARCHAR}, - </if> - <if test="record.routeType != null" > - route_type = #{record.routeType,jdbcType=INTEGER}, - </if> - <if test="record.routeValue != null" > - route_value = #{record.routeValue,jdbcType=VARCHAR}, - </if> - <if test="record.createTime != null" > - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - </if> - <if test="record.updateTime != null" > - update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - </if> - <if test="record.operator != null" > - `operator` = #{record.operator,jdbcType=VARCHAR}, - </if> - </set> - <if test="_parameter != null" > - <include refid="Update_By_Example_Where_Clause" /> - </if> - </update> - <update id="updateByExample" parameterType="map" > - update channel_distribute - set id = #{record.id,jdbcType=BIGINT}, - app_id = #{record.appId,jdbcType=VARCHAR}, - channel = #{record.channel,jdbcType=VARCHAR}, - route_type = #{record.routeType,jdbcType=INTEGER}, - route_value = #{record.routeValue,jdbcType=VARCHAR}, - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - `operator` = #{record.operator,jdbcType=VARCHAR} - <if test="_parameter != null" > - <include refid="Update_By_Example_Where_Clause" /> - </if> - </update> - <update id="updateByPrimaryKeySelective" parameterType="com.accompany.business.model.ChannelDistribute" > - update channel_distribute - <set > - <if test="appId != null" > - app_id = #{appId,jdbcType=VARCHAR}, - </if> - <if test="channel != null" > - channel = #{channel,jdbcType=VARCHAR}, - </if> - <if test="routeType != null" > - route_type = #{routeType,jdbcType=INTEGER}, - </if> - <if test="routeValue != null" > - route_value = #{routeValue,jdbcType=VARCHAR}, - </if> - <if test="createTime != null" > - create_time = #{createTime,jdbcType=TIMESTAMP}, - </if> - <if test="updateTime != null" > - update_time = #{updateTime,jdbcType=TIMESTAMP}, - </if> - <if test="operator != null" > - `operator` = #{operator,jdbcType=VARCHAR}, - </if> - </set> - where id = #{id,jdbcType=BIGINT} - </update> - <update id="updateByPrimaryKey" parameterType="com.accompany.business.model.ChannelDistribute" > - update channel_distribute - set app_id = #{appId,jdbcType=VARCHAR}, - channel = #{channel,jdbcType=VARCHAR}, - route_type = #{routeType,jdbcType=INTEGER}, - route_value = #{routeValue,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP}, - `operator` = #{operator,jdbcType=VARCHAR} - where id = #{id,jdbcType=BIGINT} - </update> -</mapper> \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/ChannelDistributeMapperExpand.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/ChannelDistributeMapperExpand.xml deleted file mode 100644 index 96890ffb4..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/ChannelDistributeMapperExpand.xml +++ /dev/null @@ -1,98 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="com.accompany.business.mybatismapper.ChannelDistributeMapperExpand" > - <insert id="insertOrUpdate"> - insert into channel_distribute - <trim prefix="(" suffix=")" suffixOverrides="," > - <if test="appId != null" > - app_id, - </if> - <if test="channel != null" > - channel, - </if> - <if test="routeType != null" > - route_type, - </if> - <if test="routeValue != null" > - route_value, - </if> - <if test="createTime != null" > - create_time, - </if> - <if test="updateTime != null" > - update_time, - </if> - <if test="operator != null" > - `operator`, - </if> - </trim> - <trim prefix="values (" suffix=")" suffixOverrides="," > - <if test="appId != null" > - #{appId,jdbcType=VARCHAR}, - </if> - <if test="channel != null" > - #{channel,jdbcType=VARCHAR}, - </if> - <if test="routeType != null" > - #{routeType,jdbcType=INTEGER}, - </if> - <if test="routeValue != null" > - #{routeValue,jdbcType=VARCHAR}, - </if> - <if test="createTime != null" > - #{createTime,jdbcType=TIMESTAMP}, - </if> - <if test="updateTime != null" > - #{updateTime,jdbcType=TIMESTAMP}, - </if> - <if test="operator != null" > - #{operator,jdbcType=VARCHAR}, - </if> - </trim> - ON DUPLICATE KEY UPDATE - <trim suffixOverrides=","> - <if test="routeType != null" > - #{routeType,jdbcType=INTEGER}, - </if> - <if test="routeValue != null" > - #{routeValue,jdbcType=VARCHAR}, - </if> - <if test="updateTime != null" > - #{updateTime,jdbcType=TIMESTAMP}, - </if> - <if test="operator != null" > - #{operator,jdbcType=VARCHAR}, - </if> - </trim> - </insert> - - <insert id="insertOrUpdateBatch"> - insert into channel_distribute (app_id, channel, route_type, - route_value, create_time, update_time, - `operator`) - values - <foreach item="item" collection="list" separator=","> - (#{item.appId,jdbcType=VARCHAR}, #{item.channel,jdbcType=VARCHAR}, #{item.routeType,jdbcType=INTEGER}, - #{item.routeValue,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateTime,jdbcType=TIMESTAMP}, - #{item.operator,jdbcType=VARCHAR}) - </foreach> - ON DUPLICATE KEY UPDATE - `route_type`=values(`route_type`), - `route_value`=values(`route_value`), - `operator`=values(`operator`), - `update_time`=values(`update_time`) - </insert> - - <update id="updateValue" parameterType="com.accompany.business.model.ChannelDistribute" > - update channel_distribute - <set > - app_id = #{appId,jdbcType=VARCHAR}, - channel = #{channel,jdbcType=VARCHAR}, - route_type = #{routeType,jdbcType=INTEGER}, - route_value = #{routeValue,jdbcType=VARCHAR}, - update_time = #{updateTime,jdbcType=TIMESTAMP}, - `operator` = #{operator,jdbcType=VARCHAR} - </set> - where id = #{id,jdbcType=BIGINT} - </update> -</mapper> \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/ChargeActivityVisitLogMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/ChargeActivityVisitLogMapper.xml deleted file mode 100644 index 31632462e..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/ChargeActivityVisitLogMapper.xml +++ /dev/null @@ -1,259 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="com.accompany.business.mybatismapper.ChargeActivityVisitLogMapper" > - <resultMap id="BaseResultMap" type="com.accompany.business.model.ChargeActivityVisitLog" > - <id column="id" property="id" jdbcType="BIGINT" /> - <result column="uid" property="uid" jdbcType="BIGINT" /> - <result column="act_id" property="actId" jdbcType="INTEGER" /> - <result column="device_id" property="deviceId" jdbcType="VARCHAR" /> - <result column="platform" property="platform" jdbcType="TINYINT" /> - <result column="type" property="type" jdbcType="TINYINT" /> - <result column="ip" property="ip" jdbcType="VARCHAR" /> - <result column="create_time" property="createTime" jdbcType="TIMESTAMP" /> - </resultMap> - <sql id="Example_Where_Clause" > - <where > - <foreach collection="oredCriteria" item="criteria" separator="or" > - <if test="criteria.valid" > - <trim prefix="(" suffix=")" prefixOverrides="and" > - <foreach collection="criteria.criteria" item="criterion" > - <choose > - <when test="criterion.noValue" > - and ${criterion.condition} - </when> - <when test="criterion.singleValue" > - and ${criterion.condition} #{criterion.value} - </when> - <when test="criterion.betweenValue" > - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - </when> - <when test="criterion.listValue" > - and ${criterion.condition} - <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," > - #{listItem} - </foreach> - </when> - </choose> - </foreach> - </trim> - </if> - </foreach> - </where> - </sql> - <sql id="Update_By_Example_Where_Clause" > - <where > - <foreach collection="example.oredCriteria" item="criteria" separator="or" > - <if test="criteria.valid" > - <trim prefix="(" suffix=")" prefixOverrides="and" > - <foreach collection="criteria.criteria" item="criterion" > - <choose > - <when test="criterion.noValue" > - and ${criterion.condition} - </when> - <when test="criterion.singleValue" > - and ${criterion.condition} #{criterion.value} - </when> - <when test="criterion.betweenValue" > - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - </when> - <when test="criterion.listValue" > - and ${criterion.condition} - <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," > - #{listItem} - </foreach> - </when> - </choose> - </foreach> - </trim> - </if> - </foreach> - </where> - </sql> - <sql id="Base_Column_List" > - id, uid, act_id, device_id, platform, type, ip, create_time - </sql> - <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.accompany.business.model.ChargeActivityVisitLogExample" > - select - <if test="distinct" > - distinct - </if> - 'true' as QUERYID, - <include refid="Base_Column_List" /> - from charge_activity_visit_log - <if test="_parameter != null" > - <include refid="Example_Where_Clause" /> - </if> - <if test="orderByClause != null" > - order by ${orderByClause} - </if> - </select> - <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" > - select - <include refid="Base_Column_List" /> - from charge_activity_visit_log - where id = #{id,jdbcType=BIGINT} - </select> - <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" > - delete from charge_activity_visit_log - where id = #{id,jdbcType=BIGINT} - </delete> - <delete id="deleteByExample" parameterType="com.accompany.business.model.ChargeActivityVisitLogExample" > - delete from charge_activity_visit_log - <if test="_parameter != null" > - <include refid="Example_Where_Clause" /> - </if> - </delete> - <insert id="insert" parameterType="com.accompany.business.model.ChargeActivityVisitLog" > - insert into charge_activity_visit_log (id, uid, act_id, - device_id, platform, type, - ip, create_time) - values (#{id,jdbcType=BIGINT}, #{uid,jdbcType=BIGINT}, #{actId,jdbcType=INTEGER}, - #{deviceId,jdbcType=VARCHAR}, #{platform,jdbcType=TINYINT}, #{type,jdbcType=TINYINT}, - #{ip,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}) - </insert> - <insert id="insertSelective" parameterType="com.accompany.business.model.ChargeActivityVisitLog" > - insert into charge_activity_visit_log - <trim prefix="(" suffix=")" suffixOverrides="," > - <if test="id != null" > - id, - </if> - <if test="uid != null" > - uid, - </if> - <if test="actId != null" > - act_id, - </if> - <if test="deviceId != null" > - device_id, - </if> - <if test="platform != null" > - platform, - </if> - <if test="type != null" > - type, - </if> - <if test="ip != null" > - ip, - </if> - <if test="createTime != null" > - create_time, - </if> - </trim> - <trim prefix="values (" suffix=")" suffixOverrides="," > - <if test="id != null" > - #{id,jdbcType=BIGINT}, - </if> - <if test="uid != null" > - #{uid,jdbcType=BIGINT}, - </if> - <if test="actId != null" > - #{actId,jdbcType=INTEGER}, - </if> - <if test="deviceId != null" > - #{deviceId,jdbcType=VARCHAR}, - </if> - <if test="platform != null" > - #{platform,jdbcType=TINYINT}, - </if> - <if test="type != null" > - #{type,jdbcType=TINYINT}, - </if> - <if test="ip != null" > - #{ip,jdbcType=VARCHAR}, - </if> - <if test="createTime != null" > - #{createTime,jdbcType=TIMESTAMP}, - </if> - </trim> - </insert> - <select id="countByExample" parameterType="com.accompany.business.model.ChargeActivityVisitLog" resultType="java.lang.Integer" > - select count(*) from charge_activity_visit_log - <if test="_parameter != null" > - <include refid="Example_Where_Clause" /> - </if> - </select> - <update id="updateByExampleSelective" parameterType="map" > - update charge_activity_visit_log - <set > - <if test="record.id != null" > - id = #{record.id,jdbcType=BIGINT}, - </if> - <if test="record.uid != null" > - uid = #{record.uid,jdbcType=BIGINT}, - </if> - <if test="record.actId != null" > - act_id = #{record.actId,jdbcType=INTEGER}, - </if> - <if test="record.deviceId != null" > - device_id = #{record.deviceId,jdbcType=VARCHAR}, - </if> - <if test="record.platform != null" > - platform = #{record.platform,jdbcType=TINYINT}, - </if> - <if test="record.type != null" > - type = #{record.type,jdbcType=TINYINT}, - </if> - <if test="record.ip != null" > - ip = #{record.ip,jdbcType=VARCHAR}, - </if> - <if test="record.createTime != null" > - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - </if> - </set> - <if test="_parameter != null" > - <include refid="Update_By_Example_Where_Clause" /> - </if> - </update> - <update id="updateByExample" parameterType="map" > - update charge_activity_visit_log - set id = #{record.id,jdbcType=BIGINT}, - uid = #{record.uid,jdbcType=BIGINT}, - act_id = #{record.actId,jdbcType=INTEGER}, - device_id = #{record.deviceId,jdbcType=VARCHAR}, - platform = #{record.platform,jdbcType=TINYINT}, - type = #{record.type,jdbcType=TINYINT}, - ip = #{record.ip,jdbcType=VARCHAR}, - create_time = #{record.createTime,jdbcType=TIMESTAMP} - <if test="_parameter != null" > - <include refid="Update_By_Example_Where_Clause" /> - </if> - </update> - <update id="updateByPrimaryKeySelective" parameterType="com.accompany.business.model.ChargeActivityVisitLog" > - update charge_activity_visit_log - <set > - <if test="uid != null" > - uid = #{uid,jdbcType=BIGINT}, - </if> - <if test="actId != null" > - act_id = #{actId,jdbcType=INTEGER}, - </if> - <if test="deviceId != null" > - device_id = #{deviceId,jdbcType=VARCHAR}, - </if> - <if test="platform != null" > - platform = #{platform,jdbcType=TINYINT}, - </if> - <if test="type != null" > - type = #{type,jdbcType=TINYINT}, - </if> - <if test="ip != null" > - ip = #{ip,jdbcType=VARCHAR}, - </if> - <if test="createTime != null" > - create_time = #{createTime,jdbcType=TIMESTAMP}, - </if> - </set> - where id = #{id,jdbcType=BIGINT} - </update> - <update id="updateByPrimaryKey" parameterType="com.accompany.business.model.ChargeActivityVisitLog" > - update charge_activity_visit_log - set uid = #{uid,jdbcType=BIGINT}, - act_id = #{actId,jdbcType=INTEGER}, - device_id = #{deviceId,jdbcType=VARCHAR}, - platform = #{platform,jdbcType=TINYINT}, - type = #{type,jdbcType=TINYINT}, - ip = #{ip,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP} - where id = #{id,jdbcType=BIGINT} - </update> -</mapper> \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/ExchangeRateMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/ExchangeRateMapper.xml deleted file mode 100644 index 5987c7674..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/ExchangeRateMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="com.accompany.business.mybatismapper.withdraw.ExchangeRateMapper"> - <select id="getLastRateTime" resultType="java.util.Date"> - select update_time from exchange_rate order by update_time desc limit 1 - </select> -</mapper> \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/FinanceGoldDiamondDetailMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/FinanceGoldDiamondDetailMapper.xml deleted file mode 100644 index 26292c7b4..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/FinanceGoldDiamondDetailMapper.xml +++ /dev/null @@ -1,277 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="com.accompany.business.mybatismapper.FinanceGoldDiamondDetailMapper" > - <resultMap id="BaseResultMap" type="com.accompany.business.model.FinanceGoldDiamondDetail" > - <id column="id" property="id" jdbcType="BIGINT" /> - <result column="big_obj_type" property="bigObjType" jdbcType="TINYINT" /> - <result column="big_obj_type_name" property="bigObjTypeName" jdbcType="VARCHAR" /> - <result column="obj_type" property="objType" jdbcType="TINYINT" /> - <result column="obj_type_name" property="objTypeName" jdbcType="VARCHAR" /> - <result column="num" property="num" jdbcType="DOUBLE" /> - <result column="create_time" property="createTime" jdbcType="TIMESTAMP" /> - <result column="bill_time" property="billTime" jdbcType="TIMESTAMP" /> - <result column="relavance_id" property="relavanceId" jdbcType="BIGINT" /> - </resultMap> - <sql id="Example_Where_Clause" > - <where > - <foreach collection="oredCriteria" item="criteria" separator="or" > - <if test="criteria.valid" > - <trim prefix="(" suffix=")" prefixOverrides="and" > - <foreach collection="criteria.criteria" item="criterion" > - <choose > - <when test="criterion.noValue" > - and ${criterion.condition} - </when> - <when test="criterion.singleValue" > - and ${criterion.condition} #{criterion.value} - </when> - <when test="criterion.betweenValue" > - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - </when> - <when test="criterion.listValue" > - and ${criterion.condition} - <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," > - #{listItem} - </foreach> - </when> - </choose> - </foreach> - </trim> - </if> - </foreach> - </where> - </sql> - <sql id="Update_By_Example_Where_Clause" > - <where > - <foreach collection="example.oredCriteria" item="criteria" separator="or" > - <if test="criteria.valid" > - <trim prefix="(" suffix=")" prefixOverrides="and" > - <foreach collection="criteria.criteria" item="criterion" > - <choose > - <when test="criterion.noValue" > - and ${criterion.condition} - </when> - <when test="criterion.singleValue" > - and ${criterion.condition} #{criterion.value} - </when> - <when test="criterion.betweenValue" > - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - </when> - <when test="criterion.listValue" > - and ${criterion.condition} - <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," > - #{listItem} - </foreach> - </when> - </choose> - </foreach> - </trim> - </if> - </foreach> - </where> - </sql> - <sql id="Base_Column_List" > - id, big_obj_type, big_obj_type_name, obj_type, obj_type_name, num, create_time, bill_time, - relavance_id - </sql> - <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.accompany.business.model.FinanceGoldDiamondDetailExample" > - select - <if test="distinct" > - distinct - </if> - 'true' as QUERYID, - <include refid="Base_Column_List" /> - from finance_gold_diamond_detail - <if test="_parameter != null" > - <include refid="Example_Where_Clause" /> - </if> - <if test="orderByClause != null" > - order by ${orderByClause} - </if> - <if test="limit != null" > - <if test="offset != null" > - limit ${offset}, ${limit} - </if> - <if test="offset == null" > - limit ${limit} - </if> - </if> - </select> - <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" > - select - <include refid="Base_Column_List" /> - from finance_gold_diamond_detail - where id = #{id,jdbcType=BIGINT} - </select> - <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" > - delete from finance_gold_diamond_detail - where id = #{id,jdbcType=BIGINT} - </delete> - <delete id="deleteByExample" parameterType="com.accompany.business.model.FinanceGoldDiamondDetailExample" > - delete from finance_gold_diamond_detail - <if test="_parameter != null" > - <include refid="Example_Where_Clause" /> - </if> - </delete> - <insert id="insert" parameterType="com.accompany.business.model.FinanceGoldDiamondDetail" useGeneratedKeys="true" keyProperty="id" > - insert into finance_gold_diamond_detail (big_obj_type, big_obj_type_name, obj_type, - obj_type_name, num, create_time, - bill_time, relavance_id) - values (#{bigObjType,jdbcType=TINYINT}, #{bigObjTypeName,jdbcType=VARCHAR}, #{objType,jdbcType=TINYINT}, - #{objTypeName,jdbcType=VARCHAR}, #{num,jdbcType=DOUBLE}, #{createTime,jdbcType=TIMESTAMP}, - #{billTime,jdbcType=TIMESTAMP}, #{relavanceId,jdbcType=BIGINT}) - </insert> - <insert id="insertSelective" parameterType="com.accompany.business.model.FinanceGoldDiamondDetail" useGeneratedKeys="true" keyProperty="id" > - insert into finance_gold_diamond_detail - <trim prefix="(" suffix=")" suffixOverrides="," > - <if test="bigObjType != null" > - big_obj_type, - </if> - <if test="bigObjTypeName != null" > - big_obj_type_name, - </if> - <if test="objType != null" > - obj_type, - </if> - <if test="objTypeName != null" > - obj_type_name, - </if> - <if test="num != null" > - num, - </if> - <if test="createTime != null" > - create_time, - </if> - <if test="billTime != null" > - bill_time, - </if> - <if test="relavanceId != null" > - relavance_id, - </if> - </trim> - <trim prefix="values (" suffix=")" suffixOverrides="," > - <if test="bigObjType != null" > - #{bigObjType,jdbcType=TINYINT}, - </if> - <if test="bigObjTypeName != null" > - #{bigObjTypeName,jdbcType=VARCHAR}, - </if> - <if test="objType != null" > - #{objType,jdbcType=TINYINT}, - </if> - <if test="objTypeName != null" > - #{objTypeName,jdbcType=VARCHAR}, - </if> - <if test="num != null" > - #{num,jdbcType=DOUBLE}, - </if> - <if test="createTime != null" > - #{createTime,jdbcType=TIMESTAMP}, - </if> - <if test="billTime != null" > - #{billTime,jdbcType=TIMESTAMP}, - </if> - <if test="relavanceId != null" > - #{relavanceId,jdbcType=BIGINT}, - </if> - </trim> - </insert> - <select id="countByExample" parameterType="com.accompany.business.model.FinanceGoldDiamondDetailExample" resultType="java.lang.Integer" > - select count(*) from finance_gold_diamond_detail - <if test="_parameter != null" > - <include refid="Example_Where_Clause" /> - </if> - </select> - <update id="updateByExampleSelective" parameterType="map" > - update finance_gold_diamond_detail - <set > - <if test="record.id != null" > - id = #{record.id,jdbcType=BIGINT}, - </if> - <if test="record.bigObjType != null" > - big_obj_type = #{record.bigObjType,jdbcType=TINYINT}, - </if> - <if test="record.bigObjTypeName != null" > - big_obj_type_name = #{record.bigObjTypeName,jdbcType=VARCHAR}, - </if> - <if test="record.objType != null" > - obj_type = #{record.objType,jdbcType=TINYINT}, - </if> - <if test="record.objTypeName != null" > - obj_type_name = #{record.objTypeName,jdbcType=VARCHAR}, - </if> - <if test="record.num != null" > - num = #{record.num,jdbcType=DOUBLE}, - </if> - <if test="record.createTime != null" > - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - </if> - <if test="record.billTime != null" > - bill_time = #{record.billTime,jdbcType=TIMESTAMP}, - </if> - <if test="record.relavanceId != null" > - relavance_id = #{record.relavanceId,jdbcType=BIGINT}, - </if> - </set> - <if test="_parameter != null" > - <include refid="Update_By_Example_Where_Clause" /> - </if> - </update> - <update id="updateByExample" parameterType="map" > - update finance_gold_diamond_detail - set id = #{record.id,jdbcType=BIGINT}, - big_obj_type = #{record.bigObjType,jdbcType=TINYINT}, - big_obj_type_name = #{record.bigObjTypeName,jdbcType=VARCHAR}, - obj_type = #{record.objType,jdbcType=TINYINT}, - obj_type_name = #{record.objTypeName,jdbcType=VARCHAR}, - num = #{record.num,jdbcType=DOUBLE}, - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - bill_time = #{record.billTime,jdbcType=TIMESTAMP}, - relavance_id = #{record.relavanceId,jdbcType=BIGINT} - <if test="_parameter != null" > - <include refid="Update_By_Example_Where_Clause" /> - </if> - </update> - <update id="updateByPrimaryKeySelective" parameterType="com.accompany.business.model.FinanceGoldDiamondDetail" > - update finance_gold_diamond_detail - <set > - <if test="bigObjType != null" > - big_obj_type = #{bigObjType,jdbcType=TINYINT}, - </if> - <if test="bigObjTypeName != null" > - big_obj_type_name = #{bigObjTypeName,jdbcType=VARCHAR}, - </if> - <if test="objType != null" > - obj_type = #{objType,jdbcType=TINYINT}, - </if> - <if test="objTypeName != null" > - obj_type_name = #{objTypeName,jdbcType=VARCHAR}, - </if> - <if test="num != null" > - num = #{num,jdbcType=DOUBLE}, - </if> - <if test="createTime != null" > - create_time = #{createTime,jdbcType=TIMESTAMP}, - </if> - <if test="billTime != null" > - bill_time = #{billTime,jdbcType=TIMESTAMP}, - </if> - <if test="relavanceId != null" > - relavance_id = #{relavanceId,jdbcType=BIGINT}, - </if> - </set> - where id = #{id,jdbcType=BIGINT} - </update> - <update id="updateByPrimaryKey" parameterType="com.accompany.business.model.FinanceGoldDiamondDetail" > - update finance_gold_diamond_detail - set big_obj_type = #{bigObjType,jdbcType=TINYINT}, - big_obj_type_name = #{bigObjTypeName,jdbcType=VARCHAR}, - obj_type = #{objType,jdbcType=TINYINT}, - obj_type_name = #{objTypeName,jdbcType=VARCHAR}, - num = #{num,jdbcType=DOUBLE}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - bill_time = #{billTime,jdbcType=TIMESTAMP}, - relavance_id = #{relavanceId,jdbcType=BIGINT} - where id = #{id,jdbcType=BIGINT} - </update> -</mapper> \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/FinanceGoldDiamondDetailMapperExpand.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/FinanceGoldDiamondDetailMapperExpand.xml deleted file mode 100644 index 9674cb2f4..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/FinanceGoldDiamondDetailMapperExpand.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="com.accompany.business.mybatismapper.FinanceGoldDiamondDetailMapperExpand"> - <insert id="insertList" parameterType="java.util.List"> - insert into - finance_gold_diamond_detail - ( - big_obj_type, - big_obj_type_name, - obj_type, - obj_type_name, - num, - create_time, - bill_time, - relavance_id - ) - values - <foreach collection="list" item="item" index="index" separator=","> - ( - #{item.bigObjType,jdbcType=TINYINT}, - #{item.bigObjTypeName,jdbcType=VARCHAR}, - #{item.objType,jdbcType=TINYINT}, - #{item.objTypeName,jdbcType=VARCHAR}, - #{item.num,jdbcType=DOUBLE}, - #{item.createTime,jdbcType=TIMESTAMP}, - #{item.billTime,jdbcType=TIMESTAMP}, - #{item.relavanceId,jdbcType=BIGINT} - ) - </foreach> - </insert> -</mapper> \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/FinanceGoldDiamondMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/FinanceGoldDiamondMapper.xml deleted file mode 100644 index 2187fcea7..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/FinanceGoldDiamondMapper.xml +++ /dev/null @@ -1,324 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="com.accompany.business.mybatismapper.FinanceGoldDiamondMapper" > - <resultMap id="BaseResultMap" type="com.accompany.business.model.FinanceGoldDiamond" > - <id column="id" property="id" jdbcType="BIGINT" /> - <result column="charge_gold_num" property="chargeGoldNum" jdbcType="DOUBLE" /> - <result column="noble_gold_num" property="nobleGoldNum" jdbcType="DOUBLE" /> - <result column="gold_num" property="goldNum" jdbcType="DOUBLE" /> - <result column="diamond_num" property="diamondNum" jdbcType="DOUBLE" /> - <result column="total_num" property="totalNum" jdbcType="DOUBLE" /> - <result column="gold_increase_num" property="goldIncreaseNum" jdbcType="DOUBLE" /> - <result column="gold_decrease_num" property="goldDecreaseNum" jdbcType="DOUBLE" /> - <result column="diamond_increase_num" property="diamondIncreaseNum" jdbcType="DOUBLE" /> - <result column="diamond_decrease_num" property="diamondDecreaseNum" jdbcType="DOUBLE" /> - <result column="create_time" property="createTime" jdbcType="TIMESTAMP" /> - <result column="bill_time" property="billTime" jdbcType="TIMESTAMP" /> - </resultMap> - <sql id="Example_Where_Clause" > - <where > - <foreach collection="oredCriteria" item="criteria" separator="or" > - <if test="criteria.valid" > - <trim prefix="(" suffix=")" prefixOverrides="and" > - <foreach collection="criteria.criteria" item="criterion" > - <choose > - <when test="criterion.noValue" > - and ${criterion.condition} - </when> - <when test="criterion.singleValue" > - and ${criterion.condition} #{criterion.value} - </when> - <when test="criterion.betweenValue" > - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - </when> - <when test="criterion.listValue" > - and ${criterion.condition} - <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," > - #{listItem} - </foreach> - </when> - </choose> - </foreach> - </trim> - </if> - </foreach> - </where> - </sql> - <sql id="Update_By_Example_Where_Clause" > - <where > - <foreach collection="example.oredCriteria" item="criteria" separator="or" > - <if test="criteria.valid" > - <trim prefix="(" suffix=")" prefixOverrides="and" > - <foreach collection="criteria.criteria" item="criterion" > - <choose > - <when test="criterion.noValue" > - and ${criterion.condition} - </when> - <when test="criterion.singleValue" > - and ${criterion.condition} #{criterion.value} - </when> - <when test="criterion.betweenValue" > - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - </when> - <when test="criterion.listValue" > - and ${criterion.condition} - <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," > - #{listItem} - </foreach> - </when> - </choose> - </foreach> - </trim> - </if> - </foreach> - </where> - </sql> - <sql id="Base_Column_List" > - id, charge_gold_num, noble_gold_num, gold_num, diamond_num, total_num, gold_increase_num, - gold_decrease_num, diamond_increase_num, diamond_decrease_num, create_time, bill_time - </sql> - <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.accompany.business.model.FinanceGoldDiamondExample" > - select - <if test="distinct" > - distinct - </if> - 'true' as QUERYID, - <include refid="Base_Column_List" /> - from finance_gold_diamond - <if test="_parameter != null" > - <include refid="Example_Where_Clause" /> - </if> - <if test="orderByClause != null" > - order by ${orderByClause} - </if> - <if test="limit != null" > - <if test="offset != null" > - limit ${offset}, ${limit} - </if> - <if test="offset == null" > - limit ${limit} - </if> - </if> - </select> - <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" > - select - <include refid="Base_Column_List" /> - from finance_gold_diamond - where id = #{id,jdbcType=BIGINT} - </select> - <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" > - delete from finance_gold_diamond - where id = #{id,jdbcType=BIGINT} - </delete> - <delete id="deleteByExample" parameterType="com.accompany.business.model.FinanceGoldDiamondExample" > - delete from finance_gold_diamond - <if test="_parameter != null" > - <include refid="Example_Where_Clause" /> - </if> - </delete> - <insert id="insert" parameterType="com.accompany.business.model.FinanceGoldDiamond" useGeneratedKeys="true" keyProperty="id" > - insert into finance_gold_diamond (charge_gold_num, noble_gold_num, gold_num, - diamond_num, total_num, gold_increase_num, - gold_decrease_num, diamond_increase_num, diamond_decrease_num, - create_time, bill_time) - values (#{chargeGoldNum,jdbcType=DOUBLE}, #{nobleGoldNum,jdbcType=DOUBLE}, #{goldNum,jdbcType=DOUBLE}, - #{diamondNum,jdbcType=DOUBLE}, #{totalNum,jdbcType=DOUBLE}, #{goldIncreaseNum,jdbcType=DOUBLE}, - #{goldDecreaseNum,jdbcType=DOUBLE}, #{diamondIncreaseNum,jdbcType=DOUBLE}, #{diamondDecreaseNum,jdbcType=DOUBLE}, - #{createTime,jdbcType=TIMESTAMP}, #{billTime,jdbcType=TIMESTAMP}) - </insert> - <insert id="insertSelective" parameterType="com.accompany.business.model.FinanceGoldDiamond" useGeneratedKeys="true" keyProperty="id" > - insert into finance_gold_diamond - <trim prefix="(" suffix=")" suffixOverrides="," > - <if test="chargeGoldNum != null" > - charge_gold_num, - </if> - <if test="nobleGoldNum != null" > - noble_gold_num, - </if> - <if test="goldNum != null" > - gold_num, - </if> - <if test="diamondNum != null" > - diamond_num, - </if> - <if test="totalNum != null" > - total_num, - </if> - <if test="goldIncreaseNum != null" > - gold_increase_num, - </if> - <if test="goldDecreaseNum != null" > - gold_decrease_num, - </if> - <if test="diamondIncreaseNum != null" > - diamond_increase_num, - </if> - <if test="diamondDecreaseNum != null" > - diamond_decrease_num, - </if> - <if test="createTime != null" > - create_time, - </if> - <if test="billTime != null" > - bill_time, - </if> - </trim> - <trim prefix="values (" suffix=")" suffixOverrides="," > - <if test="chargeGoldNum != null" > - #{chargeGoldNum,jdbcType=DOUBLE}, - </if> - <if test="nobleGoldNum != null" > - #{nobleGoldNum,jdbcType=DOUBLE}, - </if> - <if test="goldNum != null" > - #{goldNum,jdbcType=DOUBLE}, - </if> - <if test="diamondNum != null" > - #{diamondNum,jdbcType=DOUBLE}, - </if> - <if test="totalNum != null" > - #{totalNum,jdbcType=DOUBLE}, - </if> - <if test="goldIncreaseNum != null" > - #{goldIncreaseNum,jdbcType=DOUBLE}, - </if> - <if test="goldDecreaseNum != null" > - #{goldDecreaseNum,jdbcType=DOUBLE}, - </if> - <if test="diamondIncreaseNum != null" > - #{diamondIncreaseNum,jdbcType=DOUBLE}, - </if> - <if test="diamondDecreaseNum != null" > - #{diamondDecreaseNum,jdbcType=DOUBLE}, - </if> - <if test="createTime != null" > - #{createTime,jdbcType=TIMESTAMP}, - </if> - <if test="billTime != null" > - #{billTime,jdbcType=TIMESTAMP}, - </if> - </trim> - </insert> - <select id="countByExample" parameterType="com.accompany.business.model.FinanceGoldDiamondExample" resultType="java.lang.Integer" > - select count(*) from finance_gold_diamond - <if test="_parameter != null" > - <include refid="Example_Where_Clause" /> - </if> - </select> - <update id="updateByExampleSelective" parameterType="map" > - update finance_gold_diamond - <set > - <if test="record.id != null" > - id = #{record.id,jdbcType=BIGINT}, - </if> - <if test="record.chargeGoldNum != null" > - charge_gold_num = #{record.chargeGoldNum,jdbcType=DOUBLE}, - </if> - <if test="record.nobleGoldNum != null" > - noble_gold_num = #{record.nobleGoldNum,jdbcType=DOUBLE}, - </if> - <if test="record.goldNum != null" > - gold_num = #{record.goldNum,jdbcType=DOUBLE}, - </if> - <if test="record.diamondNum != null" > - diamond_num = #{record.diamondNum,jdbcType=DOUBLE}, - </if> - <if test="record.totalNum != null" > - total_num = #{record.totalNum,jdbcType=DOUBLE}, - </if> - <if test="record.goldIncreaseNum != null" > - gold_increase_num = #{record.goldIncreaseNum,jdbcType=DOUBLE}, - </if> - <if test="record.goldDecreaseNum != null" > - gold_decrease_num = #{record.goldDecreaseNum,jdbcType=DOUBLE}, - </if> - <if test="record.diamondIncreaseNum != null" > - diamond_increase_num = #{record.diamondIncreaseNum,jdbcType=DOUBLE}, - </if> - <if test="record.diamondDecreaseNum != null" > - diamond_decrease_num = #{record.diamondDecreaseNum,jdbcType=DOUBLE}, - </if> - <if test="record.createTime != null" > - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - </if> - <if test="record.billTime != null" > - bill_time = #{record.billTime,jdbcType=TIMESTAMP}, - </if> - </set> - <if test="_parameter != null" > - <include refid="Update_By_Example_Where_Clause" /> - </if> - </update> - <update id="updateByExample" parameterType="map" > - update finance_gold_diamond - set id = #{record.id,jdbcType=BIGINT}, - charge_gold_num = #{record.chargeGoldNum,jdbcType=DOUBLE}, - noble_gold_num = #{record.nobleGoldNum,jdbcType=DOUBLE}, - gold_num = #{record.goldNum,jdbcType=DOUBLE}, - diamond_num = #{record.diamondNum,jdbcType=DOUBLE}, - total_num = #{record.totalNum,jdbcType=DOUBLE}, - gold_increase_num = #{record.goldIncreaseNum,jdbcType=DOUBLE}, - gold_decrease_num = #{record.goldDecreaseNum,jdbcType=DOUBLE}, - diamond_increase_num = #{record.diamondIncreaseNum,jdbcType=DOUBLE}, - diamond_decrease_num = #{record.diamondDecreaseNum,jdbcType=DOUBLE}, - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - bill_time = #{record.billTime,jdbcType=TIMESTAMP} - <if test="_parameter != null" > - <include refid="Update_By_Example_Where_Clause" /> - </if> - </update> - <update id="updateByPrimaryKeySelective" parameterType="com.accompany.business.model.FinanceGoldDiamond" > - update finance_gold_diamond - <set > - <if test="chargeGoldNum != null" > - charge_gold_num = #{chargeGoldNum,jdbcType=DOUBLE}, - </if> - <if test="nobleGoldNum != null" > - noble_gold_num = #{nobleGoldNum,jdbcType=DOUBLE}, - </if> - <if test="goldNum != null" > - gold_num = #{goldNum,jdbcType=DOUBLE}, - </if> - <if test="diamondNum != null" > - diamond_num = #{diamondNum,jdbcType=DOUBLE}, - </if> - <if test="totalNum != null" > - total_num = #{totalNum,jdbcType=DOUBLE}, - </if> - <if test="goldIncreaseNum != null" > - gold_increase_num = #{goldIncreaseNum,jdbcType=DOUBLE}, - </if> - <if test="goldDecreaseNum != null" > - gold_decrease_num = #{goldDecreaseNum,jdbcType=DOUBLE}, - </if> - <if test="diamondIncreaseNum != null" > - diamond_increase_num = #{diamondIncreaseNum,jdbcType=DOUBLE}, - </if> - <if test="diamondDecreaseNum != null" > - diamond_decrease_num = #{diamondDecreaseNum,jdbcType=DOUBLE}, - </if> - <if test="createTime != null" > - create_time = #{createTime,jdbcType=TIMESTAMP}, - </if> - <if test="billTime != null" > - bill_time = #{billTime,jdbcType=TIMESTAMP}, - </if> - </set> - where id = #{id,jdbcType=BIGINT} - </update> - <update id="updateByPrimaryKey" parameterType="com.accompany.business.model.FinanceGoldDiamond" > - update finance_gold_diamond - set charge_gold_num = #{chargeGoldNum,jdbcType=DOUBLE}, - noble_gold_num = #{nobleGoldNum,jdbcType=DOUBLE}, - gold_num = #{goldNum,jdbcType=DOUBLE}, - diamond_num = #{diamondNum,jdbcType=DOUBLE}, - total_num = #{totalNum,jdbcType=DOUBLE}, - gold_increase_num = #{goldIncreaseNum,jdbcType=DOUBLE}, - gold_decrease_num = #{goldDecreaseNum,jdbcType=DOUBLE}, - diamond_increase_num = #{diamondIncreaseNum,jdbcType=DOUBLE}, - diamond_decrease_num = #{diamondDecreaseNum,jdbcType=DOUBLE}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - bill_time = #{billTime,jdbcType=TIMESTAMP} - where id = #{id,jdbcType=BIGINT} - </update> -</mapper> \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/FinanceTypeConfigMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/FinanceTypeConfigMapper.xml deleted file mode 100644 index a56566069..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/FinanceTypeConfigMapper.xml +++ /dev/null @@ -1,229 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="com.accompany.business.mybatismapper.FinanceTypeConfigMapper" > - <resultMap id="BaseResultMap" type="com.accompany.business.model.FinanceTypeConfig" > - <id column="obj_type" property="objType" jdbcType="TINYINT" /> - <result column="obj_type_name" property="objTypeName" jdbcType="VARCHAR" /> - <result column="big_obj_type" property="bigObjType" jdbcType="TINYINT" /> - <result column="big_obj_type_name" property="bigObjTypeName" jdbcType="VARCHAR" /> - <result column="create_time" property="createTime" jdbcType="TIMESTAMP" /> - <result column="statistics_type" property="statisticsType" jdbcType="BIT" /> - </resultMap> - <sql id="Example_Where_Clause" > - <where > - <foreach collection="oredCriteria" item="criteria" separator="or" > - <if test="criteria.valid" > - <trim prefix="(" suffix=")" prefixOverrides="and" > - <foreach collection="criteria.criteria" item="criterion" > - <choose > - <when test="criterion.noValue" > - and ${criterion.condition} - </when> - <when test="criterion.singleValue" > - and ${criterion.condition} #{criterion.value} - </when> - <when test="criterion.betweenValue" > - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - </when> - <when test="criterion.listValue" > - and ${criterion.condition} - <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," > - #{listItem} - </foreach> - </when> - </choose> - </foreach> - </trim> - </if> - </foreach> - </where> - </sql> - <sql id="Update_By_Example_Where_Clause" > - <where > - <foreach collection="example.oredCriteria" item="criteria" separator="or" > - <if test="criteria.valid" > - <trim prefix="(" suffix=")" prefixOverrides="and" > - <foreach collection="criteria.criteria" item="criterion" > - <choose > - <when test="criterion.noValue" > - and ${criterion.condition} - </when> - <when test="criterion.singleValue" > - and ${criterion.condition} #{criterion.value} - </when> - <when test="criterion.betweenValue" > - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - </when> - <when test="criterion.listValue" > - and ${criterion.condition} - <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," > - #{listItem} - </foreach> - </when> - </choose> - </foreach> - </trim> - </if> - </foreach> - </where> - </sql> - <sql id="Base_Column_List" > - obj_type, obj_type_name, big_obj_type, big_obj_type_name, create_time, statistics_type - </sql> - <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.accompany.business.model.FinanceTypeConfigExample" > - select - <if test="distinct" > - distinct - </if> - 'true' as QUERYID, - <include refid="Base_Column_List" /> - from finance_type_config - <if test="_parameter != null" > - <include refid="Example_Where_Clause" /> - </if> - <if test="orderByClause != null" > - order by ${orderByClause} - </if> - <if test="limit != null" > - <if test="offset != null" > - limit ${offset}, ${limit} - </if> - <if test="offset == null" > - limit ${limit} - </if> - </if> - </select> - <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Byte" > - select - <include refid="Base_Column_List" /> - from finance_type_config - where obj_type = #{objType,jdbcType=TINYINT} - </select> - <delete id="deleteByPrimaryKey" parameterType="java.lang.Byte" > - delete from finance_type_config - where obj_type = #{objType,jdbcType=TINYINT} - </delete> - <delete id="deleteByExample" parameterType="com.accompany.business.model.FinanceTypeConfigExample" > - delete from finance_type_config - <if test="_parameter != null" > - <include refid="Example_Where_Clause" /> - </if> - </delete> - <insert id="insert" parameterType="com.accompany.business.model.FinanceTypeConfig" useGeneratedKeys="true" keyProperty="objType" > - insert into finance_type_config (obj_type_name, big_obj_type, big_obj_type_name, - create_time, statistics_type) - values (#{objTypeName,jdbcType=VARCHAR}, #{bigObjType,jdbcType=TINYINT}, #{bigObjTypeName,jdbcType=VARCHAR}, - #{createTime,jdbcType=TIMESTAMP}, #{statisticsType,jdbcType=BIT}) - </insert> - <insert id="insertSelective" parameterType="com.accompany.business.model.FinanceTypeConfig" useGeneratedKeys="true" keyProperty="objType" > - insert into finance_type_config - <trim prefix="(" suffix=")" suffixOverrides="," > - <if test="objTypeName != null" > - obj_type_name, - </if> - <if test="bigObjType != null" > - big_obj_type, - </if> - <if test="bigObjTypeName != null" > - big_obj_type_name, - </if> - <if test="createTime != null" > - create_time, - </if> - <if test="statisticsType != null" > - statistics_type, - </if> - </trim> - <trim prefix="values (" suffix=")" suffixOverrides="," > - <if test="objTypeName != null" > - #{objTypeName,jdbcType=VARCHAR}, - </if> - <if test="bigObjType != null" > - #{bigObjType,jdbcType=TINYINT}, - </if> - <if test="bigObjTypeName != null" > - #{bigObjTypeName,jdbcType=VARCHAR}, - </if> - <if test="createTime != null" > - #{createTime,jdbcType=TIMESTAMP}, - </if> - <if test="statisticsType != null" > - #{statisticsType,jdbcType=BIT}, - </if> - </trim> - </insert> - <select id="countByExample" parameterType="com.accompany.business.model.FinanceTypeConfigExample" resultType="java.lang.Integer" > - select count(*) from finance_type_config - <if test="_parameter != null" > - <include refid="Example_Where_Clause" /> - </if> - </select> - <update id="updateByExampleSelective" parameterType="map" > - update finance_type_config - <set > - <if test="record.objType != null" > - obj_type = #{record.objType,jdbcType=TINYINT}, - </if> - <if test="record.objTypeName != null" > - obj_type_name = #{record.objTypeName,jdbcType=VARCHAR}, - </if> - <if test="record.bigObjType != null" > - big_obj_type = #{record.bigObjType,jdbcType=TINYINT}, - </if> - <if test="record.bigObjTypeName != null" > - big_obj_type_name = #{record.bigObjTypeName,jdbcType=VARCHAR}, - </if> - <if test="record.createTime != null" > - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - </if> - <if test="record.statisticsType != null" > - statistics_type = #{record.statisticsType,jdbcType=BIT}, - </if> - </set> - <if test="_parameter != null" > - <include refid="Update_By_Example_Where_Clause" /> - </if> - </update> - <update id="updateByExample" parameterType="map" > - update finance_type_config - set obj_type = #{record.objType,jdbcType=TINYINT}, - obj_type_name = #{record.objTypeName,jdbcType=VARCHAR}, - big_obj_type = #{record.bigObjType,jdbcType=TINYINT}, - big_obj_type_name = #{record.bigObjTypeName,jdbcType=VARCHAR}, - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - statistics_type = #{record.statisticsType,jdbcType=BIT} - <if test="_parameter != null" > - <include refid="Update_By_Example_Where_Clause" /> - </if> - </update> - <update id="updateByPrimaryKeySelective" parameterType="com.accompany.business.model.FinanceTypeConfig" > - update finance_type_config - <set > - <if test="objTypeName != null" > - obj_type_name = #{objTypeName,jdbcType=VARCHAR}, - </if> - <if test="bigObjType != null" > - big_obj_type = #{bigObjType,jdbcType=TINYINT}, - </if> - <if test="bigObjTypeName != null" > - big_obj_type_name = #{bigObjTypeName,jdbcType=VARCHAR}, - </if> - <if test="createTime != null" > - create_time = #{createTime,jdbcType=TIMESTAMP}, - </if> - <if test="statisticsType != null" > - statistics_type = #{statisticsType,jdbcType=BIT}, - </if> - </set> - where obj_type = #{objType,jdbcType=TINYINT} - </update> - <update id="updateByPrimaryKey" parameterType="com.accompany.business.model.FinanceTypeConfig" > - update finance_type_config - set obj_type_name = #{objTypeName,jdbcType=VARCHAR}, - big_obj_type = #{bigObjType,jdbcType=TINYINT}, - big_obj_type_name = #{bigObjTypeName,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - statistics_type = #{statisticsType,jdbcType=BIT} - where obj_type = #{objType,jdbcType=TINYINT} - </update> -</mapper> \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/GamePartnerInfoMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/GamePartnerInfoMapper.xml deleted file mode 100644 index 2655a833d..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/GamePartnerInfoMapper.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="com.accompany.business.mybatismapper.gamepartner.GamePartnerInfoMapper"> -</mapper> \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/GamePartnerOrderMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/GamePartnerOrderMapper.xml deleted file mode 100644 index 39895b485..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/GamePartnerOrderMapper.xml +++ /dev/null @@ -1,65 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="com.accompany.business.mybatismapper.gamepartner.GamePartnerOrderMapper"> - <select id="record" resultType="com.accompany.business.vo.gamepartner.GamePartnerOrderVo"> - select - gpo.id, - gpo.order_no as orderNo, - gpo.from_uid as fromUid, - gpo.to_uid as toUid, - gpo.game_id as gameId, - gpo.inning, - gpo.price, - gpo.amount, - gpo.income, - gpo.`status`, - gpo.create_time as createTime, - gpo.update_time as updateTime, - date_format(gpo.create_time, '%Y-%m-%d %H:%i:%S') as orderTime, - u1.erban_no as fromErBanNo, - u1.nick as fromNick, - u1.avatar as fromAvatar, - u2.erban_no as toErBanNo, - u2.nick as toNick, - u2.avatar as toAvatar, - gpi.logo as gameLogo, - gpi.game_name as gameName, - gpi.background as gameBackground, - gpi.pic as gamePic - from game_partner_order as gpo - left join users as u1 on u1.uid = gpo.from_uid - left join users as u2 on u2.uid = gpo.to_uid - left join game_partner_info as gpi on gpi.game_id = gpo.game_id - <where> - <if test="uid != null and searchType == 0"> - and gpo.from_uid = #{uid} - </if> - <if test="uid != null and searchType == 1"> - and gpo.to_uid = #{uid} - </if> - </where> - order by gpo.create_time desc - </select> - - <select id="getGameOrderAmountByUid" resultType="com.accompany.business.dto.gamepartner.GameOrderAmountDto"> - select gpo.to_uid as uid, - ifnull(sum(gpo.amount), 0) as amount - from game_partner_order as gpo - where gpo.`status` = 1 - <if test="uidList != null and uidList.size > 0"> - and gpo.to_uid in - <foreach collection="uidList" item="item" open="(" separator="," close=")"> - #{item} - </foreach> - </if> - <if test="startTime != null and startTime != '' and endTime == null"> - AND DATE_FORMAT(gpo.create_time, '%Y-%m-%d') = #{startTime,jdbcType=VARCHAR} - </if> - <if test="startTime != null and startTime != '' and endTime != null and endTime != ''"> - AND DATE_FORMAT(gpo.create_time, '%Y-%m-%d') BETWEEN #{startTime,jdbcType=VARCHAR} AND - #{endTime,jdbcType=VARCHAR} - </if> - group by gpo.to_uid - </select> - -</mapper> \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/LuckySeaActMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/LuckySeaActMapper.xml deleted file mode 100644 index b1e7614d6..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/LuckySeaActMapper.xml +++ /dev/null @@ -1,122 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="com.accompany.business.mybatismapper.activity.LuckySeaActMapper"> - <resultMap id="luckySeaRankListVo" type="com.accompany.business.service.activities.vo.LuckySeaRankListVo"> - <id column="uid" property="uid" jdbcType="BIGINT"/> - <result column="erban_no" property="erbanNo" jdbcType="BIGINT"/> - <result column="nick" property="nick" jdbcType="VARCHAR"/> - <result column="avatar" property="avatar" jdbcType="VARCHAR"/> - <result column="num" property="num" jdbcType="DOUBLE"/> - </resultMap> - - <resultMap id="luckySeaActRoundRankUserVo" type="com.accompany.business.vo.activities.LuckySeaActRoundRankUserVo"> - <id column="uid" property="uid" jdbcType="BIGINT"/> - <result column="erbanNo" property="erbanNo" jdbcType="BIGINT"/> - <result column="nick" property="nick" jdbcType="VARCHAR"/> - <result column="avatar" property="avatar" jdbcType="VARCHAR"/> - <result column="prizeDiamonds" property="prizeDiamonds" jdbcType="BIGINT"/> - </resultMap> - - <select id="listDiamondRank" resultMap="luckySeaRankListVo"> - select uid, SUM(cost_piece_num * item_multiple) num - from lucky_sea_user_draw_record - where 1=1 - <if test="null != startTime"> - and create_time >= #{startTime} - </if> - <if test="null != endTime"> - and create_time <= #{endTime} - </if> - and draw_status = 1 - group by uid - order by num desc - limit #{start}, #{pageSize} - </select> - - <select id="listUserDiamondRank" resultMap="luckySeaRankListVo"> - select uid, SUM(cost_piece_num * item_multiple) num - from lucky_sea_user_draw_record - where 1=1 - <if test="null != startTime"> - and create_time >= #{startTime} - </if> - <if test="null != endTime"> - and create_time <= #{endTime} - </if> - and uid = #{uid} - and draw_status = 1 - group by uid - </select> - - <select id="listLuckyManRank" resultMap="luckySeaRankListVo"> - select uid, count(distinct round_id) num - from lucky_sea_user_draw_record - where 1=1 - <if test="null != startTime"> - and create_time >= #{startTime} - </if> - <if test="null != endTime"> - and create_time <= #{endTime} - </if> - and draw_status = 1 - group by uid - order by num desc - limit #{start}, #{pageSize} - </select> - - <select id="listUserLuckyManRank" resultMap="luckySeaRankListVo"> - select uid, count(distinct round_id) num - from lucky_sea_user_draw_record - where 1=1 - <if test="null != startTime"> - and create_time >= #{startTime} - </if> - <if test="null != endTime"> - and create_time <= #{endTime} - </if> - and uid = #{uid} - and draw_status = 1 - group by uid - </select> - - <select id="groupByUserDiamondIncome" resultType="java.util.Map"> - SELECT uid, IFNULL(SUM(d.cost_piece_num * d.item_multiple),0) diamondIncome - FROM `lucky_sea_user_draw_record` d - where d.create_time >= #{startTime} - and d.create_time <= #{endTime} - and d.draw_status = 1 - group by uid - </select> - - <select id="listTopThreeInOneRound" resultMap="luckySeaActRoundRankUserVo"> - SELECT uid, IFNULL(sum(cost_piece_num * item_multiple),0) prizeDiamonds - FROM `lucky_sea_user_draw_record` - where round_id = #{roundId} - and draw_status = 1 - group by uid - ORDER BY cost_piece_num DESC, uid ASC - LIMIT 3 - </select> - - <resultMap id="luckySeaActUserDrawItemVO" type="com.accompany.business.vo.activities.LuckySeaActUserDrawItemVO"> - <result column="item_id" property="id" jdbcType="BIGINT"/> - <result column="cost_piece_num" property="costPieceNum" jdbcType="INTEGER"/> - </resultMap> - - <select id="listUserDrawItemInfo" resultMap="luckySeaActUserDrawItemVO"> - SELECT r.item_id, r.cost_piece_num - from lucky_sea_user_draw_record r - where r.round_id = #{roundId} and r.uid = #{uid} - </select> - - <resultMap id="luckySeaActUserRoundStatDTO" type="com.accompany.business.dto.activity.luckysea.LuckySeaActUserRoundStatDTO"> - <result column="uid" property="uid" jdbcType="BIGINT"/> - <result column="costPieceNum" property="costPieceNum" jdbcType="BIGINT"/> - </resultMap> - <select id="listUserDrawStatDtoOneRound" resultMap="luckySeaActUserRoundStatDTO"> - SELECT uid, IFNULL(SUM(cost_piece_num), 0) costPieceNum - from lucky_sea_user_draw_record where round_id = #{roundId} - GROUP BY uid - </select> - -</mapper> \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/LuckySeaPreWarningMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/LuckySeaPreWarningMapper.xml deleted file mode 100644 index 26e841d05..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/LuckySeaPreWarningMapper.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="com.accompany.business.mybatismapper.activity.LuckySeaPreWarningMapper"> - - <select id="getStatByRoundId" resultType="com.accompany.business.dto.luckysea.LuckySeaBroadCastDTO"> - select ifnull(sum(r.cost_piece_num),0) as goldIn, - ifnull(sum(if(r.draw_status = 1, r.cost_piece_num * r.item_multiple, 0 )), 0) as goldOut, - count(distinct r.uid) peopleNum - from lucky_sea_user_draw_record r - where r.round_id = #{roundId}; - </select> - - <select id="getPreRoundStat" resultType="com.accompany.business.dto.luckysea.LuckySeaGoldPreWarningDTO"> - select ifnull(sum(r.cost_piece_num),0) as goldIn, - ifnull(sum(if(r.draw_status = 1, r.cost_piece_num * r.item_multiple, 0 )), 0) as goldOut - from - (select round_id from lucky_sea_act_info where status = 3 order by round_id desc limit #{roundNum}) a, lucky_sea_user_draw_record r - where a.round_id = r.round_id; - </select> - - <select id="getBroadCastStat" resultType="com.accompany.business.dto.luckysea.LuckySeaBroadCastDTO"> - select - ifnull(sum(r.cost_piece_num),0) as goldIn, - ifnull(sum(if(r.draw_status = 1, r.cost_piece_num * r.item_multiple, 0 )), 0) as goldOut, - count(distinct a.round_id) roundNum, - count(distinct r.uid) peopleNum - from - (select round_id from lucky_sea_act_info where status = 3 - and start_time between #{startTime} and #{endTime}) a - left join - lucky_sea_user_draw_record r - on a.round_id = r.round_id - ; - </select> -</mapper> \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/NewUserInRoomGiftMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/NewUserInRoomGiftMapper.xml deleted file mode 100644 index a255bb8ac..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/NewUserInRoomGiftMapper.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="com.accompany.business.mybatismapper.newuser.NewUserInRoomGiftMapper" > - - <select id = "getList" resultType = "com.accompany.business.vo.gift.NewUserGiftVo"> - SELECT nuirg.*,g.gift_name FROM new_user_in_room_gift nuirg LEFT JOIN gift g ON nuirg.gift_id = g.gift_id ORDER BY nuirg.create_time DESC - </select> -</mapper> \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/NewbieMessageMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/NewbieMessageMapper.xml deleted file mode 100644 index 540a7e00e..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/NewbieMessageMapper.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="com.accompany.business.mybatismapper.newbie.NewbieMessageMapper" > - <resultMap id="BaseResultMap" type="com.accompany.business.model.newbie.NewbieMessage"> - </resultMap> - <select id="randomId" resultType="java.lang.Long"> - SELECT id FROM `newbie_message` - WHERE id >= (SELECT floor(RAND() * (SELECT MAX(id) FROM `newbie_message`))) - ORDER BY id LIMIT 1; - </select> -</mapper> \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/NewbiePoolMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/NewbiePoolMapper.xml deleted file mode 100644 index fba8a48a4..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/NewbiePoolMapper.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="com.accompany.business.mybatismapper.newbie.NewbiePoolMapper" > - <resultMap id="BaseResultMap" type="com.accompany.business.model.newbie.NewbiePool"> - </resultMap> - <select id="randomId" resultType="java.lang.Long"> - SELECT id FROM `newbie_pool` - WHERE id >= (SELECT floor(RAND() * (SELECT MAX(id) FROM `newbie_pool`))) - ORDER BY id LIMIT 1; - </select> - <select id="newbiePoolByUid" resultMap="BaseResultMap"> - SELECT * FROM `newbie_pool` - WHERE uid in - <foreach item="item" index="index" collection="uids" open="(" separator="," close=")"> - #{item} - </foreach> - ORDER BY experience desc,register_time; - </select> -</mapper> \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/OfficialBrowseRecordMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/OfficialBrowseRecordMapper.xml deleted file mode 100644 index 981d050a1..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/OfficialBrowseRecordMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="com.accompany.business.mybatismapper.official.OfficialBrowseRecordMapper"> - -</mapper> \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/OperationActMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/OperationActMapper.xml deleted file mode 100644 index 8766f1034..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/OperationActMapper.xml +++ /dev/null @@ -1,229 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="com.accompany.business.mybatismapper.OperationActMapper" > - <resultMap id="BaseResultMap" type="com.accompany.business.model.OperationAct" > - <id column="id" property="id" jdbcType="INTEGER" /> - <result column="act_title" property="actTitle" jdbcType="VARCHAR" /> - <result column="act_desc" property="actDesc" jdbcType="VARCHAR" /> - <result column="act_image" property="actImage" jdbcType="VARCHAR" /> - <result column="create_time" property="createTime" jdbcType="TIMESTAMP" /> - <result column="status" property="status" jdbcType="TINYINT" /> - </resultMap> - <sql id="Example_Where_Clause" > - <where > - <foreach collection="oredCriteria" item="criteria" separator="or" > - <if test="criteria.valid" > - <trim prefix="(" suffix=")" prefixOverrides="and" > - <foreach collection="criteria.criteria" item="criterion" > - <choose > - <when test="criterion.noValue" > - and ${criterion.condition} - </when> - <when test="criterion.singleValue" > - and ${criterion.condition} #{criterion.value} - </when> - <when test="criterion.betweenValue" > - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - </when> - <when test="criterion.listValue" > - and ${criterion.condition} - <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," > - #{listItem} - </foreach> - </when> - </choose> - </foreach> - </trim> - </if> - </foreach> - </where> - </sql> - <sql id="Update_By_Example_Where_Clause" > - <where > - <foreach collection="example.oredCriteria" item="criteria" separator="or" > - <if test="criteria.valid" > - <trim prefix="(" suffix=")" prefixOverrides="and" > - <foreach collection="criteria.criteria" item="criterion" > - <choose > - <when test="criterion.noValue" > - and ${criterion.condition} - </when> - <when test="criterion.singleValue" > - and ${criterion.condition} #{criterion.value} - </when> - <when test="criterion.betweenValue" > - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - </when> - <when test="criterion.listValue" > - and ${criterion.condition} - <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," > - #{listItem} - </foreach> - </when> - </choose> - </foreach> - </trim> - </if> - </foreach> - </where> - </sql> - <sql id="Base_Column_List" > - id, act_title, act_desc, act_image, create_time, status - </sql> - <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.accompany.business.model.OperationActExample" > - select - <if test="distinct" > - distinct - </if> - 'true' as QUERYID, - <include refid="Base_Column_List" /> - from operation_act - <if test="_parameter != null" > - <include refid="Example_Where_Clause" /> - </if> - <if test="orderByClause != null" > - order by ${orderByClause} - </if> - <if test="limit != null" > - <if test="offset != null" > - limit ${offset}, ${limit} - </if> - <if test="offset == null" > - limit ${limit} - </if> - </if> - </select> - <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" > - select - <include refid="Base_Column_List" /> - from operation_act - where id = #{id,jdbcType=INTEGER} - </select> - <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" > - delete from operation_act - where id = #{id,jdbcType=INTEGER} - </delete> - <delete id="deleteByExample" parameterType="com.accompany.business.model.OperationActExample" > - delete from operation_act - <if test="_parameter != null" > - <include refid="Example_Where_Clause" /> - </if> - </delete> - <insert id="insert" parameterType="com.accompany.business.model.OperationAct" keyColumn="id" keyProperty="id" useGeneratedKeys="true"> - insert into operation_act (act_title, act_desc, act_image, - create_time, status) - values (#{actTitle,jdbcType=VARCHAR}, #{actDesc,jdbcType=VARCHAR}, #{actImage,jdbcType=VARCHAR}, - #{createTime,jdbcType=TIMESTAMP}, #{status,jdbcType=TINYINT}) - </insert> - <insert id="insertSelective" parameterType="com.accompany.business.model.OperationAct" keyColumn="id" keyProperty="id" useGeneratedKeys="true"> - insert into operation_act - <trim prefix="(" suffix=")" suffixOverrides="," > - <if test="actTitle != null" > - act_title, - </if> - <if test="actDesc != null" > - act_desc, - </if> - <if test="actImage != null" > - act_image, - </if> - <if test="createTime != null" > - create_time, - </if> - <if test="status != null" > - status, - </if> - </trim> - <trim prefix="values (" suffix=")" suffixOverrides="," > - <if test="actTitle != null" > - #{actTitle,jdbcType=VARCHAR}, - </if> - <if test="actDesc != null" > - #{actDesc,jdbcType=VARCHAR}, - </if> - <if test="actImage != null" > - #{actImage,jdbcType=VARCHAR}, - </if> - <if test="createTime != null" > - #{createTime,jdbcType=TIMESTAMP}, - </if> - <if test="status != null" > - #{status,jdbcType=TINYINT}, - </if> - </trim> - </insert> - <select id="countByExample" parameterType="com.accompany.business.model.OperationActExample" resultType="java.lang.Integer" > - select count(*) from operation_act - <if test="_parameter != null" > - <include refid="Example_Where_Clause" /> - </if> - </select> - <update id="updateByExampleSelective" parameterType="map" > - update operation_act - <set > - <if test="record.id != null" > - id = #{record.id,jdbcType=INTEGER}, - </if> - <if test="record.actTitle != null" > - act_title = #{record.actTitle,jdbcType=VARCHAR}, - </if> - <if test="record.actDesc != null" > - act_desc = #{record.actDesc,jdbcType=VARCHAR}, - </if> - <if test="record.actImage != null" > - act_image = #{record.actImage,jdbcType=VARCHAR}, - </if> - <if test="record.createTime != null" > - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - </if> - <if test="record.status != null" > - status = #{record.status,jdbcType=TINYINT}, - </if> - </set> - <if test="_parameter != null" > - <include refid="Update_By_Example_Where_Clause" /> - </if> - </update> - <update id="updateByExample" parameterType="map" > - update operation_act - set id = #{record.id,jdbcType=INTEGER}, - act_title = #{record.actTitle,jdbcType=VARCHAR}, - act_desc = #{record.actDesc,jdbcType=VARCHAR}, - act_image = #{record.actImage,jdbcType=VARCHAR}, - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - status = #{record.status,jdbcType=TINYINT} - <if test="_parameter != null" > - <include refid="Update_By_Example_Where_Clause" /> - </if> - </update> - <update id="updateByPrimaryKeySelective" parameterType="com.accompany.business.model.OperationAct" > - update operation_act - <set > - <if test="actTitle != null" > - act_title = #{actTitle,jdbcType=VARCHAR}, - </if> - <if test="actDesc != null" > - act_desc = #{actDesc,jdbcType=VARCHAR}, - </if> - <if test="actImage != null" > - act_image = #{actImage,jdbcType=VARCHAR}, - </if> - <if test="createTime != null" > - create_time = #{createTime,jdbcType=TIMESTAMP}, - </if> - <if test="status != null" > - status = #{status,jdbcType=TINYINT}, - </if> - </set> - where id = #{id,jdbcType=INTEGER} - </update> - <update id="updateByPrimaryKey" parameterType="com.accompany.business.model.OperationAct" > - update operation_act - set act_title = #{actTitle,jdbcType=VARCHAR}, - act_desc = #{actDesc,jdbcType=VARCHAR}, - act_image = #{actImage,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - status = #{status,jdbcType=TINYINT} - where id = #{id,jdbcType=INTEGER} - </update> -</mapper> \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/OperationSmsRecordMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/OperationSmsRecordMapper.xml deleted file mode 100644 index 5a8aed706..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/OperationSmsRecordMapper.xml +++ /dev/null @@ -1,277 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="com.accompany.business.mybatismapper.OperationSmsRecordMapper" > - <resultMap id="BaseResultMap" type="com.accompany.business.model.OperationSmsRecord" > - <id column="record_id" property="recordId" jdbcType="BIGINT" /> - <result column="uid" property="uid" jdbcType="BIGINT" /> - <result column="phone" property="phone" jdbcType="VARCHAR" /> - <result column="template_id" property="templateId" jdbcType="INTEGER" /> - <result column="send_status" property="sendStatus" jdbcType="INTEGER" /> - <result column="create_time" property="createTime" jdbcType="TIMESTAMP" /> - <result column="send_time" property="sendTime" jdbcType="TIMESTAMP" /> - <result column="error_msg" property="errorMsg" jdbcType="VARCHAR" /> - <result column="operator" property="operator" jdbcType="INTEGER" /> - </resultMap> - <sql id="Example_Where_Clause" > - <where > - <foreach collection="oredCriteria" item="criteria" separator="or" > - <if test="criteria.valid" > - <trim prefix="(" suffix=")" prefixOverrides="and" > - <foreach collection="criteria.criteria" item="criterion" > - <choose > - <when test="criterion.noValue" > - and ${criterion.condition} - </when> - <when test="criterion.singleValue" > - and ${criterion.condition} #{criterion.value} - </when> - <when test="criterion.betweenValue" > - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - </when> - <when test="criterion.listValue" > - and ${criterion.condition} - <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," > - #{listItem} - </foreach> - </when> - </choose> - </foreach> - </trim> - </if> - </foreach> - </where> - </sql> - <sql id="Update_By_Example_Where_Clause" > - <where > - <foreach collection="example.oredCriteria" item="criteria" separator="or" > - <if test="criteria.valid" > - <trim prefix="(" suffix=")" prefixOverrides="and" > - <foreach collection="criteria.criteria" item="criterion" > - <choose > - <when test="criterion.noValue" > - and ${criterion.condition} - </when> - <when test="criterion.singleValue" > - and ${criterion.condition} #{criterion.value} - </when> - <when test="criterion.betweenValue" > - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - </when> - <when test="criterion.listValue" > - and ${criterion.condition} - <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," > - #{listItem} - </foreach> - </when> - </choose> - </foreach> - </trim> - </if> - </foreach> - </where> - </sql> - <sql id="Base_Column_List" > - record_id, uid, phone, template_id, send_status, create_time, send_time, error_msg, - operator - </sql> - <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.accompany.business.model.OperationSmsRecordExample" > - select - <if test="distinct" > - distinct - </if> - 'true' as QUERYID, - <include refid="Base_Column_List" /> - from operation_sms_record - <if test="_parameter != null" > - <include refid="Example_Where_Clause" /> - </if> - <if test="orderByClause != null" > - order by ${orderByClause} - </if> - <if test="limit != null" > - <if test="offset != null" > - limit ${offset}, ${limit} - </if> - <if test="offset == null" > - limit ${limit} - </if> - </if> - </select> - <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" > - select - <include refid="Base_Column_List" /> - from operation_sms_record - where record_id = #{recordId,jdbcType=BIGINT} - </select> - <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" > - delete from operation_sms_record - where record_id = #{recordId,jdbcType=BIGINT} - </delete> - <delete id="deleteByExample" parameterType="com.accompany.business.model.OperationSmsRecordExample" > - delete from operation_sms_record - <if test="_parameter != null" > - <include refid="Example_Where_Clause" /> - </if> - </delete> - <insert id="insert" parameterType="com.accompany.business.model.OperationSmsRecord" useGeneratedKeys="true" keyProperty="recordId" > - insert into operation_sms_record (uid, phone, template_id, - send_status, create_time, send_time, - error_msg, operator) - values (#{uid,jdbcType=BIGINT}, #{phone,jdbcType=VARCHAR}, #{templateId,jdbcType=INTEGER}, - #{sendStatus,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{sendTime,jdbcType=TIMESTAMP}, - #{errorMsg,jdbcType=VARCHAR}, #{operator,jdbcType=INTEGER}) - </insert> - <insert id="insertSelective" parameterType="com.accompany.business.model.OperationSmsRecord" useGeneratedKeys="true" keyProperty="recordId" > - insert into operation_sms_record - <trim prefix="(" suffix=")" suffixOverrides="," > - <if test="uid != null" > - uid, - </if> - <if test="phone != null" > - phone, - </if> - <if test="templateId != null" > - template_id, - </if> - <if test="sendStatus != null" > - send_status, - </if> - <if test="createTime != null" > - create_time, - </if> - <if test="sendTime != null" > - send_time, - </if> - <if test="errorMsg != null" > - error_msg, - </if> - <if test="operator != null" > - operator, - </if> - </trim> - <trim prefix="values (" suffix=")" suffixOverrides="," > - <if test="uid != null" > - #{uid,jdbcType=BIGINT}, - </if> - <if test="phone != null" > - #{phone,jdbcType=VARCHAR}, - </if> - <if test="templateId != null" > - #{templateId,jdbcType=INTEGER}, - </if> - <if test="sendStatus != null" > - #{sendStatus,jdbcType=INTEGER}, - </if> - <if test="createTime != null" > - #{createTime,jdbcType=TIMESTAMP}, - </if> - <if test="sendTime != null" > - #{sendTime,jdbcType=TIMESTAMP}, - </if> - <if test="errorMsg != null" > - #{errorMsg,jdbcType=VARCHAR}, - </if> - <if test="operator != null" > - #{operator,jdbcType=INTEGER}, - </if> - </trim> - </insert> - <select id="countByExample" parameterType="com.accompany.business.model.OperationSmsRecordExample" resultType="java.lang.Integer" > - select count(*) from operation_sms_record - <if test="_parameter != null" > - <include refid="Example_Where_Clause" /> - </if> - </select> - <update id="updateByExampleSelective" parameterType="map" > - update operation_sms_record - <set > - <if test="record.recordId != null" > - record_id = #{record.recordId,jdbcType=BIGINT}, - </if> - <if test="record.uid != null" > - uid = #{record.uid,jdbcType=BIGINT}, - </if> - <if test="record.phone != null" > - phone = #{record.phone,jdbcType=VARCHAR}, - </if> - <if test="record.templateId != null" > - template_id = #{record.templateId,jdbcType=INTEGER}, - </if> - <if test="record.sendStatus != null" > - send_status = #{record.sendStatus,jdbcType=INTEGER}, - </if> - <if test="record.createTime != null" > - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - </if> - <if test="record.sendTime != null" > - send_time = #{record.sendTime,jdbcType=TIMESTAMP}, - </if> - <if test="record.errorMsg != null" > - error_msg = #{record.errorMsg,jdbcType=VARCHAR}, - </if> - <if test="record.operator != null" > - operator = #{record.operator,jdbcType=INTEGER}, - </if> - </set> - <if test="_parameter != null" > - <include refid="Update_By_Example_Where_Clause" /> - </if> - </update> - <update id="updateByExample" parameterType="map" > - update operation_sms_record - set record_id = #{record.recordId,jdbcType=BIGINT}, - uid = #{record.uid,jdbcType=BIGINT}, - phone = #{record.phone,jdbcType=VARCHAR}, - template_id = #{record.templateId,jdbcType=INTEGER}, - send_status = #{record.sendStatus,jdbcType=INTEGER}, - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - send_time = #{record.sendTime,jdbcType=TIMESTAMP}, - error_msg = #{record.errorMsg,jdbcType=VARCHAR}, - operator = #{record.operator,jdbcType=INTEGER} - <if test="_parameter != null" > - <include refid="Update_By_Example_Where_Clause" /> - </if> - </update> - <update id="updateByPrimaryKeySelective" parameterType="com.accompany.business.model.OperationSmsRecord" > - update operation_sms_record - <set > - <if test="uid != null" > - uid = #{uid,jdbcType=BIGINT}, - </if> - <if test="phone != null" > - phone = #{phone,jdbcType=VARCHAR}, - </if> - <if test="templateId != null" > - template_id = #{templateId,jdbcType=INTEGER}, - </if> - <if test="sendStatus != null" > - send_status = #{sendStatus,jdbcType=INTEGER}, - </if> - <if test="createTime != null" > - create_time = #{createTime,jdbcType=TIMESTAMP}, - </if> - <if test="sendTime != null" > - send_time = #{sendTime,jdbcType=TIMESTAMP}, - </if> - <if test="errorMsg != null" > - error_msg = #{errorMsg,jdbcType=VARCHAR}, - </if> - <if test="operator != null" > - operator = #{operator,jdbcType=INTEGER}, - </if> - </set> - where record_id = #{recordId,jdbcType=BIGINT} - </update> - <update id="updateByPrimaryKey" parameterType="com.accompany.business.model.OperationSmsRecord" > - update operation_sms_record - set uid = #{uid,jdbcType=BIGINT}, - phone = #{phone,jdbcType=VARCHAR}, - template_id = #{templateId,jdbcType=INTEGER}, - send_status = #{sendStatus,jdbcType=INTEGER}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - send_time = #{sendTime,jdbcType=TIMESTAMP}, - error_msg = #{errorMsg,jdbcType=VARCHAR}, - operator = #{operator,jdbcType=INTEGER} - where record_id = #{recordId,jdbcType=BIGINT} - </update> -</mapper> \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/PkActRecordMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/PkActRecordMapper.xml deleted file mode 100644 index 703a78a7c..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/PkActRecordMapper.xml +++ /dev/null @@ -1,208 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="com.accompany.business.mybatismapper.PkActRecordMapper" > - <resultMap id="BaseResultMap" type="com.accompany.business.model.PkActRecord" > - <id column="record_id" property="recordId" jdbcType="INTEGER" /> - <result column="uid" property="uid" jdbcType="BIGINT" /> - <result column="target_unionid" property="targetUnionid" jdbcType="VARCHAR" /> - <result column="ip" property="ip" jdbcType="VARCHAR" /> - <result column="create_time" property="createTime" jdbcType="TIMESTAMP" /> - </resultMap> - <sql id="Example_Where_Clause" > - <where > - <foreach collection="oredCriteria" item="criteria" separator="or" > - <if test="criteria.valid" > - <trim prefix="(" suffix=")" prefixOverrides="and" > - <foreach collection="criteria.criteria" item="criterion" > - <choose > - <when test="criterion.noValue" > - and ${criterion.condition} - </when> - <when test="criterion.singleValue" > - and ${criterion.condition} #{criterion.value} - </when> - <when test="criterion.betweenValue" > - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - </when> - <when test="criterion.listValue" > - and ${criterion.condition} - <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," > - #{listItem} - </foreach> - </when> - </choose> - </foreach> - </trim> - </if> - </foreach> - </where> - </sql> - <sql id="Update_By_Example_Where_Clause" > - <where > - <foreach collection="example.oredCriteria" item="criteria" separator="or" > - <if test="criteria.valid" > - <trim prefix="(" suffix=")" prefixOverrides="and" > - <foreach collection="criteria.criteria" item="criterion" > - <choose > - <when test="criterion.noValue" > - and ${criterion.condition} - </when> - <when test="criterion.singleValue" > - and ${criterion.condition} #{criterion.value} - </when> - <when test="criterion.betweenValue" > - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - </when> - <when test="criterion.listValue" > - and ${criterion.condition} - <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," > - #{listItem} - </foreach> - </when> - </choose> - </foreach> - </trim> - </if> - </foreach> - </where> - </sql> - <sql id="Base_Column_List" > - record_id, uid, target_unionid, ip, create_time - </sql> - <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.accompany.business.model.PkActRecordExample" > - select - <if test="distinct" > - distinct - </if> - 'true' as QUERYID, - <include refid="Base_Column_List" /> - from pk_act_record - <if test="_parameter != null" > - <include refid="Example_Where_Clause" /> - </if> - <if test="orderByClause != null" > - order by ${orderByClause} - </if> - <if test="limit != null" > - <if test="offset != null" > - limit ${offset}, ${limit} - </if> - <if test="offset == null" > - limit ${limit} - </if> - </if> - </select> - <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" > - select - <include refid="Base_Column_List" /> - from pk_act_record - where record_id = #{recordId,jdbcType=INTEGER} - </select> - <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" > - delete from pk_act_record - where record_id = #{recordId,jdbcType=INTEGER} - </delete> - <insert id="insert" parameterType="com.accompany.business.model.PkActRecord" keyColumn="record_id" keyProperty="recordId" useGeneratedKeys="true"> - insert into pk_act_record (uid, target_unionid, ip, - create_time) - values (#{uid,jdbcType=BIGINT}, #{targetUnionid,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR}, - #{createTime,jdbcType=TIMESTAMP}) - </insert> - <insert id="insertSelective" parameterType="com.accompany.business.model.PkActRecord" keyColumn="record_id" keyProperty="recordId" useGeneratedKeys="true"> - insert into pk_act_record - <trim prefix="(" suffix=")" suffixOverrides="," > - <if test="uid != null" > - uid, - </if> - <if test="targetUnionid != null" > - target_unionid, - </if> - <if test="ip != null" > - ip, - </if> - <if test="createTime != null" > - create_time, - </if> - </trim> - <trim prefix="values (" suffix=")" suffixOverrides="," > - <if test="uid != null" > - #{uid,jdbcType=BIGINT}, - </if> - <if test="targetUnionid != null" > - #{targetUnionid,jdbcType=VARCHAR}, - </if> - <if test="ip != null" > - #{ip,jdbcType=VARCHAR}, - </if> - <if test="createTime != null" > - #{createTime,jdbcType=TIMESTAMP}, - </if> - </trim> - </insert> - <select id="countByExample" parameterType="com.accompany.business.model.PkActRecordExample" resultType="java.lang.Integer" > - select count(*) from pk_act_record - <if test="_parameter != null" > - <include refid="Example_Where_Clause" /> - </if> - </select> - <update id="updateByExampleSelective" parameterType="map" > - update pk_act_record - <set > - <if test="record.recordId != null" > - record_id = #{record.recordId,jdbcType=INTEGER}, - </if> - <if test="record.uid != null" > - uid = #{record.uid,jdbcType=BIGINT}, - </if> - <if test="record.targetUnionid != null" > - target_unionid = #{record.targetUnionid,jdbcType=VARCHAR}, - </if> - <if test="record.ip != null" > - ip = #{record.ip,jdbcType=VARCHAR}, - </if> - <if test="record.createTime != null" > - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - </if> - </set> - <if test="_parameter != null" > - <include refid="Update_By_Example_Where_Clause" /> - </if> - </update> - <update id="updateByExample" parameterType="map" > - update pk_act_record - set record_id = #{record.recordId,jdbcType=INTEGER}, - uid = #{record.uid,jdbcType=BIGINT}, - target_unionid = #{record.targetUnionid,jdbcType=VARCHAR}, - ip = #{record.ip,jdbcType=VARCHAR}, - create_time = #{record.createTime,jdbcType=TIMESTAMP} - <if test="_parameter != null" > - <include refid="Update_By_Example_Where_Clause" /> - </if> - </update> - <update id="updateByPrimaryKeySelective" parameterType="com.accompany.business.model.PkActRecord" > - update pk_act_record - <set > - <if test="uid != null" > - uid = #{uid,jdbcType=BIGINT}, - </if> - <if test="targetUnionid != null" > - target_unionid = #{targetUnionid,jdbcType=VARCHAR}, - </if> - <if test="ip != null" > - ip = #{ip,jdbcType=VARCHAR}, - </if> - <if test="createTime != null" > - create_time = #{createTime,jdbcType=TIMESTAMP}, - </if> - </set> - where record_id = #{recordId,jdbcType=INTEGER} - </update> - <update id="updateByPrimaryKey" parameterType="com.accompany.business.model.PkActRecord" > - update pk_act_record - set uid = #{uid,jdbcType=BIGINT}, - target_unionid = #{targetUnionid,jdbcType=VARCHAR}, - ip = #{ip,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP} - where record_id = #{recordId,jdbcType=INTEGER} - </update> -</mapper> \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/PkActRecordMapperMgr.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/PkActRecordMapperMgr.xml deleted file mode 100644 index d948c17aa..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/PkActRecordMapperMgr.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="com.accompany.business.mybatismapper.PkActRecordMapperMgr" > - <select id="selectTotalRank" resultType="java.util.HashMap"> - select uid, count(1) as times from pk_act_record - where create_time between #{beginTime} and #{endTime} - group by uid - </select> - - <select id="countUsersTimes" resultType="int"> - select count(1) as times from pk_act_record - where create_time between #{beginTime} and #{endTime} - and uid = #{uid} - </select> -</mapper> \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/RoomSearchLogMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/RoomSearchLogMapper.xml deleted file mode 100644 index ee97d1a71..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/RoomSearchLogMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="com.accompany.business.mybatismapper.RoomSearchLogMapper" > - -</mapper> \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/TitleMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/TitleMapper.xml deleted file mode 100644 index 814f7fb3f..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/TitleMapper.xml +++ /dev/null @@ -1,270 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="com.accompany.business.mybatismapper.TitleMapper" > - <resultMap id="BaseResultMap" type="com.accompany.business.model.Title" > - <id column="id" property="id" jdbcType="BIGINT" /> - <result column="name" property="name" jdbcType="VARCHAR" /> - <result column="seq_no" property="seqNo" jdbcType="INTEGER" /> - <result column="status" property="status" jdbcType="BIT" /> - <result column="type" property="type" jdbcType="TINYINT" /> - <result column="child_class" property="childClass" jdbcType="VARCHAR" /> - <result column="delete_flag" property="deleteFlag" jdbcType="BIT" /> - <result column="create_time" property="createTime" jdbcType="TIMESTAMP" /> - <result column="operate_time" property="operateTime" jdbcType="TIMESTAMP" /> - </resultMap> - <sql id="Example_Where_Clause" > - <where > - <foreach collection="oredCriteria" item="criteria" separator="or" > - <if test="criteria.valid" > - <trim prefix="(" suffix=")" prefixOverrides="and" > - <foreach collection="criteria.criteria" item="criterion" > - <choose > - <when test="criterion.noValue" > - and ${criterion.condition} - </when> - <when test="criterion.singleValue" > - and ${criterion.condition} #{criterion.value} - </when> - <when test="criterion.betweenValue" > - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - </when> - <when test="criterion.listValue" > - and ${criterion.condition} - <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," > - #{listItem} - </foreach> - </when> - </choose> - </foreach> - </trim> - </if> - </foreach> - </where> - </sql> - <sql id="Update_By_Example_Where_Clause" > - <where > - <foreach collection="example.oredCriteria" item="criteria" separator="or" > - <if test="criteria.valid" > - <trim prefix="(" suffix=")" prefixOverrides="and" > - <foreach collection="criteria.criteria" item="criterion" > - <choose > - <when test="criterion.noValue" > - and ${criterion.condition} - </when> - <when test="criterion.singleValue" > - and ${criterion.condition} #{criterion.value} - </when> - <when test="criterion.betweenValue" > - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - </when> - <when test="criterion.listValue" > - and ${criterion.condition} - <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," > - #{listItem} - </foreach> - </when> - </choose> - </foreach> - </trim> - </if> - </foreach> - </where> - </sql> - <sql id="Base_Column_List" > - id, name, seq_no, status, type, child_class, delete_flag, create_time, operate_time - </sql> - <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.accompany.business.model.TitleExample" > - select - <if test="distinct" > - distinct - </if> - 'true' as QUERYID, - <include refid="Base_Column_List" /> - from title - <if test="_parameter != null" > - <include refid="Example_Where_Clause" /> - </if> - <if test="orderByClause != null" > - order by ${orderByClause} - </if> - <if test="limit != null" > - <if test="offset != null" > - limit ${offset}, ${limit} - </if> - <if test="offset == null" > - limit ${limit} - </if> - </if> - </select> - <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" > - select - <include refid="Base_Column_List" /> - from title - where id = #{id,jdbcType=BIGINT} - </select> - <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" > - delete from title - where id = #{id,jdbcType=BIGINT} - </delete> - <insert id="insert" parameterType="com.accompany.business.model.Title" useGeneratedKeys="true" keyProperty="id" > - insert into title (name, seq_no, status, - type, child_class, delete_flag, - create_time, operate_time) - values (#{name,jdbcType=VARCHAR}, #{seqNo,jdbcType=INTEGER}, #{status,jdbcType=BIT}, - #{type,jdbcType=TINYINT}, #{childClass,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=BIT}, - #{createTime,jdbcType=TIMESTAMP}, #{operateTime,jdbcType=TIMESTAMP}) - </insert> - <insert id="insertSelective" parameterType="com.accompany.business.model.Title" useGeneratedKeys="true" keyProperty="id" > - insert into title - <trim prefix="(" suffix=")" suffixOverrides="," > - <if test="name != null" > - name, - </if> - <if test="seqNo != null" > - seq_no, - </if> - <if test="status != null" > - status, - </if> - <if test="type != null" > - type, - </if> - <if test="childClass != null" > - child_class, - </if> - <if test="deleteFlag != null" > - delete_flag, - </if> - <if test="createTime != null" > - create_time, - </if> - <if test="operateTime != null" > - operate_time, - </if> - </trim> - <trim prefix="values (" suffix=")" suffixOverrides="," > - <if test="name != null" > - #{name,jdbcType=VARCHAR}, - </if> - <if test="seqNo != null" > - #{seqNo,jdbcType=INTEGER}, - </if> - <if test="status != null" > - #{status,jdbcType=BIT}, - </if> - <if test="type != null" > - #{type,jdbcType=TINYINT}, - </if> - <if test="childClass != null" > - #{childClass,jdbcType=VARCHAR}, - </if> - <if test="deleteFlag != null" > - #{deleteFlag,jdbcType=BIT}, - </if> - <if test="createTime != null" > - #{createTime,jdbcType=TIMESTAMP}, - </if> - <if test="operateTime != null" > - #{operateTime,jdbcType=TIMESTAMP}, - </if> - </trim> - </insert> - <select id="countByExample" parameterType="com.accompany.business.model.TitleExample" resultType="java.lang.Integer" > - select count(*) from title - <if test="_parameter != null" > - <include refid="Example_Where_Clause" /> - </if> - </select> - <update id="updateByExampleSelective" parameterType="map" > - update title - <set > - <if test="record.id != null" > - id = #{record.id,jdbcType=BIGINT}, - </if> - <if test="record.name != null" > - name = #{record.name,jdbcType=VARCHAR}, - </if> - <if test="record.seqNo != null" > - seq_no = #{record.seqNo,jdbcType=INTEGER}, - </if> - <if test="record.status != null" > - status = #{record.status,jdbcType=BIT}, - </if> - <if test="record.type != null" > - type = #{record.type,jdbcType=TINYINT}, - </if> - <if test="record.childClass != null" > - child_class = #{record.childClass,jdbcType=VARCHAR}, - </if> - <if test="record.deleteFlag != null" > - delete_flag = #{record.deleteFlag,jdbcType=BIT}, - </if> - <if test="record.createTime != null" > - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - </if> - <if test="record.operateTime != null" > - operate_time = #{record.operateTime,jdbcType=TIMESTAMP}, - </if> - </set> - <if test="_parameter != null" > - <include refid="Update_By_Example_Where_Clause" /> - </if> - </update> - <update id="updateByExample" parameterType="map" > - update title - set id = #{record.id,jdbcType=BIGINT}, - name = #{record.name,jdbcType=VARCHAR}, - seq_no = #{record.seqNo,jdbcType=INTEGER}, - status = #{record.status,jdbcType=BIT}, - type = #{record.type,jdbcType=TINYINT}, - child_class = #{record.childClass,jdbcType=VARCHAR}, - delete_flag = #{record.deleteFlag,jdbcType=BIT}, - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - operate_time = #{record.operateTime,jdbcType=TIMESTAMP} - <if test="_parameter != null" > - <include refid="Update_By_Example_Where_Clause" /> - </if> - </update> - <update id="updateByPrimaryKeySelective" parameterType="com.accompany.business.model.Title" > - update title - <set > - <if test="name != null" > - name = #{name,jdbcType=VARCHAR}, - </if> - <if test="seqNo != null" > - seq_no = #{seqNo,jdbcType=INTEGER}, - </if> - <if test="status != null" > - status = #{status,jdbcType=BIT}, - </if> - <if test="type != null" > - type = #{type,jdbcType=TINYINT}, - </if> - <if test="childClass != null" > - child_class = #{childClass,jdbcType=VARCHAR}, - </if> - <if test="deleteFlag != null" > - delete_flag = #{deleteFlag,jdbcType=BIT}, - </if> - <if test="createTime != null" > - create_time = #{createTime,jdbcType=TIMESTAMP}, - </if> - <if test="operateTime != null" > - operate_time = #{operateTime,jdbcType=TIMESTAMP}, - </if> - </set> - where id = #{id,jdbcType=BIGINT} - </update> - <update id="updateByPrimaryKey" parameterType="com.accompany.business.model.Title" > - update title - set name = #{name,jdbcType=VARCHAR}, - seq_no = #{seqNo,jdbcType=INTEGER}, - status = #{status,jdbcType=BIT}, - type = #{type,jdbcType=TINYINT}, - child_class = #{childClass,jdbcType=VARCHAR}, - delete_flag = #{deleteFlag,jdbcType=BIT}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - operate_time = #{operateTime,jdbcType=TIMESTAMP} - where id = #{id,jdbcType=BIGINT} - </update> -</mapper> \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/TopicBoxItemMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/TopicBoxItemMapper.xml deleted file mode 100644 index 90f3ee2f6..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/TopicBoxItemMapper.xml +++ /dev/null @@ -1,253 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="com.accompany.business.mybatismapper.TopicBoxItemMapper" > - <resultMap id="BaseResultMap" type="com.accompany.business.model.TopicBoxItem" > - <id column="id" property="id" jdbcType="INTEGER" /> - <result column="content" property="content" jdbcType="VARCHAR" /> - <result column="seq_no" property="seqNo" jdbcType="INTEGER" /> - <result column="operator_id" property="operatorId" jdbcType="BIGINT" /> - <result column="operator" property="operator" jdbcType="VARCHAR" /> - <result column="status" property="status" jdbcType="TINYINT" /> - <result column="create_time" property="createTime" jdbcType="TIMESTAMP" /> - <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" /> - </resultMap> - <sql id="Example_Where_Clause" > - <where > - <foreach collection="oredCriteria" item="criteria" separator="or" > - <if test="criteria.valid" > - <trim prefix="(" suffix=")" prefixOverrides="and" > - <foreach collection="criteria.criteria" item="criterion" > - <choose > - <when test="criterion.noValue" > - and ${criterion.condition} - </when> - <when test="criterion.singleValue" > - and ${criterion.condition} #{criterion.value} - </when> - <when test="criterion.betweenValue" > - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - </when> - <when test="criterion.listValue" > - and ${criterion.condition} - <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," > - #{listItem} - </foreach> - </when> - </choose> - </foreach> - </trim> - </if> - </foreach> - </where> - </sql> - <sql id="Update_By_Example_Where_Clause" > - <where > - <foreach collection="example.oredCriteria" item="criteria" separator="or" > - <if test="criteria.valid" > - <trim prefix="(" suffix=")" prefixOverrides="and" > - <foreach collection="criteria.criteria" item="criterion" > - <choose > - <when test="criterion.noValue" > - and ${criterion.condition} - </when> - <when test="criterion.singleValue" > - and ${criterion.condition} #{criterion.value} - </when> - <when test="criterion.betweenValue" > - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - </when> - <when test="criterion.listValue" > - and ${criterion.condition} - <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," > - #{listItem} - </foreach> - </when> - </choose> - </foreach> - </trim> - </if> - </foreach> - </where> - </sql> - <sql id="Base_Column_List" > - id, content, seq_no, operator_id, operator, status, create_time, update_time - </sql> - <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.accompany.business.model.TopicBoxItemExample" > - select - <if test="distinct" > - distinct - </if> - 'true' as QUERYID, - <include refid="Base_Column_List" /> - from topic_box_item - <if test="_parameter != null" > - <include refid="Example_Where_Clause" /> - </if> - <if test="orderByClause != null" > - order by ${orderByClause} - </if> - </select> - <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" > - select - <include refid="Base_Column_List" /> - from topic_box_item - where id = #{id,jdbcType=INTEGER} - </select> - <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" > - delete from topic_box_item - where id = #{id,jdbcType=INTEGER} - </delete> - <insert id="insert" parameterType="com.accompany.business.model.TopicBoxItem" > - <selectKey resultType="java.lang.Integer" keyProperty="id" order="AFTER" > - SELECT LAST_INSERT_ID() - </selectKey> - insert into topic_box_item (content, seq_no, operator_id, - operator, status, create_time, - update_time) - values (#{content,jdbcType=VARCHAR}, #{seqNo,jdbcType=INTEGER}, #{operatorId,jdbcType=BIGINT}, - #{operator,jdbcType=VARCHAR}, #{status,jdbcType=TINYINT}, #{createTime,jdbcType=TIMESTAMP}, - #{updateTime,jdbcType=TIMESTAMP}) - </insert> - <insert id="insertSelective" parameterType="com.accompany.business.model.TopicBoxItem" > - <selectKey resultType="java.lang.Integer" keyProperty="id" order="AFTER" > - SELECT LAST_INSERT_ID() - </selectKey> - insert into topic_box_item - <trim prefix="(" suffix=")" suffixOverrides="," > - <if test="content != null" > - content, - </if> - <if test="seqNo != null" > - seq_no, - </if> - <if test="operatorId != null" > - operator_id, - </if> - <if test="operator != null" > - operator, - </if> - <if test="status != null" > - status, - </if> - <if test="createTime != null" > - create_time, - </if> - <if test="updateTime != null" > - update_time, - </if> - </trim> - <trim prefix="values (" suffix=")" suffixOverrides="," > - <if test="content != null" > - #{content,jdbcType=VARCHAR}, - </if> - <if test="seqNo != null" > - #{seqNo,jdbcType=INTEGER}, - </if> - <if test="operatorId != null" > - #{operatorId,jdbcType=BIGINT}, - </if> - <if test="operator != null" > - #{operator,jdbcType=VARCHAR}, - </if> - <if test="status != null" > - #{status,jdbcType=TINYINT}, - </if> - <if test="createTime != null" > - #{createTime,jdbcType=TIMESTAMP}, - </if> - <if test="updateTime != null" > - #{updateTime,jdbcType=TIMESTAMP}, - </if> - </trim> - </insert> - <select id="countByExample" parameterType="com.accompany.business.model.TopicBoxItemExample" resultType="java.lang.Integer" > - select count(*) from topic_box_item - <if test="_parameter != null" > - <include refid="Example_Where_Clause" /> - </if> - </select> - <update id="updateByExampleSelective" parameterType="map" > - update topic_box_item - <set > - <if test="record.id != null" > - id = #{record.id,jdbcType=INTEGER}, - </if> - <if test="record.content != null" > - content = #{record.content,jdbcType=VARCHAR}, - </if> - <if test="record.seqNo != null" > - seq_no = #{record.seqNo,jdbcType=INTEGER}, - </if> - <if test="record.operatorId != null" > - operator_id = #{record.operatorId,jdbcType=BIGINT}, - </if> - <if test="record.operator != null" > - operator = #{record.operator,jdbcType=VARCHAR}, - </if> - <if test="record.status != null" > - status = #{record.status,jdbcType=TINYINT}, - </if> - <if test="record.createTime != null" > - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - </if> - <if test="record.updateTime != null" > - update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - </if> - </set> - <if test="_parameter != null" > - <include refid="Update_By_Example_Where_Clause" /> - </if> - </update> - <update id="updateByExample" parameterType="map" > - update topic_box_item - set id = #{record.id,jdbcType=INTEGER}, - content = #{record.content,jdbcType=VARCHAR}, - seq_no = #{record.seqNo,jdbcType=INTEGER}, - operator_id = #{record.operatorId,jdbcType=BIGINT}, - operator = #{record.operator,jdbcType=VARCHAR}, - status = #{record.status,jdbcType=TINYINT}, - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - update_time = #{record.updateTime,jdbcType=TIMESTAMP} - <if test="_parameter != null" > - <include refid="Update_By_Example_Where_Clause" /> - </if> - </update> - <update id="updateByPrimaryKeySelective" parameterType="com.accompany.business.model.TopicBoxItem" > - update topic_box_item - <set > - <if test="content != null" > - content = #{content,jdbcType=VARCHAR}, - </if> - <if test="seqNo != null" > - seq_no = #{seqNo,jdbcType=INTEGER}, - </if> - <if test="operatorId != null" > - operator_id = #{operatorId,jdbcType=BIGINT}, - </if> - <if test="operator != null" > - operator = #{operator,jdbcType=VARCHAR}, - </if> - <if test="status != null" > - status = #{status,jdbcType=TINYINT}, - </if> - <if test="createTime != null" > - create_time = #{createTime,jdbcType=TIMESTAMP}, - </if> - <if test="updateTime != null" > - update_time = #{updateTime,jdbcType=TIMESTAMP}, - </if> - </set> - where id = #{id,jdbcType=INTEGER} - </update> - <update id="updateByPrimaryKey" parameterType="com.accompany.business.model.TopicBoxItem" > - update topic_box_item - set content = #{content,jdbcType=VARCHAR}, - seq_no = #{seqNo,jdbcType=INTEGER}, - operator_id = #{operatorId,jdbcType=BIGINT}, - operator = #{operator,jdbcType=VARCHAR}, - status = #{status,jdbcType=TINYINT}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP} - where id = #{id,jdbcType=INTEGER} - </update> -</mapper> \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/TopicBoxMsgMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/TopicBoxMsgMapper.xml deleted file mode 100644 index 797d5f98d..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/TopicBoxMsgMapper.xml +++ /dev/null @@ -1,214 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.accompany.business.mybatismapper.TopicBoxMsgMapper"> - <resultMap id="BaseResultMap" type="com.accompany.business.model.TopicBoxMsg"> - <id column="id" jdbcType="BIGINT" property="id" /> - <result column="from_uid" jdbcType="BIGINT" property="fromUid" /> - <result column="to_uid" jdbcType="BIGINT" property="toUid" /> - <result column="type" jdbcType="TINYINT" property="type" /> - <result column="create_time" jdbcType="TIMESTAMP" property="createTime" /> - </resultMap> - <sql id="Example_Where_Clause"> - <where> - <foreach collection="oredCriteria" item="criteria" separator="or"> - <if test="criteria.valid"> - <trim prefix="(" prefixOverrides="and" suffix=")"> - <foreach collection="criteria.criteria" item="criterion"> - <choose> - <when test="criterion.noValue"> - and ${criterion.condition} - </when> - <when test="criterion.singleValue"> - and ${criterion.condition} #{criterion.value} - </when> - <when test="criterion.betweenValue"> - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - </when> - <when test="criterion.listValue"> - and ${criterion.condition} - <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=","> - #{listItem} - </foreach> - </when> - </choose> - </foreach> - </trim> - </if> - </foreach> - </where> - </sql> - <sql id="Update_By_Example_Where_Clause"> - <where> - <foreach collection="example.oredCriteria" item="criteria" separator="or"> - <if test="criteria.valid"> - <trim prefix="(" prefixOverrides="and" suffix=")"> - <foreach collection="criteria.criteria" item="criterion"> - <choose> - <when test="criterion.noValue"> - and ${criterion.condition} - </when> - <when test="criterion.singleValue"> - and ${criterion.condition} #{criterion.value} - </when> - <when test="criterion.betweenValue"> - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - </when> - <when test="criterion.listValue"> - and ${criterion.condition} - <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=","> - #{listItem} - </foreach> - </when> - </choose> - </foreach> - </trim> - </if> - </foreach> - </where> - </sql> - <sql id="Base_Column_List"> - id, from_uid, to_uid, `type`, create_time - </sql> - <select id="selectByExample" parameterType="com.accompany.business.model.TopicBoxMsgExample" resultMap="BaseResultMap"> - select - <if test="distinct"> - distinct - </if> - <include refid="Base_Column_List" /> - from topic_box_msg - <if test="_parameter != null"> - <include refid="Example_Where_Clause" /> - </if> - <if test="orderByClause != null"> - order by ${orderByClause} - </if> - <if test="limit != null"> - <if test="offset != null"> - limit ${offset}, ${limit} - </if> - <if test="offset == null"> - limit ${limit} - </if> - </if> - </select> - <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> - select - <include refid="Base_Column_List" /> - from topic_box_msg - where id = #{id,jdbcType=BIGINT} - </select> - <delete id="deleteByPrimaryKey" parameterType="java.lang.Long"> - delete from topic_box_msg - where id = #{id,jdbcType=BIGINT} - </delete> - <insert id="insert" parameterType="com.accompany.business.model.TopicBoxMsg"> - <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long"> - SELECT LAST_INSERT_ID() - </selectKey> - insert into topic_box_msg (from_uid, to_uid, `type`, - create_time) - values (#{fromUid,jdbcType=BIGINT}, #{toUid,jdbcType=BIGINT}, #{type,jdbcType=TINYINT}, - #{createTime,jdbcType=TIMESTAMP}) - </insert> - <insert id="insertSelective" parameterType="com.accompany.business.model.TopicBoxMsg"> - <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long"> - SELECT LAST_INSERT_ID() - </selectKey> - insert into topic_box_msg - <trim prefix="(" suffix=")" suffixOverrides=","> - <if test="fromUid != null"> - from_uid, - </if> - <if test="toUid != null"> - to_uid, - </if> - <if test="type != null"> - `type`, - </if> - <if test="createTime != null"> - create_time, - </if> - </trim> - <trim prefix="values (" suffix=")" suffixOverrides=","> - <if test="fromUid != null"> - #{fromUid,jdbcType=BIGINT}, - </if> - <if test="toUid != null"> - #{toUid,jdbcType=BIGINT}, - </if> - <if test="type != null"> - #{type,jdbcType=TINYINT}, - </if> - <if test="createTime != null"> - #{createTime,jdbcType=TIMESTAMP}, - </if> - </trim> - </insert> - <select id="countByExample" parameterType="com.accompany.business.model.TopicBoxMsgExample" resultType="java.lang.Integer"> - select count(*) from topic_box_msg - <if test="_parameter != null"> - <include refid="Example_Where_Clause" /> - </if> - </select> - <update id="updateByExampleSelective" parameterType="map"> - update topic_box_msg - <set> - <if test="record.id != null"> - id = #{record.id,jdbcType=BIGINT}, - </if> - <if test="record.fromUid != null"> - from_uid = #{record.fromUid,jdbcType=BIGINT}, - </if> - <if test="record.toUid != null"> - to_uid = #{record.toUid,jdbcType=BIGINT}, - </if> - <if test="record.type != null"> - `type` = #{record.type,jdbcType=TINYINT}, - </if> - <if test="record.createTime != null"> - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - </if> - </set> - <if test="_parameter != null"> - <include refid="Update_By_Example_Where_Clause" /> - </if> - </update> - <update id="updateByExample" parameterType="map"> - update topic_box_msg - set id = #{record.id,jdbcType=BIGINT}, - from_uid = #{record.fromUid,jdbcType=BIGINT}, - to_uid = #{record.toUid,jdbcType=BIGINT}, - `type` = #{record.type,jdbcType=TINYINT}, - create_time = #{record.createTime,jdbcType=TIMESTAMP} - <if test="_parameter != null"> - <include refid="Update_By_Example_Where_Clause" /> - </if> - </update> - <update id="updateByPrimaryKeySelective" parameterType="com.accompany.business.model.TopicBoxMsg"> - update topic_box_msg - <set> - <if test="fromUid != null"> - from_uid = #{fromUid,jdbcType=BIGINT}, - </if> - <if test="toUid != null"> - to_uid = #{toUid,jdbcType=BIGINT}, - </if> - <if test="type != null"> - `type` = #{type,jdbcType=TINYINT}, - </if> - <if test="createTime != null"> - create_time = #{createTime,jdbcType=TIMESTAMP}, - </if> - </set> - where id = #{id,jdbcType=BIGINT} - </update> - <update id="updateByPrimaryKey" parameterType="com.accompany.business.model.TopicBoxMsg"> - update topic_box_msg - set from_uid = #{fromUid,jdbcType=BIGINT}, - to_uid = #{toUid,jdbcType=BIGINT}, - `type` = #{type,jdbcType=TINYINT}, - create_time = #{createTime,jdbcType=TIMESTAMP} - where id = #{id,jdbcType=BIGINT} - </update> - -</mapper> \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserCertifyRecordMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserCertifyRecordMapper.xml deleted file mode 100644 index d229a970e..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserCertifyRecordMapper.xml +++ /dev/null @@ -1,397 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="com.accompany.business.mybatismapper.UserCertifyRecordMapper" > - <resultMap id="BaseResultMap" type="com.accompany.business.model.UserCertifyRecord" > - <id column="record_id" property="recordId" jdbcType="BIGINT" /> - <result column="uid" property="uid" jdbcType="BIGINT" /> - <result column="name" property="name" jdbcType="VARCHAR" /> - <result column="id_card_num" property="idCardNum" jdbcType="VARCHAR" /> - <result column="phone" property="phone" jdbcType="VARCHAR" /> - <result column="verify_code" property="verifyCode" jdbcType="VARCHAR" /> - <result column="device_id" property="deviceId" jdbcType="VARCHAR" /> - <result column="ip" property="ip" jdbcType="VARCHAR" /> - <result column="app" property="app" jdbcType="VARCHAR" /> - <result column="channel" property="channel" jdbcType="VARCHAR" /> - <result column="model" property="model" jdbcType="VARCHAR" /> - <result column="bind_status" property="bindStatus" jdbcType="TINYINT" /> - <result column="certify_type" property="certifyType" jdbcType="VARCHAR" /> - <result column="ticket" property="ticket" jdbcType="VARCHAR" /> - <result column="token" property="token" jdbcType="VARCHAR" /> - <result column="createTime" property="createtime" jdbcType="TIMESTAMP" /> - <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" /> - </resultMap> - <sql id="Example_Where_Clause" > - <where > - <foreach collection="oredCriteria" item="criteria" separator="or" > - <if test="criteria.valid" > - <trim prefix="(" suffix=")" prefixOverrides="and" > - <foreach collection="criteria.criteria" item="criterion" > - <choose > - <when test="criterion.noValue" > - and ${criterion.condition} - </when> - <when test="criterion.singleValue" > - and ${criterion.condition} #{criterion.value} - </when> - <when test="criterion.betweenValue" > - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - </when> - <when test="criterion.listValue" > - and ${criterion.condition} - <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," > - #{listItem} - </foreach> - </when> - </choose> - </foreach> - </trim> - </if> - </foreach> - </where> - </sql> - <sql id="Update_By_Example_Where_Clause" > - <where > - <foreach collection="example.oredCriteria" item="criteria" separator="or" > - <if test="criteria.valid" > - <trim prefix="(" suffix=")" prefixOverrides="and" > - <foreach collection="criteria.criteria" item="criterion" > - <choose > - <when test="criterion.noValue" > - and ${criterion.condition} - </when> - <when test="criterion.singleValue" > - and ${criterion.condition} #{criterion.value} - </when> - <when test="criterion.betweenValue" > - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - </when> - <when test="criterion.listValue" > - and ${criterion.condition} - <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," > - #{listItem} - </foreach> - </when> - </choose> - </foreach> - </trim> - </if> - </foreach> - </where> - </sql> - <sql id="Base_Column_List" > - record_id, uid, name, id_card_num, phone, verify_code, device_id, ip, app, channel, - model, bind_status, certify_type, ticket, token, createTime, update_time - </sql> - <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.accompany.business.model.UserCertifyRecordExample" > - select - <if test="distinct" > - distinct - </if> - 'true' as QUERYID, - <include refid="Base_Column_List" /> - from user_certify_record - <if test="_parameter != null" > - <include refid="Example_Where_Clause" /> - </if> - <if test="orderByClause != null" > - order by ${orderByClause} - </if> - <if test="limit != null" > - <if test="offset != null" > - limit ${offset}, ${limit} - </if> - <if test="offset == null" > - limit ${limit} - </if> - </if> - </select> - <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" > - select - <include refid="Base_Column_List" /> - from user_certify_record - where record_id = #{recordId,jdbcType=BIGINT} - </select> - <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" > - delete from user_certify_record - where record_id = #{recordId,jdbcType=BIGINT} - </delete> - <insert id="insert" parameterType="com.accompany.business.model.UserCertifyRecord" keyColumn="record_id" keyProperty="recordId" useGeneratedKeys="true"> - insert into user_certify_record (uid, name, id_card_num, - phone, verify_code, device_id, - ip, app, channel, model, - bind_status, certify_type, ticket, - token, createTime, update_time - ) - values (#{uid,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{idCardNum,jdbcType=VARCHAR}, - #{phone,jdbcType=VARCHAR}, #{verifyCode,jdbcType=VARCHAR}, #{deviceId,jdbcType=VARCHAR}, - #{ip,jdbcType=VARCHAR}, #{app,jdbcType=VARCHAR}, #{channel,jdbcType=VARCHAR}, #{model,jdbcType=VARCHAR}, - #{bindStatus,jdbcType=TINYINT}, #{certifyType,jdbcType=VARCHAR}, #{ticket,jdbcType=VARCHAR}, - #{token,jdbcType=VARCHAR}, #{createtime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP} - ) - </insert> - <insert id="insertSelective" parameterType="com.accompany.business.model.UserCertifyRecord" keyColumn="record_id" keyProperty="recordId" useGeneratedKeys="true"> - insert into user_certify_record - <trim prefix="(" suffix=")" suffixOverrides="," > - <if test="uid != null" > - uid, - </if> - <if test="name != null" > - name, - </if> - <if test="idCardNum != null" > - id_card_num, - </if> - <if test="phone != null" > - phone, - </if> - <if test="verifyCode != null" > - verify_code, - </if> - <if test="deviceId != null" > - device_id, - </if> - <if test="ip != null" > - ip, - </if> - <if test="app != null" > - app, - </if> - <if test="channel != null" > - channel, - </if> - <if test="model != null" > - model, - </if> - <if test="bindStatus != null" > - bind_status, - </if> - <if test="certifyType != null" > - certify_type, - </if> - <if test="ticket != null" > - ticket, - </if> - <if test="token != null" > - token, - </if> - <if test="createtime != null" > - createTime, - </if> - <if test="updateTime != null" > - update_time, - </if> - </trim> - <trim prefix="values (" suffix=")" suffixOverrides="," > - <if test="uid != null" > - #{uid,jdbcType=BIGINT}, - </if> - <if test="name != null" > - #{name,jdbcType=VARCHAR}, - </if> - <if test="idCardNum != null" > - #{idCardNum,jdbcType=VARCHAR}, - </if> - <if test="phone != null" > - #{phone,jdbcType=VARCHAR}, - </if> - <if test="verifyCode != null" > - #{verifyCode,jdbcType=VARCHAR}, - </if> - <if test="deviceId != null" > - #{deviceId,jdbcType=VARCHAR}, - </if> - <if test="ip != null" > - #{ip,jdbcType=VARCHAR}, - </if> - <if test="app != null" > - #{app,jdbcType=VARCHAR}, - </if> - <if test="channel != null" > - #{channel,jdbcType=VARCHAR}, - </if> - <if test="model != null" > - #{model,jdbcType=VARCHAR}, - </if> - <if test="bindStatus != null" > - #{bindStatus,jdbcType=TINYINT}, - </if> - <if test="certifyType != null" > - #{certifyType,jdbcType=VARCHAR}, - </if> - <if test="ticket != null" > - #{ticket,jdbcType=VARCHAR}, - </if> - <if test="token != null" > - #{token,jdbcType=VARCHAR}, - </if> - <if test="createtime != null" > - #{createtime,jdbcType=TIMESTAMP}, - </if> - <if test="updateTime != null" > - #{updateTime,jdbcType=TIMESTAMP}, - </if> - </trim> - </insert> - <select id="countByExample" parameterType="com.accompany.business.model.UserCertifyRecordExample" resultType="java.lang.Integer" > - select count(*) from user_certify_record - <if test="_parameter != null" > - <include refid="Example_Where_Clause" /> - </if> - </select> - <update id="updateByExampleSelective" parameterType="map" > - update user_certify_record - <set > - <if test="record.recordId != null" > - record_id = #{record.recordId,jdbcType=BIGINT}, - </if> - <if test="record.uid != null" > - uid = #{record.uid,jdbcType=BIGINT}, - </if> - <if test="record.name != null" > - name = #{record.name,jdbcType=VARCHAR}, - </if> - <if test="record.idCardNum != null" > - id_card_num = #{record.idCardNum,jdbcType=VARCHAR}, - </if> - <if test="record.phone != null" > - phone = #{record.phone,jdbcType=VARCHAR}, - </if> - <if test="record.verifyCode != null" > - verify_code = #{record.verifyCode,jdbcType=VARCHAR}, - </if> - <if test="record.deviceId != null" > - device_id = #{record.deviceId,jdbcType=VARCHAR}, - </if> - <if test="record.ip != null" > - ip = #{record.ip,jdbcType=VARCHAR}, - </if> - <if test="record.app != null" > - app = #{record.app,jdbcType=VARCHAR}, - </if> - <if test="record.channel != null" > - channel = #{record.channel,jdbcType=VARCHAR}, - </if> - <if test="record.model != null" > - model = #{record.model,jdbcType=VARCHAR}, - </if> - <if test="record.bindStatus != null" > - bind_status = #{record.bindStatus,jdbcType=TINYINT}, - </if> - <if test="record.certifyType != null" > - certify_type = #{record.certifyType,jdbcType=VARCHAR}, - </if> - <if test="record.ticket != null" > - ticket = #{record.ticket,jdbcType=VARCHAR}, - </if> - <if test="record.token != null" > - token = #{record.token,jdbcType=VARCHAR}, - </if> - <if test="record.createtime != null" > - createTime = #{record.createtime,jdbcType=TIMESTAMP}, - </if> - <if test="record.updateTime != null" > - update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - </if> - </set> - <if test="_parameter != null" > - <include refid="Update_By_Example_Where_Clause" /> - </if> - </update> - <update id="updateByExample" parameterType="map" > - update user_certify_record - set record_id = #{record.recordId,jdbcType=BIGINT}, - uid = #{record.uid,jdbcType=BIGINT}, - name = #{record.name,jdbcType=VARCHAR}, - id_card_num = #{record.idCardNum,jdbcType=VARCHAR}, - phone = #{record.phone,jdbcType=VARCHAR}, - verify_code = #{record.verifyCode,jdbcType=VARCHAR}, - device_id = #{record.deviceId,jdbcType=VARCHAR}, - ip = #{record.ip,jdbcType=VARCHAR}, - app = #{record.app,jdbcType=VARCHAR}, - channel = #{record.channel,jdbcType=VARCHAR}, - model = #{record.model,jdbcType=VARCHAR}, - bind_status = #{record.bindStatus,jdbcType=TINYINT}, - certify_type = #{record.certifyType,jdbcType=VARCHAR}, - ticket = #{record.ticket,jdbcType=VARCHAR}, - token = #{record.token,jdbcType=VARCHAR}, - createTime = #{record.createtime,jdbcType=TIMESTAMP}, - update_time = #{record.updateTime,jdbcType=TIMESTAMP} - <if test="_parameter != null" > - <include refid="Update_By_Example_Where_Clause" /> - </if> - </update> - <update id="updateByPrimaryKeySelective" parameterType="com.accompany.business.model.UserCertifyRecord" > - update user_certify_record - <set > - <if test="uid != null" > - uid = #{uid,jdbcType=BIGINT}, - </if> - <if test="name != null" > - name = #{name,jdbcType=VARCHAR}, - </if> - <if test="idCardNum != null" > - id_card_num = #{idCardNum,jdbcType=VARCHAR}, - </if> - <if test="phone != null" > - phone = #{phone,jdbcType=VARCHAR}, - </if> - <if test="verifyCode != null" > - verify_code = #{verifyCode,jdbcType=VARCHAR}, - </if> - <if test="deviceId != null" > - device_id = #{deviceId,jdbcType=VARCHAR}, - </if> - <if test="ip != null" > - ip = #{ip,jdbcType=VARCHAR}, - </if> - <if test="app != null" > - app = #{app,jdbcType=VARCHAR}, - </if> - <if test="channel != null" > - channel = #{channel,jdbcType=VARCHAR}, - </if> - <if test="model != null" > - model = #{model,jdbcType=VARCHAR}, - </if> - <if test="bindStatus != null" > - bind_status = #{bindStatus,jdbcType=TINYINT}, - </if> - <if test="certifyType != null" > - certify_type = #{certifyType,jdbcType=VARCHAR}, - </if> - <if test="ticket != null" > - ticket = #{ticket,jdbcType=VARCHAR}, - </if> - <if test="token != null" > - token = #{token,jdbcType=VARCHAR}, - </if> - <if test="createtime != null" > - createTime = #{createtime,jdbcType=TIMESTAMP}, - </if> - <if test="updateTime != null" > - update_time = #{updateTime,jdbcType=TIMESTAMP}, - </if> - </set> - where record_id = #{recordId,jdbcType=BIGINT} - </update> - <update id="updateByPrimaryKey" parameterType="com.accompany.business.model.UserCertifyRecord" > - update user_certify_record - set uid = #{uid,jdbcType=BIGINT}, - name = #{name,jdbcType=VARCHAR}, - id_card_num = #{idCardNum,jdbcType=VARCHAR}, - phone = #{phone,jdbcType=VARCHAR}, - verify_code = #{verifyCode,jdbcType=VARCHAR}, - device_id = #{deviceId,jdbcType=VARCHAR}, - ip = #{ip,jdbcType=VARCHAR}, - app = #{app,jdbcType=VARCHAR}, - channel = #{channel,jdbcType=VARCHAR}, - model = #{model,jdbcType=VARCHAR}, - bind_status = #{bindStatus,jdbcType=TINYINT}, - certify_type = #{certifyType,jdbcType=VARCHAR}, - ticket = #{ticket,jdbcType=VARCHAR}, - token = #{token,jdbcType=VARCHAR}, - createTime = #{createtime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP} - where record_id = #{recordId,jdbcType=BIGINT} - </update> -</mapper> \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserCertifyRecordMapperExpand.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserCertifyRecordMapperExpand.xml deleted file mode 100644 index 62750abd5..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserCertifyRecordMapperExpand.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="com.accompany.business.mybatismapper.UserCertifyRecordMapperExpand"> - <select id="getLatestRecord" resultType="com.accompany.business.model.UserCertifyRecord"> - select * from user_certify_record where uid = #{uid} order by record_id desc limit 1 - </select> -</mapper> \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserGamePartnerInfoMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserGamePartnerInfoMapper.xml deleted file mode 100644 index c2e88ef44..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserGamePartnerInfoMapper.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="com.accompany.business.mybatismapper.gamepartner.UserGamePartnerInfoMapper"> - - <update id="updateFinishNum"> - update user_game_partner_info set finish_num = finish_num + 1 where uid = #{uid} and game_id = #{gameId}; - </update> - -</mapper> \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserGamePartnerMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserGamePartnerMapper.xml deleted file mode 100644 index ab702fc01..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserGamePartnerMapper.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="com.accompany.business.mybatismapper.gamepartner.UserGamePartnerMapper"> - - <select id="selectPageByPartitionId" - resultType="com.accompany.business.model.gamepartner.UserGamePartner"> - select i.* from user_game_partner_info i - inner join users u on i.uid = u.uid - inner join user_game_partner p on i.uid = p.uid - where u.partition_id = #{partitionId} and p.status = 1 - </select> - -</mapper> \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/WebConfigMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/WebConfigMapper.xml deleted file mode 100644 index 6d3715cf6..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/WebConfigMapper.xml +++ /dev/null @@ -1,178 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="com.accompany.business.mybatismapper.WebConfigMapper" > - <resultMap id="BaseResultMap" type="com.accompany.business.model.WebConfig" > - <result column="akey" property="akey" jdbcType="VARCHAR" /> - <result column="aval" property="aval" jdbcType="VARCHAR" /> - <result column="description" property="description" jdbcType="VARCHAR" /> - <result column="type" property="type" jdbcType="TINYINT" /> - <result column="status" property="status" jdbcType="TINYINT" /> - </resultMap> - <sql id="Example_Where_Clause" > - <where > - <foreach collection="oredCriteria" item="criteria" separator="or" > - <if test="criteria.valid" > - <trim prefix="(" suffix=")" prefixOverrides="and" > - <foreach collection="criteria.criteria" item="criterion" > - <choose > - <when test="criterion.noValue" > - and ${criterion.condition} - </when> - <when test="criterion.singleValue" > - and ${criterion.condition} #{criterion.value} - </when> - <when test="criterion.betweenValue" > - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - </when> - <when test="criterion.listValue" > - and ${criterion.condition} - <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," > - #{listItem} - </foreach> - </when> - </choose> - </foreach> - </trim> - </if> - </foreach> - </where> - </sql> - <sql id="Update_By_Example_Where_Clause" > - <where > - <foreach collection="example.oredCriteria" item="criteria" separator="or" > - <if test="criteria.valid" > - <trim prefix="(" suffix=")" prefixOverrides="and" > - <foreach collection="criteria.criteria" item="criterion" > - <choose > - <when test="criterion.noValue" > - and ${criterion.condition} - </when> - <when test="criterion.singleValue" > - and ${criterion.condition} #{criterion.value} - </when> - <when test="criterion.betweenValue" > - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - </when> - <when test="criterion.listValue" > - and ${criterion.condition} - <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," > - #{listItem} - </foreach> - </when> - </choose> - </foreach> - </trim> - </if> - </foreach> - </where> - </sql> - <sql id="Base_Column_List" > - akey, aval, description, type, status - </sql> - <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.accompany.business.model.WebConfigExample" > - select - <if test="distinct" > - distinct - </if> - 'true' as QUERYID, - <include refid="Base_Column_List" /> - from web_config - <if test="_parameter != null" > - <include refid="Example_Where_Clause" /> - </if> - <if test="orderByClause != null" > - order by ${orderByClause} - </if> - <if test="limit != null" > - <if test="offset != null" > - limit ${offset}, ${limit} - </if> - <if test="offset == null" > - limit ${limit} - </if> - </if> - </select> - <insert id="insert" parameterType="com.accompany.business.model.WebConfig" > - insert into web_config (akey, aval, description, - type, status) - values (#{akey,jdbcType=VARCHAR}, #{aval,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, - #{type,jdbcType=TINYINT}, #{status,jdbcType=TINYINT}) - </insert> - <insert id="insertSelective" parameterType="com.accompany.business.model.WebConfig" > - insert into web_config - <trim prefix="(" suffix=")" suffixOverrides="," > - <if test="akey != null" > - akey, - </if> - <if test="aval != null" > - aval, - </if> - <if test="description != null" > - description, - </if> - <if test="type != null" > - type, - </if> - <if test="status != null" > - status, - </if> - </trim> - <trim prefix="values (" suffix=")" suffixOverrides="," > - <if test="akey != null" > - #{akey,jdbcType=VARCHAR}, - </if> - <if test="aval != null" > - #{aval,jdbcType=VARCHAR}, - </if> - <if test="description != null" > - #{description,jdbcType=VARCHAR}, - </if> - <if test="type != null" > - #{type,jdbcType=TINYINT}, - </if> - <if test="status != null" > - #{status,jdbcType=TINYINT}, - </if> - </trim> - </insert> - <select id="countByExample" parameterType="com.accompany.business.model.WebConfigExample" resultType="java.lang.Integer" > - select count(*) from web_config - <if test="_parameter != null" > - <include refid="Example_Where_Clause" /> - </if> - </select> - <update id="updateByExampleSelective" parameterType="map" > - update web_config - <set > - <if test="record.akey != null" > - akey = #{record.akey,jdbcType=VARCHAR}, - </if> - <if test="record.aval != null" > - aval = #{record.aval,jdbcType=VARCHAR}, - </if> - <if test="record.description != null" > - description = #{record.description,jdbcType=VARCHAR}, - </if> - <if test="record.type != null" > - type = #{record.type,jdbcType=TINYINT}, - </if> - <if test="record.status != null" > - status = #{record.status,jdbcType=TINYINT}, - </if> - </set> - <if test="_parameter != null" > - <include refid="Update_By_Example_Where_Clause" /> - </if> - </update> - <update id="updateByExample" parameterType="map" > - update web_config - set akey = #{record.akey,jdbcType=VARCHAR}, - aval = #{record.aval,jdbcType=VARCHAR}, - description = #{record.description,jdbcType=VARCHAR}, - type = #{record.type,jdbcType=TINYINT}, - status = #{record.status,jdbcType=TINYINT} - <if test="_parameter != null" > - <include refid="Update_By_Example_Where_Clause" /> - </if> - </update> -</mapper> \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/WithDrawPacketCashProdMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/WithDrawPacketCashProdMapper.xml deleted file mode 100644 index 17e2dd2a5..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/WithDrawPacketCashProdMapper.xml +++ /dev/null @@ -1,137 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="com.accompany.business.mybatismapper.WithDrawPacketCashProdMapper" > - <resultMap id="BaseResultMap" type="com.accompany.business.model.WithDrawPacketCashProd" > - <id column="packet_prod_cash_id" property="packetProdCashId" jdbcType="INTEGER" /> - <result column="packet_num" property="packetNum" jdbcType="DOUBLE" /> - <result column="prod_stauts" property="prodStauts" jdbcType="TINYINT" /> - <result column="seq_no" property="seqNo" jdbcType="INTEGER" /> - <result column="create_time" property="createTime" jdbcType="TIMESTAMP" /> - </resultMap> - <sql id="Example_Where_Clause" > - <where > - <foreach collection="oredCriteria" item="criteria" separator="or" > - <if test="criteria.valid" > - <trim prefix="(" suffix=")" prefixOverrides="and" > - <foreach collection="criteria.criteria" item="criterion" > - <choose > - <when test="criterion.noValue" > - and ${criterion.condition} - </when> - <when test="criterion.singleValue" > - and ${criterion.condition} #{criterion.value} - </when> - <when test="criterion.betweenValue" > - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - </when> - <when test="criterion.listValue" > - and ${criterion.condition} - <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," > - #{listItem} - </foreach> - </when> - </choose> - </foreach> - </trim> - </if> - </foreach> - </where> - </sql> - <sql id="Base_Column_List" > - packet_prod_cash_id, packet_num, prod_stauts, seq_no, create_time - </sql> - <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.accompany.business.model.WithDrawPacketCashProdExample" > - select - <if test="distinct" > - distinct - </if> - 'true' as QUERYID, - <include refid="Base_Column_List" /> - from withdraw_packet_cash_prod - <if test="_parameter != null" > - <include refid="Example_Where_Clause" /> - </if> - <if test="orderByClause != null" > - order by ${orderByClause} - </if> - </select> - <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" > - select - <include refid="Base_Column_List" /> - from withdraw_packet_cash_prod - where packet_prod_cash_id = #{packetProdCashId,jdbcType=INTEGER} - </select> - <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" > - delete from withdraw_packet_cash_prod - where packet_prod_cash_id = #{packetProdCashId,jdbcType=INTEGER} - </delete> - <insert id="insert" parameterType="com.accompany.business.model.WithDrawPacketCashProd" > - insert into withdraw_packet_cash_prod (packet_prod_cash_id, packet_num, prod_stauts, - seq_no, create_time) - values (#{packetProdCashId,jdbcType=INTEGER}, #{packetNum,jdbcType=DOUBLE}, #{prodStauts,jdbcType=TINYINT}, - #{seqNo,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}) - </insert> - <insert id="insertSelective" parameterType="com.accompany.business.model.WithDrawPacketCashProd" > - insert into withdraw_packet_cash_prod - <trim prefix="(" suffix=")" suffixOverrides="," > - <if test="packetProdCashId != null" > - packet_prod_cash_id, - </if> - <if test="packetNum != null" > - packet_num, - </if> - <if test="prodStauts != null" > - prod_stauts, - </if> - <if test="seqNo != null" > - seq_no, - </if> - <if test="createTime != null" > - create_time, - </if> - </trim> - <trim prefix="values (" suffix=")" suffixOverrides="," > - <if test="packetProdCashId != null" > - #{packetProdCashId,jdbcType=INTEGER}, - </if> - <if test="packetNum != null" > - #{packetNum,jdbcType=DOUBLE}, - </if> - <if test="prodStauts != null" > - #{prodStauts,jdbcType=TINYINT}, - </if> - <if test="seqNo != null" > - #{seqNo,jdbcType=INTEGER}, - </if> - <if test="createTime != null" > - #{createTime,jdbcType=TIMESTAMP}, - </if> - </trim> - </insert> - <update id="updateByPrimaryKeySelective" parameterType="com.accompany.business.model.WithDrawPacketCashProd" > - update withdraw_packet_cash_prod - <set > - <if test="packetNum != null" > - packet_num = #{packetNum,jdbcType=DOUBLE}, - </if> - <if test="prodStauts != null" > - prod_stauts = #{prodStauts,jdbcType=TINYINT}, - </if> - <if test="seqNo != null" > - seq_no = #{seqNo,jdbcType=INTEGER}, - </if> - <if test="createTime != null" > - create_time = #{createTime,jdbcType=TIMESTAMP}, - </if> - </set> - where packet_prod_cash_id = #{packetProdCashId,jdbcType=INTEGER} - </update> - <update id="updateByPrimaryKey" parameterType="com.accompany.business.model.WithDrawPacketCashProd" > - update withdraw_packet_cash_prod - set packet_num = #{packetNum,jdbcType=DOUBLE}, - prod_stauts = #{prodStauts,jdbcType=TINYINT}, - seq_no = #{seqNo,jdbcType=INTEGER}, - create_time = #{createTime,jdbcType=TIMESTAMP} - where packet_prod_cash_id = #{packetProdCashId,jdbcType=INTEGER} - </update> -</mapper> \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/WithdrawAccountDtlMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/WithdrawAccountDtlMapper.xml deleted file mode 100644 index c1b0238ac..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/WithdrawAccountDtlMapper.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="com.accompany.business.mybatismapper.withdraw.WithdrawAccountDtlMapper"> -</mapper> \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/WithdrawConfigMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/WithdrawConfigMapper.xml deleted file mode 100644 index 5b2da8f9b..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/WithdrawConfigMapper.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="com.accompany.business.mybatismapper.withdraw.WithdrawConfigMapper"> -</mapper> \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/WithdrawUserAccountMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/WithdrawUserAccountMapper.xml deleted file mode 100644 index aefe2c61a..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/WithdrawUserAccountMapper.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="com.accompany.business.mybatismapper.withdraw.WithdrawUserAccountMapper"> -</mapper> \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/WithdrawUserLimitMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/WithdrawUserLimitMapper.xml deleted file mode 100644 index 59c3615e9..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/WithdrawUserLimitMapper.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="com.accompany.business.mybatismapper.withdraw.WithdrawUserLimitMapper"> -</mapper> \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/WithdrawUserMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/WithdrawUserMapper.xml deleted file mode 100644 index 71b424339..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/WithdrawUserMapper.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="com.accompany.business.mybatismapper.withdraw.WithdrawUserMapper"> -</mapper> \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/WithdrawUserRecordMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/WithdrawUserRecordMapper.xml deleted file mode 100644 index 0dad987f6..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/WithdrawUserRecordMapper.xml +++ /dev/null @@ -1,71 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="com.accompany.business.mybatismapper.withdraw.WithdrawUserRecordMapper"> - <select id="page" resultType="com.accompany.business.vo.withdraw.WithdrawUserRecordVo"> - select - wur.id, - wur.uid, - u.erban_no as erbanNo, - u.nick, - ab.block_status as blockStatus, - wur.create_time as createTime, - wur.grant_time as grantTime, - wur.account_name as accountName, - wur.cash_amount as cashAmount, - wur.`currency`, - wur.currency_amount as currencyAmount, - wur.handling_rate as handlingRate, - wur.gold_num as goldNum, - wur.`name`, - wur.surname, - wur.id_card_no as idCardNo, - wur.`province`, - wur.`city`, - wur.street, - wur.post_code as postCode, - wur.account_no as accountNo, - wur.third_account_no as thirdAccountNo, - wur.bank_name as bankName, - wur.`address`, - wur.swift_code as swiftCode, - wur.`contact`, - wur.account_type as accountType, - wur.record_status as recordStatus - from withdraw_user_record as wur - left join users as u on u.uid = wur.uid - left join account_block as ab on ab.block_value = u.erban_no and ab.block_type = 1 - where wur.record_status = #{recordStatus} - <if test="erbanNo != null and erbanNo != ''"> - and u.erban_no like concat('%', #{erbanNo}, '%') - </if> - <if test="accountType != null and accountType != -1"> - and wur.account_type = #{accountType} - </if> - <if test="applyStartTime != null"> - and wur.create_time >= #{applyStartTime} - </if> - <if test="applyEndTime != null"> - and wur.create_time <![CDATA[<=]]> #{applyEndTime} - </if> - order by wur.create_time desc - </select> - <select id="totalCount" resultType="java.lang.Long"> - select - count(*) - from withdraw_user_record as wur - left join users as u on u.uid = wur.uid - where wur.record_status = #{recordStatus} - <if test="erbanNo != null and erbanNo != ''"> - and u.erban_no like concat('%', #{erbanNo}, '%') - </if> - <if test="accountType != null and accountType != -1"> - and wur.account_type = #{accountType} - </if> - <if test="applyStartTime != null"> - and wur.create_time >= #{applyStartTime} - </if> - <if test="applyEndTime != null"> - and wur.create_time <![CDATA[<=]]> #{applyEndTime} - </if> - </select> -</mapper> \ No newline at end of file diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/config/WebMVCConfig.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/config/WebMVCConfig.java index 942c1c237..bb5dd0f3a 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/config/WebMVCConfig.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/config/WebMVCConfig.java @@ -56,8 +56,6 @@ public class WebMVCConfig implements WebMvcConfigurer { // .excludePathPatterns("/receive/**") // .excludePathPatterns("/ios/pay/callback/**") // .excludePathPatterns("/yidun/callback/**") -// .excludePathPatterns("/certification/callback/**") -// .excludePathPatterns("/payment/mycard/**") // .excludePathPatterns("/payment/payermax/callback/**"); registry.addInterceptor(getLoginInterceptor()).addPathPatterns("/**"); //registry.addInterceptor(getAppVersionInterceptor()); diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/ChannelDistributeController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/ChannelDistributeController.java deleted file mode 100644 index 75e8823d7..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/ChannelDistributeController.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.accompany.business.controller; - -import com.accompany.business.model.ChannelDistribute; -import com.accompany.business.model.request.ChannelDistributeGetReq; -import com.accompany.business.service.ChannelDistributeService; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; - -/** - * ｛这里添加描述｝ - * - * @author fangchengyan - * @date 2020-02-20 2:18 下午 - */ -@Controller -@RequestMapping("/channel/distribute") -public class ChannelDistributeController { - - @Autowired - private ChannelDistributeService channelDistributeService; - - @RequestMapping(value = "/get",method = RequestMethod.GET) - @ResponseBody - public BusiResult get(ChannelDistributeGetReq req) { - if(null == req.getApp() || null == req.getChannel()) { - return new BusiResult(BusiStatus.PARAMERROR); - } - ChannelDistribute channelDistribute = channelDistributeService.getUniqueOne(req.getApp(), req.getChannel()); - BusiResult result = new BusiResult(BusiStatus.SUCCESS, channelDistribute); - return result; - } -} diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/GreetMsgController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/GreetMsgController.java deleted file mode 100644 index 78a41962c..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/GreetMsgController.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.accompany.business.controller; - -import com.accompany.business.service.GreetMsgService; -import com.accompany.common.annotation.Authorization; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 打招呼消息 - * - * @author fangchengyan - * @date 2019-11-08 3:08 下午 - */ -@RestController -@RequestMapping("/greet/msg") -public class GreetMsgController { - Logger log = LoggerFactory.getLogger((GreetMsgController.class)); - - @Autowired - private GreetMsgService greetMsgService; - - /** - * 随机获取一条打招呼消息 - * @return - */ - @Authorization - @RequestMapping("/getOne") - public BusiResult getOne(Long uid, Long toUid) { - if(null == uid || null == toUid) { - log.error("uid或toUid不能为空"); - return new BusiResult(BusiStatus.PARAMERROR); - } - log.info("随机获取一条打招呼消息，fromUid:{}, toUid:{}", uid, toUid); - String msg = greetMsgService.getOneByRandom(uid, toUid); - return new BusiResult(BusiStatus.SUCCESS, BusiStatus.SUCCESS.getReasonPhrase(), msg); - } -} diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/HealthCheckController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/HealthCheckController.java deleted file mode 100644 index 5c66c5758..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/HealthCheckController.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.accompany.business.controller; - -import com.accompany.common.result.BusiResult; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * @author: liaozetao - * @date: 2023/7/6 19:29 - * @description: - */ -@Slf4j -@RestController -@RequestMapping -public class HealthCheckController { - @RequestMapping("/healthCheck") - public BusiResult<?> healthCheck() { - return BusiResult.success(); - } -} - diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/SearchController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/SearchController.java index 9b0160b5f..78226ad23 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/SearchController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/SearchController.java @@ -2,15 +2,12 @@ package com.accompany.business.controller; import cn.hutool.core.collection.CollectionUtil; import com.accompany.business.common.BaseController; -import com.accompany.business.service.room.RoomSearchLogService; import com.accompany.business.service.room.RoomSearchService; import com.accompany.common.annotation.Authorization; import com.accompany.common.constant.Constant; -import com.accompany.common.device.DeviceInfo; import com.accompany.common.result.BusiResult; import com.accompany.common.utils.StringUtils; import com.accompany.core.base.UidContextHolder; -import com.accompany.core.service.SysConfService; import com.accompany.core.vo.user.SearchVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -23,7 +20,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -40,10 +36,6 @@ public class SearchController extends BaseController { @Autowired private RoomSearchService roomSearchService; - @Autowired - private SysConfService sysConfService; - @Autowired - private RoomSearchLogService roomSearchLogService; @Authorization @GetMapping(value = "/room") @@ -51,7 +43,7 @@ public class SearchController extends BaseController { public BusiResult<List<SearchVo>> searchRoomByKey(HttpServletRequest request, @RequestParam("key") String key, @RequestParam("type") Integer type, @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, - @RequestParam(value = "pageSize", required = false, defaultValue = "20") Integer pageSize) throws Exception { + @RequestParam(value = "pageSize", required = false, defaultValue = "20") Integer pageSize) { if (null != key) { key = key.trim(); } @@ -60,19 +52,15 @@ public class SearchController extends BaseController { } Long uid = getUid(request); - DeviceInfo deviceInfo = getDeviceInfo(request); pageSize = Math.min(pageSize, 10); - Date now = new Date(); - // 统一使用数据库搜索 List<SearchVo> searchRooms = roomSearchService.search(uid, key, type, page, pageSize); if (CollectionUtil.isNotEmpty(searchRooms)) { roomSearchService.searchWrapper(UidContextHolder.get(), searchRooms); } - roomSearchLogService.log(now, uid, deviceInfo, key, type, page, pageSize, searchRooms); return BusiResult.success(searchRooms); } diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/TestGetPubKey.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/TestGetPubKey.java deleted file mode 100644 index d8dd0d84c..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/TestGetPubKey.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.accompany.business.controller; - -import org.apache.commons.codec.binary.Base64; - -import java.io.UnsupportedEncodingException; -import java.security.*; -import java.security.spec.X509EncodedKeySpec; - -/** - * Created by liuguofu on 2017/7/7. - */ -public class TestGetPubKey { - public static void main(String args[])throws Exception{ - String signuatrue="hCjivoCnxSoPBKrtNWhLFJg60kDcegRqODmB16qU7Nkbg/XsmdGkP2KWOBRumn8BIxxIOCXI5rAGwKd+7eFbkHMgNqQQfnxJjJiCeNTyApGfRFIJnndufkXatZi8NyNRvMpWSCb4kCTZQs2X5pU1VeMNpvioWnDEfbome+3DqSB7zoyYUMr7KmWICtdMXewmaTFtnyZCsaP1nVyDX8ZBfe9XDlLCamHIKyQTP9FnpoRvpfW01DVqXDykKEB8Dl3/trP/+nbA7vASMRKITsL7JUCfVaF8j9J09EGy6r9D1WzJLDhpkCSfo4yz6R+rVJG+YxGzjF5HN6sbyZsAZquKgw=="; - String data="{\"id\":\"evt_04qN8cXQvIhssduhS4hpqd9p\",\"created\":1427555016,\"livemode\":false,\"type\":\"account.summary.available\",\"data\":{\"object\":{\"acct_id\":\"acct_0eHSiDyzv9G09ejT\",\"object\":\"account_daily_summary\",\"acct_display_name\":\"xx公司\",\"created\":1425139260,\"summary_from\":1425052800,\"summary_to\":1425139199,\"charges_amount\":1000,\"charges_count\":100}},\"object\":\"event\",\"pending_webhooks\":2,\"request\":null,\"scope\":\"acct_1234567890123456\",\"acct_id\":\"acct_1234567890123456\"}"; - System.out.println(verifyData(data,signuatrue,getPubKey())); -// getPubKey(); - } - private static PublicKey getPubKey() throws Exception { - String pubKeyString ="-----BEGIN PUBLIC KEY-----\n" + - "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC4FxEYbLidyIhfxvlcDsGy6rOk\n" + - "WH6kN/eFIPyO1vm6/qybYuGp97xVgb6VYg7oYXa1jeGgfDXzgNMZik4bJmGJAjSG\n" + - "K7yr253WHsfynvAixnZNpsRXvMrfPS+xr9RpHiYMQmTegJAOg7IfKcvzNW7CkTYw\n" + - "wOUBmQ5GGeX6uGi1IQIDAQAB\n" + - "-----END PUBLIC KEY-----"; - pubKeyString = pubKeyString.replaceAll("(-+BEGIN PUBLIC KEY-+\\r?\\n|-+END PUBLIC KEY-+\\r?\\n?)", ""); - byte[] keyBytes = Base64.decodeBase64(pubKeyString); - - // generate public key - X509EncodedKeySpec spec = new X509EncodedKeySpec(keyBytes); - KeyFactory keyFactory = KeyFactory.getInstance("RSA"); - PublicKey publicKey = keyFactory.generatePublic(spec); - return publicKey; - } - - private static boolean verifyData(String dataString, String signatureString, PublicKey publicKey) - throws NoSuchAlgorithmException, InvalidKeyException, SignatureException, UnsupportedEncodingException { - byte[] signatureBytes = Base64.decodeBase64(signatureString); - Signature signature = Signature.getInstance("SHA256withRSA"); - signature.initVerify(publicKey); - signature.update(dataString.getBytes("UTF-8")); - return signature.verify(signatureBytes); - } -} diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/WebConfigController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/WebConfigController.java deleted file mode 100644 index bc7654528..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/WebConfigController.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.accompany.business.controller; - -import com.accompany.business.service.WebConfigService; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; - -/** - * Created by yuanyi on 2019/3/19. - */ -@Controller -@RequestMapping("/webConfig") -public class WebConfigController { - private static final Logger logger = LoggerFactory.getLogger(WebConfigService.class); - - @Autowired - WebConfigService webConfigService; - - @RequestMapping(value = "refresh", method = RequestMethod.POST) - @ResponseBody - public BusiResult refresh() { - try { - webConfigService.refresh(); - return new BusiResult(BusiStatus.SUCCESS); - } catch (Exception e) { - logger.error("Failed to refresh web config. Casuse by {}", e.getMessage()); - return new BusiResult(BusiStatus.UNKNOWN); - } - } -} diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activities/ActCallBattleController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activities/ActCallBattleController.java deleted file mode 100644 index 2b95d00ad..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activities/ActCallBattleController.java +++ /dev/null @@ -1,125 +0,0 @@ -/* - * 文 件 名: ActivitiesLuckySeaController - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2020/12/30 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.controller.activities; - -import com.accompany.business.dto.activity.callbattle.ActCallBattleConfig; -import com.accompany.business.model.callbattle.ActCallBattleInfo; -import com.accompany.business.param.callbattle.ActCallBattleDrawParams; -import com.accompany.business.service.callbattle.ActCallBattleBizService; -import com.accompany.business.vo.callbattle.*; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.vo.BaseRequestVO; -import com.accompany.core.vo.BaseResponseVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - * <br>类描述: 召唤战斗活动controller - * <br>功能详细描述: - * - * @author H1 - * @date [2020/12/30] - */ -@RestController -@RequestMapping("/act/callBattle") -@Slf4j -@Api(tags = "召唤战斗活动") -public class ActCallBattleController { - - @Autowired - private ActCallBattleBizService actCallBattleBizService; - - @ApiOperation(tags = "获取用户活动信息", value = "获取用户活动信息,包含用户基本信息，碎片数、钻石数与今日收益") - @RequestMapping(value = "/getUserActInfo", method = RequestMethod.GET) - public BaseResponseVO<ActCallBattleUserInfo> getUserActInfo() { - BaseRequestVO baseRequestVO = new BaseRequestVO(); - Long myUserId = baseRequestVO.getMyUserId(); - return new BaseResponseVO<>(BusiStatus.SUCCESS, actCallBattleBizService.getUserActInfo(myUserId)); - } - - @ApiOperation("获取活动配置列表") - @RequestMapping(value = "/listItem", method = RequestMethod.GET) - public BaseResponseVO<List<ActCallBattleUserDrawItemVO>> listItem(String roundId) { - BaseRequestVO baseRequestVO = new BaseRequestVO(); - Long myUserId = baseRequestVO.getMyUserId(); - return new BaseResponseVO<>(BusiStatus.SUCCESS, actCallBattleBizService.listUserDrawItemInfo(myUserId, roundId)); - } - - @ApiOperation("获取指定数量的中奖纪录") - @ApiImplicitParams({ - @ApiImplicitParam(name = "count", value = "需要获取的条数", required = false, dataType = "Integer", paramType = "query"), - @ApiImplicitParam(name = "roundId", value = "当前进行轮的roundId", required = false, dataType = "String", paramType = "query"), - }) - @RequestMapping(value = "/listActInfo", method = RequestMethod.GET) - public BaseResponseVO<List<ActCallBattleInfo>> listActInfo(Integer count, String roundId) { - return new BaseResponseVO<>(BusiStatus.SUCCESS, actCallBattleBizService.listActInfo(count, roundId)); - } - - @ApiOperation("获取最新一次的召唤战斗活动信息") - @RequestMapping(value = "/getNewestAct", method = RequestMethod.GET) - public BaseResponseVO<ActCallBattleInfoVo> getNewestActInfo() { - BaseRequestVO baseRequestVO = new BaseRequestVO(); - Long myUserId = baseRequestVO.getMyUserId(); - return new BaseResponseVO<>(BusiStatus.SUCCESS, actCallBattleBizService.getNewestActInfo(myUserId)); - } - - @ApiOperation("获取召唤战斗活动榜单信息") - @ApiImplicitParams({ - @ApiImplicitParam(name = "type", value = "榜单类型(1:钻石榜 2:欧皇榜)", required = true, dataType = "Integer", paramType = "query") - }) - @RequestMapping(value = "/listRank", method = RequestMethod.GET) - public BaseResponseVO<ActCallBattleRankVo> listRank(Integer type) { - BaseRequestVO baseRequestVO = new BaseRequestVO(); - Long myUserId = baseRequestVO.getMyUserId(); - return new BaseResponseVO<>(BusiStatus.SUCCESS, actCallBattleBizService.listRank(type, myUserId)); - } - - @ApiOperation("抽奖") - @ApiImplicitParams({ - @ApiImplicitParam(name = "itemId", value = "选择的配置id", required = true, dataType = "number", paramType = "body"), - @ApiImplicitParam(name = "num", value = "选择的配置数量", required = true, dataType = "number", paramType = "body") - }) - @RequestMapping(value = "/draw", method = RequestMethod.POST) - public BaseResponseVO draw(@RequestBody List<ActCallBattleDrawParams> params) { - BaseRequestVO baseRequestVO = new BaseRequestVO(); - Long myUserId = baseRequestVO.getMyUserId(); - actCallBattleBizService.draw(myUserId, params); - return new BaseResponseVO(BusiStatus.SUCCESS); - } - - @ApiOperation("分页获取用户的游戏记录") - @ApiImplicitParams({ - @ApiImplicitParam(name = "page", value = "页数", required = false, dataType = "Integer", paramType = "query"), - @ApiImplicitParam(name = "pageSize", value = "每页大小", required = false, dataType = "Integer", paramType = "query"), - }) - @RequestMapping(value = "/listDrawRecord", method = RequestMethod.GET) - public BaseResponseVO<List<ActCallBattleUserDrawRecordVo>> listUserDrawRecord(Integer page, Integer pageSize) { - BaseRequestVO baseRequestVO = new BaseRequestVO(); - Long myUserId = baseRequestVO.getMyUserId(); - return new BaseResponseVO(BusiStatus.SUCCESS, actCallBattleBizService.listUserDrawResult(myUserId, page, pageSize)); - } - - @ApiOperation("获取游戏各阶段的时间配置") - @RequestMapping(value = "/getTimeConfig", method = RequestMethod.GET) - public BaseResponseVO<ActCallBattleConfig> getActTimeConfig() { - return new BaseResponseVO(BusiStatus.SUCCESS, actCallBattleBizService.getActTimeConfig()); - } -} diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activities/ActSingleRoomRankController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activities/ActSingleRoomRankController.java deleted file mode 100644 index 67a4949fc..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activities/ActSingleRoomRankController.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.accompany.business.controller.activities; - -import com.accompany.business.common.BaseController; -import com.accompany.business.service.activities.ActSingleRoomRankService; -import com.accompany.business.vo.activity.ActivitySingleRoomRankAward; -import com.accompany.business.vo.activity.ActivitySingleRoomRankVo; -import com.accompany.common.annotation.Authorization; -import com.accompany.core.vo.BaseResponseVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - - -@Api(tags = "个播周榜",value = "个播周榜") -@RestController -@RequestMapping("/single/room/rank") -public class ActSingleRoomRankController extends BaseController { - - @Autowired - private ActSingleRoomRankService actSingleRoomRankService; - - @Authorization - @ApiOperation("个播周榜") - @GetMapping("/week") - public BaseResponseVO<ActivitySingleRoomRankVo> getSingleRoomRank(Integer rankType){ - return new BaseResponseVO<>(actSingleRoomRankService.getSingleRoomRank(rankType)); - } - - - @Authorization - @ApiOperation("奖励列表") - @GetMapping("/award/list") - public BaseResponseVO<ActivitySingleRoomRankAward> getSingleRoomRankAwardList(Integer rankType){ - return new BaseResponseVO<>(actSingleRoomRankService.getSingleRoomRankAwardList(rankType)); - } - -} diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activities/ActivitiesLuckySeaController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activities/ActivitiesLuckySeaController.java deleted file mode 100644 index 4151aaa7d..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activities/ActivitiesLuckySeaController.java +++ /dev/null @@ -1,153 +0,0 @@ -package com.accompany.business.controller.activities; - -import com.accompany.business.common.BaseController; -import com.accompany.business.constant.activities.ActivitesPackTypeEnum; -import com.accompany.business.dto.luckysea.LuckySeaActConfig; -import com.accompany.business.model.ActivityPack; -import com.accompany.business.model.activity.luckysea.LuckySeaActInfo; -import com.accompany.business.service.activities.luckySea.ActivitiesLuckySeaService; -import com.accompany.business.service.activities.vo.LuckySeaActUserDrawRecordVo; -import com.accompany.business.service.activities.vo.LuckySeaActUserInfo; -import com.accompany.business.service.activities.vo.LuckySeaRankVo; -import com.accompany.business.service.activity.ActivityPackService; -import com.accompany.business.vo.activities.LuckySeaActInfoVo; -import com.accompany.business.vo.activities.LuckySeaActUserDrawItemVO; -import com.accompany.common.annotation.Authorization; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.vo.BaseResponseVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; -import java.util.List; - -/** - * <br>类描述: 深海奇缘活动controller - * <br>功能详细描述: - * - * @author H1 - * @date [2020/12/30] - */ -@RestController -@RequestMapping("/act/luckySea") -@Slf4j -@Api(tags = "深海奇缘活动") -public class ActivitiesLuckySeaController extends BaseController { - - @Autowired - private ActivityPackService activityPackService; - @Autowired - private ActivitiesLuckySeaService activitiesLuckySeaService; - - @ApiOperation("获取游戏各阶段的时间配置") - @GetMapping("/getTimeConfig") - public BaseResponseVO<LuckySeaActConfig> getActTimeConfig() { - return new BaseResponseVO<>(activitiesLuckySeaService.getLuckySeaTimeConfig()); - } - - @ApiOperation("获取活动礼包列表") - @GetMapping("/listPack") - @Deprecated - public BaseResponseVO<List<ActivityPack>> listPack() { - return new BaseResponseVO<>(activityPackService.getPackListByType(ActivitesPackTypeEnum.LUCKY_SEA.getValue().byteValue())); - } - - @ApiOperation("获取最新一次的深海奇缘活动信息") - @GetMapping("/getNewestAct") - @Authorization - public BaseResponseVO<LuckySeaActInfoVo> getNewestLuckySeaActInfo(HttpServletRequest request) { - Long myUserId = getUid(request); - return new BaseResponseVO<>(activitiesLuckySeaService.getNewestLuckySeaActInfo(myUserId)); - } - - @ApiOperation(tags = "获取用户活动信息", value = "获取用户活动信息,包含用户基本信息，碎片数、钻石数与今日收益") - @GetMapping("/getUserActInfo") - @Authorization - public BaseResponseVO<LuckySeaActUserInfo> getUserLuckySeaActInfo(HttpServletRequest request) { - Long myUserId = getUid(request); - return new BaseResponseVO<>(activitiesLuckySeaService.getUserLuckySeaActInfo(myUserId)); - } - - @ApiOperation("获取活动配置列表") - @ApiImplicitParams({ - @ApiImplicitParam(name = "roundId", value = "当前进行轮的roundId"), - }) - @GetMapping("/listItem") - @Authorization - public BaseResponseVO<List<LuckySeaActUserDrawItemVO>> listItem(HttpServletRequest request, String roundId) { - Long myUserId = getUid(request); - return new BaseResponseVO<>(activitiesLuckySeaService.listUserDrawItemInfo(myUserId, roundId)); - } - - @ApiOperation("获取指定数量的中奖纪录，往轮结果") - @ApiImplicitParams({ - @ApiImplicitParam(name = "count", value = "需要获取的条数"), - @ApiImplicitParam(name = "roundId", value = "当前进行轮的roundId"), - }) - @GetMapping("/listLuckySeaActInfo") - public BaseResponseVO<List<LuckySeaActInfo>> listLuckySeaActInfo(Integer count, String roundId) { - if (null == count) { - log.error("ActivitiesLuckySeaController listLuckySeaActInfo is error"); - return new BaseResponseVO<>(); - } - return new BaseResponseVO<>(activitiesLuckySeaService.listLuckySeaActInfo(count, roundId)); - } - - @ApiOperation("获取深海奇缘活动榜单信息") - @ApiImplicitParams({ - @ApiImplicitParam(name = "type", value = "榜单类型(1:钻石榜 2:欧皇榜)", required = true, dataType = "Integer", paramType = "query"), - @ApiImplicitParam(name = "page", value = "页数", dataType = "Integer", paramType = "query"), - @ApiImplicitParam(name = "pageSize", value = "每页大小", dataType = "Integer", paramType = "query"), - }) - @GetMapping("/listRank") - @Authorization - public BaseResponseVO<LuckySeaRankVo> listRank(HttpServletRequest request, - Integer type, Integer page, Integer pageSize) { - if (null == type || null == page || null == pageSize) { - throw new ServiceException(BusiStatus.PARAMERROR); - } - Long myUserId = getUid(request); - return new BaseResponseVO<>(activitiesLuckySeaService.listRank(type, page, pageSize, myUserId)); - } - - @ApiOperation("抽奖") - @ApiImplicitParams({ - @ApiImplicitParam(name = "itemId", value = "选择的配置id", required = true, dataType = "number", paramType = "body"), - @ApiImplicitParam(name = "num", value = "选择的配置数量", required = true, dataType = "number", paramType = "body") - }) - @PostMapping("/draw") - @Authorization - public BaseResponseVO<Void> draw(HttpServletRequest request, Long itemId, Long num) { - if (null == itemId || null == num || num <= 0) { - throw new ServiceException(BusiStatus.PARAMERROR); - } - Long myUserId = getUid(request); - activitiesLuckySeaService.draw(myUserId, itemId, num); - return new BaseResponseVO<>(BusiStatus.SUCCESS); - } - - @ApiOperation("分页获取用户的游戏记录") - @ApiImplicitParams({ - @ApiImplicitParam(name = "page", value = "页数", dataType = "Integer", paramType = "query"), - @ApiImplicitParam(name = "pageSize", value = "每页大小", dataType = "Integer", paramType = "query"), - }) - @GetMapping("/listDrawRecord") - public BaseResponseVO<List<LuckySeaActUserDrawRecordVo>> listUserDrawRecord(HttpServletRequest request, - Integer page, Integer pageSize) { - if (null == page || null == pageSize) { - throw new ServiceException(BusiStatus.PARAMERROR); - } - Long myUserId = getUid(request); - return new BaseResponseVO<>(activitiesLuckySeaService.listUserDrawResult(myUserId, page, pageSize)); - } - -} diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activities/PageActivityController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activities/PageActivityController.java deleted file mode 100644 index f6f1a3e49..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activities/PageActivityController.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.accompany.business.controller.activities; - -import com.accompany.business.model.activity.PageActivity; -import com.accompany.business.service.activity.PageActivityService; -import com.accompany.business.vo.activities.PageActivityVO; -import com.accompany.common.result.BusiResult; -import com.accompany.core.util.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 页面静态活动 - * - * @author linuxea - * @date 2019/9/29 17:44 - */ -@RestController -@RequestMapping("/page/static/activity") -public class PageActivityController { - - @Autowired - private PageActivityService pageActivityService; - - /** - * 通过活动标识 code 获取 - * - * @param code 活动标识 - * @return {@link PageActivityVO} - */ - @GetMapping("/{code}") - public BusiResult<PageActivityVO> getByCode(@PathVariable("code") String code) { - PageActivity pageActivity = pageActivityService.getByCode(code); - PageActivityVO pageActivityVO = BeanUtils.map(pageActivity, PageActivityVO.class); - return new BusiResult<>(pageActivityVO); - } -} diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activity/ActivityConfigController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activity/ActivityConfigController.java deleted file mode 100644 index 3b0be9ce5..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activity/ActivityConfigController.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.accompany.business.controller.activity; - -import com.accompany.business.service.activity.ActivityConfigService; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; - -/** - * Created by PaperCut on 2018/3/10. - */ -@Controller -@RequestMapping("/activityConfig") -public class ActivityConfigController { - private static final Logger logger = LoggerFactory.getLogger(ActivityConfigController.class); - - @Autowired - ActivityConfigService activityConfigService; - - @RequestMapping(value = "refresh", method = RequestMethod.POST) - @ResponseBody - public BusiResult refresh() { - try { - activityConfigService.refresh(); - return new BusiResult(BusiStatus.SUCCESS); - } catch (Exception e) { - logger.error("Failed to refresh activity config. Casuse by {}", e.getMessage()); - return new BusiResult(BusiStatus.UNKNOWN); - } - } - - @RequestMapping(value = "/change") - @ResponseBody - public BusiResult changeConf(String confKey,String confVal){ - try{ - this.activityConfigService.changeConf(confKey,confVal); - return new BusiResult(BusiStatus.SUCCESS); - }catch (Exception e){ - return new BusiResult(BusiStatus.BUSIERROR); - } - } -} diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activity/CarActivityController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activity/CarActivityController.java deleted file mode 100644 index 440dd20e7..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activity/CarActivityController.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.accompany.business.controller.activity; - -import com.accompany.business.common.BaseController; -import com.accompany.business.service.activity.CarActivityService; -import com.accompany.common.annotation.Authorization; -import com.accompany.common.result.BusiResult; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequestMapping("/carActivity") -public class CarActivityController extends BaseController { - - @Autowired - private CarActivityService carActivityService; - - @RequestMapping("/user") - @Authorization - public BusiResult userStats(){ - Long uid = getUid(); - return new BusiResult(carActivityService.getUserStats(uid)); - } - -} diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activity/ChargeActivityVisitLogController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activity/ChargeActivityVisitLogController.java deleted file mode 100644 index 2a2660222..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activity/ChargeActivityVisitLogController.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.accompany.business.controller.activity; - -import com.accompany.business.common.BaseController; -import com.accompany.business.constant.OsEnum; -import com.accompany.business.model.ChargeActivityVisitLog; -import com.accompany.business.service.activity.ChargeActivityVisitLogService; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.IPUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; - -/** - * ｛这里添加描述｝ - * - * @author fangchengyan - * @date 2019-04-26 15:54 - */ -@RestController -@RequestMapping("/charge/activity/visit") -public class ChargeActivityVisitLogController extends BaseController { - - @Autowired - private ChargeActivityVisitLogService chargeActivityVisitLogService; - - /** - * - * @param uid - * @param os - * @param type - * @param deviceId - * @param request - * @return - */ - @RequestMapping("log") - @ResponseBody - public BusiResult visitLog(@RequestHeader(value = "pub_uid") Long uid, String os, Byte type, - String deviceId, Integer actId, HttpServletRequest request) { - ChargeActivityVisitLog record = new ChargeActivityVisitLog(); - record.setActId(actId); - record.setDeviceId(deviceId); - record.setIp(IPUtils.getRealIpAddress(request)); - record.setPlatform(OsEnum.getByName(os).getType()); - record.setType(type); - record.setUid(uid); - chargeActivityVisitLogService.insertSelective(record); - return new BusiResult(BusiStatus.SUCCESS); - - } - -} diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activity/OperationActController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activity/OperationActController.java deleted file mode 100644 index 9be4cebe1..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activity/OperationActController.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.accompany.business.controller.activity; - -import com.accompany.business.common.BaseController; -import com.accompany.business.model.OperationAct; -import com.accompany.business.service.activity.OperationActService; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * Created by yuanyi on 2018/10/5. - */ -@RestController -@RequestMapping("/act/operation") -public class OperationActController extends BaseController{ - - @Autowired - private OperationActService operationActService; - - protected final Log logger = LogFactory.getLog(OperationActController.class); - - @RequestMapping("/get") - public BusiResult getOperationActById(Integer id){ - BusiResult busiResult = new BusiResult(BusiStatus.SUCCESS); - if(id == null){ - return new BusiResult(BusiStatus.PARAMERROR); - } - try{ - OperationAct operationAct = this.operationActService.queryOpertionAct(id); - busiResult.setData(operationAct); - return busiResult; - }catch (Exception e){ - logger.error("get operationAct failed,id="+id,e); - return new BusiResult(BusiStatus.BUSIERROR); - } - } - - @RequestMapping("/refresh") - public BusiResult refreshOperationAct(){ - BusiResult busiResult = new BusiResult(BusiStatus.SUCCESS); - try{ - this.operationActService.refreshOperationAct(); - return busiResult; - }catch (Exception e){ - logger.error("refresh operationAct failed",e); - return new BusiResult(BusiStatus.BUSIERROR); - } - } -} diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/apppay/MyCardController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/apppay/MyCardController.java deleted file mode 100644 index a266770fd..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/apppay/MyCardController.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.accompany.business.controller.apppay; - -import cn.hutool.core.util.StrUtil; -import com.accompany.business.service.mycard.MyCardBizService; -import com.accompany.common.result.BusiResult; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.common.utils.IPUtils; -import com.accompany.payment.mycard.dto.CallbackDto; -import com.accompany.payment.mycard.dto.ReplenishDto; -import com.accompany.payment.mycard.resp.QueryOrderResp; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.servlet.ModelAndView; -import org.springframework.web.servlet.view.RedirectView; - -import javax.servlet.http.HttpServletRequest; -import java.util.*; - -/** - * @author: liaozetao - * @date: 2023/12/26 14:04 - * @description: - */ -@Api(tags = {"MyCard"}, value = "MyCard") -@Slf4j -@Controller -@RequestMapping("/payment/mycard") -public class MyCardController { - - @Autowired - private MyCardBizService myCardBizService; - - /** - * 补单 - * - * @param data - * @return - */ - @ApiOperation("补单") - @PostMapping("/replenish") - @ResponseBody - public BusiResult<Void> replenish(@RequestParam("DATA") String data) { - log.info("replenish data : {}", data); - if (StrUtil.isEmpty(data)) { - return BusiResult.success(); - } - myCardBizService.replenish(JSONObject.parseObject(data, ReplenishDto.class)); - return BusiResult.success(); - } - - /** - * 查询 - * - * @param startDateTime - * @param endDateTime - * @param myCardTradeNo - * @return - */ - @ApiOperation("查询") - @PostMapping("/query") - @ResponseBody - public String query(@RequestParam(value = "StartDateTime", required = false) String startDateTime, @RequestParam(value = "EndDateTime", required = false) String endDateTime, @RequestParam(value = "MyCardTradeNo", required = false) String myCardTradeNo, HttpServletRequest request) { - String ipAddress = IPUtils.getRealIpAddress(request); - log.info("myCard query ipAddress : {}", ipAddress); - if (!Arrays.asList("218.32.37.148", "40.83.124.36", "210.71.189.165", "40.81.30.67", "40.81.29.75").contains(ipAddress)) { - return JSONObject.toJSONString(Collections.emptyMap()); - } - Date startTime = DateTimeUtil.convertStrToDate(startDateTime, DateTimeUtil.UTC_DEFAULT_DATETIME_PATTERN); - Date endTime = DateTimeUtil.convertStrToDate(endDateTime, DateTimeUtil.UTC_DEFAULT_DATETIME_PATTERN); - Map<String, List<QueryOrderResp>> map = new HashMap<>(); - map.put("trades", myCardBizService.query(startTime, endTime, myCardTradeNo)); - return JSONObject.toJSONString(map); - } - - /** - * 业务回调 - * - * @param map - * @return - */ - @ApiOperation("业务回调") - @PostMapping("/callback") - public ModelAndView callback(@RequestParam Map<String, Object> map) { - String json = JSON.toJSONString(map); - log.info("myCard callback json : {}", json); - String result = myCardBizService.callback(JSONObject.parseObject(json, CallbackDto.class)); - log.info("myCard callback result : {}", result); - return new ModelAndView(new RedirectView(result)); - } - -} diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/certification/UserCertificationController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/certification/UserCertificationController.java deleted file mode 100644 index 83ee61b1e..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/certification/UserCertificationController.java +++ /dev/null @@ -1,255 +0,0 @@ -package com.accompany.business.controller.certification; - -import com.accompany.business.common.BaseController; -import com.accompany.business.dto.certification.CertifyInfo; -import com.accompany.business.model.UserCertifyRecord; -import com.accompany.business.service.certification.*; -import com.accompany.common.annotation.Authorization; -import com.accompany.common.annotation.H5Authorization; -import com.accompany.common.device.DeviceInfo; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DESUtils; -import com.accompany.common.utils.IPUtils; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.util.KeyStore; -import com.alibaba.fastjson.JSONObject; -import com.aliyuncs.exceptions.ClientException; -import com.google.common.collect.Maps; -import com.google.common.util.concurrent.RateLimiter; -import com.google.gson.Gson; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletRequest; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.TimeUnit; - -/** - * @author yangming - * @date 2018-12-21 - * @description 用户实名认证 - */ -@Api(tags = "实名认证") -@Slf4j -@RestController -@RequestMapping("/certification") -public class UserCertificationController extends BaseController { - - private static final transient Logger logger = LoggerFactory.getLogger(UserCertificationController.class); - - /** - * 接口限频,每秒十次 - **/ - private final RateLimiter certificationLimit = RateLimiter.create(10); - - private Gson gson = new Gson(); - - @Autowired - private TwoFactorCertifyService twoFactorCertifyService; - - @Autowired - private RealPeopleCertifyService realPeopleCertifyService; - - @Autowired - private YiDunLivePersonCertifyService yiDunLivePersonCertifyService; - - @Autowired - private FinancialFaceVerifyService financialFaceVerifyService; - - @H5Authorization - @RequestMapping(value = "/send/code", method = RequestMethod.POST) - public BusiResult<Void> sendCertificationCode(String phone, Long uid, HttpServletRequest request) throws Exception { - phone = DESUtils.DESAndBase64Decrypt(phone, KeyStore.DES_ENCRYPT_KEY); - String deviceInfoStr = request.getParameter("deviceInfo"); - DeviceInfo deviceInfo = gson.fromJson(deviceInfoStr, DeviceInfo.class); - logger.info("sendCertificationCode(), phone={}, uid={}, device={}", phone, uid, deviceInfo); - if (!certificationLimit.tryAcquire(5, TimeUnit.SECONDS)) { - return BusiResult.fail(BusiStatus.SERVERBUSY); - } - String ip = IPUtils.getRealIpAddress(request); - try { - this.twoFactorCertifyService.sendCertificationCode(phone, uid, ip, deviceInfo); - } catch (ServiceException e) { - logger.error("serviceException,get sms code failed, phone={}, uid={}, device={}, message:{}", - phone, uid, deviceInfo, e.getMessage(), e); - return BusiResult.fail(e.getBusiStatus(), e.getMessage()); - } catch (Exception e) { - logger.error("get sms code failed, phone={}, uid={}, device={}", phone, uid, deviceInfo, e); - return BusiResult.fail(BusiStatus.SERVERERROR); - } - return BusiResult.success(); - } - - @Authorization - @RequestMapping(value = "/isCertify") - public BusiResult isCertifyUser(Long uid) { - logger.info("isCertifyUser(),uid={}", uid); - - Boolean result = twoFactorCertifyService.isCertifyUser(uid); - return new BusiResult(BusiStatus.SUCCESS, result); - } - - /** - * 2020-03-04 接口添加是否可以实名认证的判断 - * 实名认证后，用户有一次机会可以修改实名认证信息 - * - * @param uid - * @return - */ - @H5Authorization - @GetMapping("/hasCertify") - public BusiResult<Map<String, Object>> hasCertify(Long uid) { - logger.info("hasCertifyUser, uid : {}", uid); - if (null == uid) { - return new BusiResult<>(BusiStatus.PARAMERROR); - } - Map<String, Object> data = new HashMap<>(); - data.put("hasCertify", twoFactorCertifyService.isCertifyUser(uid)); - data.put("canCertify", twoFactorCertifyService.canCertify(uid)); - if (jedisService.exits(RedisKey.user_certify.getKey(uid.toString()))) { - data.put("authResult", false); - UserCertifyRecord record = financialFaceVerifyService.getLatestRecord(uid); - if (record != null) { - log.info("hasCertify record : {}", JSONObject.toJSONString(record)); - data.put("authResult", record.getBindStatus() != null); - if (record.getBindStatus() != null && record.getBindStatus() == AbstractCertifyService.FAIL) { - jedisService.del(RedisKey.user_certify.getKey(uid.toString())); - } - } - } - return BusiResult.success(data); - } - - - /** - * 获取用户实人认证 TOKEN - * - * @param uid - * @return - */ - @Authorization - @RequestMapping(value = "/token", method = RequestMethod.GET) - public BusiResult getToken(@RequestParam Long uid, @RequestParam String username, @RequestParam String identityNumber, @RequestParam String phone, - @RequestParam String code, HttpServletRequest request) throws ClientException { - try { - username = DESUtils.DESAndBase64Decrypt(username, KeyStore.DES_ENCRYPT_KEY); - identityNumber = DESUtils.DESAndBase64Decrypt(identityNumber, KeyStore.DES_ENCRYPT_KEY); - phone = DESUtils.DESAndBase64Decrypt(phone, KeyStore.DES_ENCRYPT_KEY); - } catch (Exception e) { - logger.error("解密信息时出现异常", e); - throw new ServiceException(BusiStatus.SERVERBUSY); - } - Map<String, String> data = Maps.newHashMap(); - DeviceInfo deviceInfo = getDeviceInfo(request); - String ip = IPUtils.getRealIpAddress(request); - - try { - data.put("token", this.realPeopleCertifyService.getAliyunRPBioOnlyToken(uid, username, identityNumber, phone, code, deviceInfo, ip)); - } catch (ServiceException e) { - logger.error("serviceException,failed to get certification token[uid:{}, username:{}, idNo:{}, phone:{}, code:{}], message:{}", - uid, username, identityNumber, phone, code, e.getMessage()); - return new BusiResult(e.getBusiStatus()); - } catch (Exception e) { - logger.error("failed to get certification token[uid:{}, username:{}, idNo:{}, phone:{}, code:{}]", uid, username, identityNumber, phone, code, e); - return new BusiResult((BusiStatus.SERVERERROR)); - } - - - return new BusiResult(BusiStatus.SUCCESS, data); - } - - @PostMapping("/notify") - public BusiResult<Void> getCertificationResult(@RequestParam Long uid, @RequestParam String token, @RequestParam Byte statusCode) { - logger.info("收到认证结果通知，uid:{}, token:{}, statusCode:{}", uid, token, statusCode); - this.realPeopleCertifyService.updateCertifyResult(uid, token, statusCode); - return BusiResult.success(); - } - - /** - * 短信验证码校验： - * 2020-03-05 用户修改实名信息时，需要 - * - * @param uid - * @param phone - * @param code - * @return - */ - @Authorization - @RequestMapping(value = "/smsCode/auth", method = RequestMethod.POST) - public BusiResult auth(@RequestParam Long uid, @RequestParam String phone, @RequestParam String code) throws Exception { - Map<String, Object> data = new HashMap<>(); - - String result = realPeopleCertifyService.smsCodeAuth(uid, phone, code); - - data.put("result", true); - data.put("auth", result); - return new BusiResult(BusiStatus.SUCCESS, data); - } - - @ApiOperation("人脸核身") - @PostMapping("/live/person/audit") - public BusiResult<String> personAudit(@RequestParam("uid") Long uid, - @RequestParam("username") String username, - @RequestParam("identityNumber") String identityNumber, - @RequestParam("phone") String phone, - @RequestParam("code") String code) { - return BusiResult.success(yiDunLivePersonCertifyService.personAudit(uid, username, identityNumber, phone, code)); - } - - /** - * 金融级实人认证发起 - * - * @param uid - * @param username - * @param identityNumber - * @param phone - * @param code - * @param metaInfo - * @param certType - * @return - */ - @ApiOperation("金融级实人认证发起") - @ApiImplicitParams({ - @ApiImplicitParam(name = "uid", value = "用户UID", required = true), - @ApiImplicitParam(name = "username", value = "真实姓名", required = true), - @ApiImplicitParam(name = "identityNumber", value = "身份证", required = true), - @ApiImplicitParam(name = "phone", value = "手机号码", required = true), - @ApiImplicitParam(name = "code", value = "短信验证码", required = true), - @ApiImplicitParam(name = "metaInfo", value = "MetaInfo环境参数", required = true), - @ApiImplicitParam(name = "certType", value = "业务类型（0 提现）", required = true), - @ApiImplicitParam(name = "returnUrl", value = "回调链接", required = true), - }) - @H5Authorization - @PostMapping("initFace") - public BusiResult<CertifyInfo> initFace(@RequestParam("uid") Long uid, - @RequestParam("username") String username, - @RequestParam("identityNumber") String identityNumber, - @RequestParam("phone") String phone, - @RequestParam("code") String code, - @RequestParam("metaInfo") String metaInfo, - @RequestParam(value = "certType", defaultValue = "0") Integer certType, - @RequestParam("returnUrl") String returnUrl) { - return BusiResult.success(financialFaceVerifyService.initFace(uid, username, identityNumber, phone, code, metaInfo, certType, returnUrl)); - } - - - @GetMapping("/callback") - public BusiResult<Void> callback(@RequestParam("uid") Long uid, - @RequestParam("certifyId") String certifyId, - @RequestParam("certType") Integer certType, - @RequestParam("deviceId") String deviceId) { - log.info("callback uid : {}, certifyId : {}, certType : {}, deviceId : {}", uid, certifyId, certType, deviceId); - financialFaceVerifyService.callback(uid, certifyId, certType, deviceId); - return BusiResult.success(); - } -} diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/charge/ChargeRecordController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/charge/ChargeRecordController.java index c15030a6f..9156cce14 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/charge/ChargeRecordController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/charge/ChargeRecordController.java @@ -1,23 +1,14 @@ package com.accompany.business.controller.charge; -import cn.hutool.core.util.StrUtil; import com.accompany.business.common.BaseController; -import com.accompany.common.constant.Constant; -import com.accompany.common.result.BusiResult; -import com.accompany.payment.model.ChargeRecord; -import com.accompany.payment.mycard.resp.AuthGlobalResp; import com.accompany.payment.service.ChargeRecordService; import com.accompany.payment.vo.ChargeRecordCountVo; import com.accompany.payment.vo.ChargeRecordParentVo; import com.accompany.payment.vo.ChargeRecordVo; -import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import java.util.List; @@ -57,30 +48,4 @@ public class ChargeRecordController extends BaseController { } } - /** - * 获取充值结果 - * - * @param chargeRecordId - * @return - */ - @ApiOperation("获取充值结果") - @GetMapping("/getChargeResult") - public BusiResult<String> getChargeResult(@RequestParam("chargeRecordId") String chargeRecordId) { - ChargeRecord chargeRecord = chargeRecordService.getChargeRecordById(chargeRecordId); - if (chargeRecord == null) { - return BusiResult.fail("儲值失敗"); - } - String channel = chargeRecord.getChannel(); - String metadata = chargeRecord.getMetadata(); - if (StrUtil.isNotEmpty(metadata)) { - if (Constant.ChargeChannel.my_card.equals(channel)) { - AuthGlobalResp authGlobalResp = JSONObject.parseObject(metadata, AuthGlobalResp.class); - if (!authGlobalResp.isSuccess()) { - return BusiResult.fail(authGlobalResp.getReturnMsg()); - } - } - } - return BusiResult.success("儲值成功", chargeRecordId); - } - } diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/chat/PublicChatTopRecordController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/chat/PublicChatTopRecordController.java deleted file mode 100644 index 18499fdac..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/chat/PublicChatTopRecordController.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.accompany.business.controller.chat; - -import com.accompany.business.service.chat.PublicChatTopRecordService; -import com.accompany.business.vo.chat.PublicChatTopRecordVo; -import com.accompany.common.result.BusiResult; -import com.accompany.sharding.vo.UserChatMsgRecordVo; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * @author: liaozetao - * @date: 2024/5/6 14:36 - * @description: - */ -@RestController -@RequestMapping("/publicChatTopRecord") -public class PublicChatTopRecordController { - - @Autowired - private PublicChatTopRecordService publicChatTopRecordService; - - /** - * 发送头条 - * @param content - * @return - */ - @ApiOperation("发送头条") - @PostMapping("/send") - public BusiResult<Void> send(@RequestParam("content") String content) { - publicChatTopRecordService.send(content); - return BusiResult.success(); - } - - /** - * 获取头条 - * @return - */ - @ApiOperation("获取头条") - @GetMapping("getTop") - public BusiResult<PublicChatTopRecordVo> getTop() { - return BusiResult.success(publicChatTopRecordService.getTop()); - } - - /** - * 获取公聊大厅前50条数据 - * @return - */ - @ApiOperation("获取公聊大厅前50条数据") - @GetMapping("getChatForTop50") - public BusiResult<List<UserChatMsgRecordVo>> getChatForTop50() { - return BusiResult.success(publicChatTopRecordService.getChatForTop50()); - } - - /** - * 获取支付金额 - * @return - */ - @ApiOperation("获取支付金额") - @GetMapping("payMoney") - public BusiResult<Integer> payMoney() { - return BusiResult.success(publicChatTopRecordService.payMoney()); - } -} diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/exchange/GoldExchangeDiamondController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/exchange/GoldExchangeDiamondController.java index 6424feb1f..5be21c582 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/exchange/GoldExchangeDiamondController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/exchange/GoldExchangeDiamondController.java @@ -1,18 +1,13 @@ package com.accompany.business.controller.exchange; -import cn.hutool.core.collection.CollectionUtil; import com.accompany.business.common.BaseController; -import com.accompany.business.constant.withdraw.WithdrawUserLimitConstant; -import com.accompany.business.model.withdraw.WithdrawUserLimit; import com.accompany.business.service.exchange.GoldExchangeDiamondService; -import com.accompany.business.service.withdraw.WithdrawUserLimitService; import com.accompany.business.vo.exchange.GoldExchangeDiamondVo; import com.accompany.common.annotation.Authorization; import com.accompany.common.annotation.H5Authorization; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; import com.accompany.core.exception.ServiceException; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -23,7 +18,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; -import java.util.List; @Api(tags = "金币兑换钻石") @Slf4j @@ -34,9 +28,6 @@ public class GoldExchangeDiamondController extends BaseController { @Autowired private GoldExchangeDiamondService service; - @Autowired - private WithdrawUserLimitService withdrawUserLimitService; - @Authorization @H5Authorization @ApiOperation("获取配置") @@ -56,16 +47,6 @@ public class GoldExchangeDiamondController extends BaseController { throw new ServiceException(BusiStatus.PARAMERROR); } Long uid = getUid(request); - List<WithdrawUserLimit> withdrawUserLimits = withdrawUserLimitService.list(Wrappers.<WithdrawUserLimit>lambdaQuery() - .eq(WithdrawUserLimit::getUid, uid)); - if (CollectionUtil.isNotEmpty(withdrawUserLimits)) { - for (WithdrawUserLimit withdrawUserLimit : withdrawUserLimits) { - Integer limitType = withdrawUserLimit.getLimitType(); - if ((limitType & WithdrawUserLimitConstant.LIMIT_TYPE_OF_DIAMOND) != 0) { - throw new ServiceException(BusiStatus.YOU_ARE_UNABLE_TO_USE_THIS_FEATURE_PLEASE_CONTACT_YOUR_GUILD_LEADER_YOU_ARE_UNABLE_TO_USE_THIS_FEATURE); - } - } - } service.exchange(uid, goldNum, diamondNum); return new BusiResult<>(BusiStatus.GOLD_EXCHANGE_DIAMOND_SUCCESS); } diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/exchange/WithdrawController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/exchange/WithdrawController.java deleted file mode 100644 index 6cbbb2c62..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/exchange/WithdrawController.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.accompany.business.controller.exchange; - -import com.accompany.business.common.BaseController; -import com.accompany.business.model.WithdrawAccount; -import com.accompany.business.service.exchange.WithdrawService; -import com.accompany.business.vo.exchange.WithdrawAccountVo; -import com.accompany.common.annotation.Authorization; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.ServiceException; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; - -/** - * @author yanghaoyu - */ -@Slf4j -@RestController -@RequestMapping("/withdraw") -public class WithdrawController extends BaseController { - @Autowired - private WithdrawService withdrawService; - - @Authorization - @GetMapping("/getConfig") - public BusiResult<WithdrawAccountVo> get(HttpServletRequest request) throws Exception{ - Long uid = getUid(request); - WithdrawAccountVo vo = withdrawService.buildVo(uid); - return new BusiResult<>(vo); - } - - @Authorization - @PostMapping("/bound") - public BusiResult<Void> bound(HttpServletRequest request, WithdrawAccount account) { - if (null == account || !account.hasComplete()){ - throw new ServiceException(BusiStatus.PARAMERROR); - } - Long uid = getUid(request); - account.setUid(uid); - withdrawService.bound(account); - return new BusiResult<>(BusiStatus.SUCCESS); - } - - @Authorization - @PostMapping("/exchange") - public BusiResult<Void> exchange(HttpServletRequest request, Double goldNum, String payPwd) { - if (null == goldNum || goldNum <= 0 || !StringUtils.hasText(payPwd)){ - throw new ServiceException(BusiStatus.PARAMERROR); - } - Long uid = getUid(request); - withdrawService.withdraw(uid, goldNum, payPwd); - return new BusiResult<>(BusiStatus.WITHDRAW_SUCCESS); - } - -} diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/gamepartner/GamePartnerInfoController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/gamepartner/GamePartnerInfoController.java deleted file mode 100644 index dd255466d..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/gamepartner/GamePartnerInfoController.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.accompany.business.controller.gamepartner; - -import com.accompany.business.service.gamepartner.UserGamePartnerInfoService; -import com.accompany.business.vo.gamepartner.UserGamePartnerInfoVo; -import com.accompany.common.result.BusiResult; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -@Api(tags = "游戏点单") -@RestController -@RequestMapping("/gamePartnerInfo") -public class GamePartnerInfoController { - - @Autowired - private UserGamePartnerInfoService userGamePartnerInfoService; - - @ApiOperation("用户的游戏配置信息") - @ApiImplicitParams({ - @ApiImplicitParam(name = "uid", value = "用户UID", required = true) - }) - @GetMapping("/list") - public BusiResult<List<UserGamePartnerInfoVo>> list(Long uid) { - List<UserGamePartnerInfoVo> voList = userGamePartnerInfoService.listUserGamePartnerInfo(uid); - return new BusiResult<>(voList); - } - -} diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/gamepartner/GamePartnerOrderController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/gamepartner/GamePartnerOrderController.java deleted file mode 100644 index e739a962e..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/gamepartner/GamePartnerOrderController.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.accompany.business.controller.gamepartner; - -import com.accompany.business.service.gamepartner.GamePartnerOrderService; -import com.accompany.business.vo.gamepartner.GamePartnerOrderVo; -import com.accompany.common.annotation.Authorization; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.base.UidContextHolder; -import com.accompany.core.exception.ServiceException; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * @author: liaozetao - * @date: 2023/8/21 14:03 - * @description: - */ -@Api(tags = "游戏点单") -@RestController -@RequestMapping("/gamePartnerOrder") -public class GamePartnerOrderController { - - @Autowired - private GamePartnerOrderService gamePartnerOrderService; - - /** - * 发起邀请 - * - * @param uid - * @param gameId - * @param inning - * @return - */ - @ApiOperation("发起邀请") - @ApiImplicitParams({ - @ApiImplicitParam(name = "gameUid", value = "陪玩师UID", required = true), - @ApiImplicitParam(name = "gameId", value = "游戏ID", required = true), - @ApiImplicitParam(name = "inning", value = "局数", required = true), - }) - @PostMapping("submit") - @Authorization - public BusiResult<Void> submit(@RequestParam("gameUid") Long gameUid, - @RequestParam("gameId") Integer gameId, - @RequestParam("inning") Integer inning) { - Long uid = UidContextHolder.get(); - if (uid.equals(gameUid)){ - throw new ServiceException(BusiStatus.PARAMERROR); - } - gamePartnerOrderService.submit(uid, gameUid, gameId, inning); - return BusiResult.success(); - } - - /** - * 订单记录 - * - * @param uid - * @param searchType - * @param currSize - * @param pageSize - * @return - */ - @ApiOperation("订单记录") - @ApiImplicitParams({ - @ApiImplicitParam(name = "uid", value = "用户UID", required = true), - @ApiImplicitParam(name = "searchType", value = "0 我发起的 1 我收到的", required = true), - @ApiImplicitParam(name = "currSize", value = "当前页", required = true), - @ApiImplicitParam(name = "pageSize", value = "每页显示数", required = true), - }) - @GetMapping("record") - public BusiResult<List<GamePartnerOrderVo>> record(@RequestParam("uid") Long uid, - @RequestParam("searchType") Integer searchType, - @RequestParam("currSize") Integer currSize, - @RequestParam("pageSize") Integer pageSize) { - return BusiResult.success(gamePartnerOrderService.record(uid, searchType, currSize, pageSize)); - } - -} diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/gamepartner/GamePartnerUserController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/gamepartner/GamePartnerUserController.java deleted file mode 100644 index f2e4ad89d..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/gamepartner/GamePartnerUserController.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.accompany.business.controller.gamepartner; - -import com.accompany.business.service.gamepartner.GamePartnerUserService; -import com.accompany.business.vo.gamepartner.GamePartnerUserInfoVo; -import com.accompany.common.annotation.Authorization; -import com.accompany.common.result.BusiResult; -import com.accompany.common.result.PageResult; -import com.accompany.core.base.UidContextHolder; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@Api(tags = "游戏点单") -@RestController -@RequestMapping("/gamePartnerInfo") -public class GamePartnerUserController { - - @Autowired - private GamePartnerUserService service; - - @ApiOperation("游戏陪玩信息") - @ApiImplicitParams({ - @ApiImplicitParam(name = "page", value = "页数", required = true), - @ApiImplicitParam(name = "pageSize", value = "页长", required = true) - }) - @Authorization - @GetMapping("/pagePartner") - public BusiResult<PageResult<GamePartnerUserInfoVo>> list(int page, int pageSize) { - Long uid = UidContextHolder.get(); - Page<GamePartnerUserInfoVo> voPage = service.pageUserGamePartnerInfo(uid, page, pageSize); - return BusiResult.success(new PageResult<>(voPage)); - } - -} diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/gift/GiftV2Controller.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/gift/GiftV2Controller.java index df6b01ec8..85549beee 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/gift/GiftV2Controller.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/gift/GiftV2Controller.java @@ -6,11 +6,8 @@ import com.accompany.business.service.gift.GiftListService; import com.accompany.business.service.gift.GiftPanelService; import com.accompany.business.service.gift.GiftSendService; import com.accompany.business.service.gift.GiftService; -import com.accompany.business.service.netease.YidunCheckUtil; -import com.accompany.business.service.newuser.NewUserInRoomGiftService; import com.accompany.business.vo.GiftVo; import com.accompany.business.vo.gift.GiftPanelVo; -import com.accompany.business.vo.gift.NewUserGift; import com.accompany.business.vo.luckybag.LuckyBagPlayInfoVo; import com.accompany.common.annotation.Authorization; import com.accompany.common.constant.Constant; @@ -18,10 +15,7 @@ import com.accompany.common.device.DeviceInfo; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; import com.accompany.core.base.UidContextHolder; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.util.StringUtils; import com.accompany.core.vo.BaseResponseVO; -import com.google.common.util.concurrent.RateLimiter; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -34,7 +28,6 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import java.util.List; import java.util.Map; -import java.util.concurrent.TimeUnit; @Api(tags = "礼物") @@ -50,10 +43,6 @@ public class GiftV2Controller extends BaseController { private GiftService giftService; @Autowired private GiftPanelService giftPanelService; - @Autowired - private NewUserInRoomGiftService newUserInRoomGiftService; - - private RateLimiter sendAllLimiter = RateLimiter.create(1500.0); // 1秒1500并发 /** * 送礼物接口（金币+萝卜+背包） @@ -108,25 +97,6 @@ public class GiftV2Controller extends BaseController { return new BusiResult<>(giftListService.getLuckyBagPlayInfo(uid)); } - @ApiOperation("获取新用户进房礼物") - @GetMapping("newUser/inRoom") - public BusiResult<NewUserGift> getNewUserInRoomGift(Long roomUid, HttpServletRequest request) { - DeviceInfo deviceInfo = getDeviceInfo(request); - if (StringUtils.isBlank(deviceInfo.getDeviceId())) { - throw new ServiceException(BusiStatus.PARAMERROR, BusiStatus.DEVICE_ERROR.getReasonPhrase()); - } - try { - return BusiResult.success(newUserInRoomGiftService.getNewUserInRoomGift(roomUid, getUid(), deviceInfo.getChannel(), deviceInfo.getDeviceId())); - } catch (Exception e) { - if (e instanceof ServiceException) { - ServiceException exception = (ServiceException) e; - return BusiResult.fail(exception.getBusiStatus(), exception.getMessage()); - } else { - return BusiResult.fail(e.getMessage()); - } - } - } - @ApiOperation("礼物列表") @ApiImplicitParams({ @ApiImplicitParam(name = "roomUid", value = "房间uid"), diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/help/AliYunController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/help/AliYunController.java deleted file mode 100644 index 494a36766..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/help/AliYunController.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.accompany.business.controller.help; - -import com.accompany.business.common.BaseController; -import com.accompany.business.vo.helper.AliyunToken; -import com.accompany.common.config.AliyunConfig; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.BlankUtil; -import com.aliyuncs.DefaultAcsClient; -import com.aliyuncs.auth.sts.AssumeRoleRequest; -import com.aliyuncs.auth.sts.AssumeRoleResponse; -import com.aliyuncs.exceptions.ClientException; -import com.aliyuncs.http.MethodType; -import com.aliyuncs.profile.DefaultProfile; -import com.aliyuncs.profile.IClientProfile; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; - -@Slf4j -@Controller -@RequestMapping("/aliyun") -public class AliYunController extends BaseController { - - /** - * 获取日志产品的TOKEN - * - * @return - */ - @RequestMapping(value = "/log/gettoken") - @ResponseBody - public BusiResult getToken(String os, String appVersion) { - if (BlankUtil.isBlank(os) || BlankUtil.isBlank(appVersion)) { - return new BusiResult(BusiStatus.PARAMETERILLEGAL); - } - String endpoint = AliyunConfig.endPoint; - String accessKeyId = AliyunConfig.appKey; - String accessKeySecret = AliyunConfig.appSecret; - String roleArn = AliyunConfig.roleArn; - String regionId = AliyunConfig.regionId; - String product = AliyunConfig.product; - String roleSessionName = "client_" + os + "_" + appVersion; - log.info("getToken param ==>>>>os:{},appVersion:{}, endpoint:{},accessKeyId:{},accessKeySecret:{},roleArn:{}" + - ",regionId:{},product:{},roleSessionName:{}", os, appVersion, endpoint, accessKeyId, accessKeySecret - , roleArn, regionId, product, roleSessionName); - try { - // Init ACS Client - DefaultProfile.addEndpoint("", regionId, product, endpoint); - IClientProfile profile = DefaultProfile.getProfile(regionId, accessKeyId, accessKeySecret); - DefaultAcsClient client = new DefaultAcsClient(profile); - final AssumeRoleRequest request = new AssumeRoleRequest(); - request.setMethod(MethodType.POST); - request.setRoleArn(roleArn); - request.setRoleSessionName(roleSessionName); - final AssumeRoleResponse response = client.getAcsResponse(request); - AliyunToken aliyunToken = new AliyunToken(); - aliyunToken.setAccessKeyId(response.getCredentials().getAccessKeyId()); - aliyunToken.setAccessKeySecret(response.getCredentials().getAccessKeySecret()); - aliyunToken.setSecurityToken(response.getCredentials().getSecurityToken()); - aliyunToken.setExpiration(response.getCredentials().getExpiration()); - log.info("getToken result: {}", aliyunToken.toString()); - return new BusiResult(BusiStatus.SUCCESS, aliyunToken); - } catch (ClientException e) { - log.error("getToken error, code:" + e.getErrCode() + ", message:" + e.getErrMsg() + ", requestId:" - + e.getRequestId(), e); - return new BusiResult(BusiStatus.SERVERERROR); - } - } - - -} diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/help/AppStoreController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/help/AppStoreController.java deleted file mode 100644 index 0db6fdb7a..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/help/AppStoreController.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.accompany.business.controller.help; - -import com.accompany.business.service.AppStoreService; -import com.accompany.business.service.AppVersionService; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.util.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; - -/** - * Created by liuguofu on 2017/7/10. - */ -@Controller -@RequestMapping("/appstore") -public class AppStoreController { - @Autowired - private AppStoreService appStoreService; - @Autowired - AppVersionService appVersionService; - - private static final Logger logger = LoggerFactory.getLogger(AppStoreController.class); - @RequestMapping(value = "check",method = RequestMethod.GET) - @ResponseBody - public BusiResult checkAuditingIosVersion(@RequestParam String version, String channel){ - try { - boolean result = appVersionService.checkIsAuditingVersion(version, channel); - BusiResult busiResult = new BusiResult(BusiStatus.SUCCESS); - busiResult.setData(result); - return busiResult; - } catch (Exception e) { - logger.error("checkAuditingIosVersion error..version="+version,e); - return new BusiResult(BusiStatus.BUSIERROR); - } - } - - @RequestMapping(value = "forceupdate",method = RequestMethod.GET) - @ResponseBody - public BusiResult checkIsNeedForceUpdate(String version){ - if(StringUtils.isBlank(version)){ - return new BusiResult(BusiStatus.PARAMETERILLEGAL,"参数异常"); - } - BusiResult busiResult=null; - try { - busiResult=appStoreService.checkIsNeedForceUpdate(version); - } catch (Exception e) { - logger.error("checkIsNeedForceUpdate error..version="+version,e); - return new BusiResult(BusiStatus.BUSIERROR); - } - return busiResult; - } - - @RequestMapping(value = "running",method = RequestMethod.GET) - @ResponseBody - public BusiResult checkIsRunningVersion(String version){ - if(StringUtils.isBlank(version)){ - return new BusiResult(BusiStatus.PARAMETERILLEGAL,"参数异常"); - } - BusiResult busiResult=null; - try { - busiResult=appStoreService.checkIsNeedForceUpdate(version); - } catch (Exception e) { - logger.error("checkIsRunningVersion error..version="+version,e); - return new BusiResult(BusiStatus.BUSIERROR); - } - return busiResult; - } - - - - @RequestMapping(value = "get",method = RequestMethod.GET) - @ResponseBody - public BusiResult getVersionInfo(@RequestParam String version, String channel){ - try { - boolean result = appVersionService.checkIsAuditingVersion(version, channel); - BusiResult busiResult = new BusiResult(BusiStatus.SUCCESS); - busiResult.setData(result); - return busiResult; - } catch (Exception e) { - logger.error(e.getMessage()); - return new BusiResult(BusiStatus.BUSIERROR); - } - } - - -} diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/index/IndexController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/index/IndexController.java deleted file mode 100644 index d90051f36..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/index/IndexController.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.accompany.business.controller.index; - -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; - -/** - * @Author yubin - * @Description 跳转到官网的页面 - * @Date 2019-04-17 10:52 - */ -@Controller -@RequestMapping -public class IndexController { - - @RequestMapping("/index") - public String index(){ - - return "index"; - } -} diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/live/LiveAttestationController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/live/LiveAttestationController.java index 73fd061dd..e7c98c087 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/live/LiveAttestationController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/live/LiveAttestationController.java @@ -4,7 +4,6 @@ import com.accompany.business.common.BaseController; import com.accompany.business.model.live.LiveAttestation; import com.accompany.business.model.live.LiveSkillTypeVo; import com.accompany.business.mybatismapper.FansMapperExpand; -import com.accompany.business.service.certification.TwoFactorCertifyService; import com.accompany.business.service.live.LiveAttestationService; import com.accompany.business.service.live.LiveSkillService; import com.accompany.business.service.user.UsersService; @@ -40,8 +39,6 @@ public class LiveAttestationController extends BaseController { @Autowired private FansMapperExpand fansMapperExpand; @Autowired - private TwoFactorCertifyService twoFactorCertifyService; - @Autowired private UsersService usersService; @Autowired private LiveSkillService liveSkillService; @@ -142,16 +139,12 @@ public class LiveAttestationController extends BaseController { } try { Integer fansCount = fansMapperExpand.getFansCount(uid, u.getPartitionId()); - Boolean isCertify = twoFactorCertifyService.isCertifyUser(uid); - Boolean isPhone = twoFactorCertifyService.isBindPhone(uid); - logger.info("getSkillList fansCount:{},isCertify:{},isPhone:{}, uid:{}", fansCount, isCertify, isPhone, uid); + + logger.info("getSkillList fansCount:{}, uid:{}", fansCount, uid); String myFansCount = jedisService.get(RedisKey.fans_count.getKey()); int defaultSize = NumberUtils.toInt(myFansCount, 100); - if (!isCertify) { - return new BusiResult(BusiStatus.USER_NO_CERTIFY); - } // if (!isPhone) { // return new BusiResult(BusiStatus.PHONE_NO_BIND); // } diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/newUserStart/NewUserStartController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/newUserStart/NewUserStartController.java deleted file mode 100644 index 2fadc42ab..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/newUserStart/NewUserStartController.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.accompany.business.controller.newUserStart; - -import com.accompany.business.common.BaseController; -import com.accompany.business.service.newUserStart.NewUserSayHelloChannelService; -import com.accompany.business.vo.newUserStart.NewUserIndexSayHelloVo; -import com.accompany.business.vo.newUserStart.NewUserRoomSayHelloVo; -import com.accompany.common.result.BusiResult; -import com.accompany.core.model.Account; -import com.accompany.core.service.account.AccountService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; - -/** - * @author guojicong - * @date 2022/6/1 - */ -@RestController -@Api(value = "新用户指引") -@RequestMapping("/newUserStart") -public class NewUserStartController extends BaseController { - - @Autowired - private NewUserSayHelloChannelService channelService; - - @Autowired - private AccountService accountService; - - // 定义需要打指引的用户注册开始时间 - private static Date START_DATE; - - static { - try { - START_DATE = new SimpleDateFormat("yyyy-MM-dd").parse("2022-06-08"); - } catch (ParseException e) { - throw new RuntimeException(e); - } - } - - @GetMapping("/indexSayHello") - @ApiOperation("首页弹窗") - public BusiResult<NewUserIndexSayHelloVo> indexSayHello(HttpServletRequest request) { - // 注册时间判断 - Account account = accountService.getAccountByUid(getUid()); - if (account != null && account.getSignTime().after(START_DATE)) { - return new BusiResult<>(channelService.indexPop(getDeviceInfo(request).getChannel(), getUid())); - } - return new BusiResult<>(new NewUserIndexSayHelloVo(false)); - } - - @GetMapping("/roomSayHello") - @ApiOperation("房间弹窗") - public BusiResult<NewUserRoomSayHelloVo> roomSayHello(Long roomUid) { - // 注册时间判断 - Account account = accountService.getAccountByUid(getUid()); - if (account != null && account.getSignTime().after(START_DATE)) { - return new BusiResult<>(channelService.roomPop(getDeviceInfo(request).getChannel(), roomUid, getUid())); - } - return new BusiResult<>(new NewUserRoomSayHelloVo(false)); - } - - @GetMapping("/indexSayHelloTest") - public NewUserIndexSayHelloVo indexSayHello(String channel,Long uid) { - return channelService.indexPop(channel, uid); - } - @GetMapping("/roomSayHelloTest") - public NewUserRoomSayHelloVo indexSayHello(String channel,Long roomUid,Long uid) { - return channelService.roomPop(channel, roomUid, uid); - } -} diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/newbie/NewUserController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/newbie/NewUserController.java deleted file mode 100644 index 6b15b4b7c..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/newbie/NewUserController.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.accompany.business.controller.newbie; - -import com.accompany.business.service.newbie.NewUserService; -import com.accompany.business.vo.SimpleNewUserVo; -import com.accompany.common.annotation.Authorization; -import com.accompany.common.result.BusiResult; -import com.accompany.core.base.UidContextHolder; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -@Api(tags = "新用户推荐") -@RestController -@RequestMapping("/newUser") -public class NewUserController { - - @Autowired - private NewUserService service; - - @ApiOperation("分页") - @ApiImplicitParams({ - @ApiImplicitParam(value = "pageNum", name = "页码"), - @ApiImplicitParam(value = "pageSize", name = "页长"), - }) - @GetMapping("/page") - @Authorization - public BusiResult<List<SimpleNewUserVo>> page(int pageNum, int pageSize) { - Long uid = UidContextHolder.get(); - List<SimpleNewUserVo> pageList = service.page(uid, pageNum, pageSize); - return BusiResult.success(pageList); - } - -} diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/newbie/NewbieController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/newbie/NewbieController.java deleted file mode 100644 index a7f51ab23..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/newbie/NewbieController.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.accompany.business.controller.newbie; - -import com.accompany.business.common.BaseController; -import com.accompany.business.service.newbie.NewbieMessageService; -import com.accompany.business.service.newbie.NewbiePoolService; -import com.accompany.common.annotation.Authorization; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.ServiceException; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@Api(tags = "发现萌新", value = "发现萌新") -@RequestMapping("/newbie") -public class NewbieController extends BaseController { - - @Autowired - private NewbiePoolService newbiePoolService; - @Autowired - private NewbieMessageService newbieMessageService; - - @ApiOperation("发现萌新列表") - @GetMapping(value = "/poolList") - @Authorization - public BusiResult getPoolList(Integer page, Integer pageSize) { - return new BusiResult(newbiePoolService.getNewbieListByPage(getUid(), page)); - } - - @ApiOperation("打招呼用语列表") - @GetMapping(value = "/messageList") - @Authorization - public BusiResult getMessageList(Integer start, Integer pageSize) { - if (start < 0 || pageSize <= 0) { - throw new ServiceException(BusiStatus.PARAMETERILLEGAL); - } - return new BusiResult(newbieMessageService.getNewbieMessageList(start, pageSize)); - } - - @ApiOperation("打招呼") - @PostMapping(value = "/hello") - @Authorization - public BusiResult hello(Long helloUid, String message) { - if (message.length() > 50) { - throw new ServiceException(BusiStatus.PARAMETERILLEGAL); - } - String err = newbiePoolService.sayHello(getUid(), helloUid, message); - if (err != null) { - throw new ServiceException(err); - } - return new BusiResult(BusiStatus.SUCCESS); - } - - /** - * 初始化萌新池 - * - * @return - */ - @GetMapping(value = "/initPool") - public BusiResult initPool() { - newbiePoolService.initPool(); - return new BusiResult(BusiStatus.SUCCESS); - } - - - /** - * 新版初始化萌新池 - * @return - */ - @GetMapping(value = "/initPoolV2") - @Authorization - public BusiResult initPoolV2() { - newbiePoolService.initPoolV2(); - return new BusiResult(BusiStatus.SUCCESS); - } - - /** - * 更新萌新用户经验值 - * - * @return - */ - @GetMapping(value = "/updateLevel") - public BusiResult updateLevel() { - newbiePoolService.updateNewbieExperience(); - return new BusiResult(BusiStatus.SUCCESS); - } - -} diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/official/OfficialController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/official/OfficialController.java deleted file mode 100644 index 6a6885786..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/official/OfficialController.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.accompany.business.controller.official; - -import com.accompany.business.service.official.OfficialConfigService; -import com.accompany.business.vo.official.OfficialConfigVo; -import com.accompany.common.result.BusiResult; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -/** - * @author: liaozetao - * @date: 2024/1/17 15:51 - * @description: - */ -@Api(tags = "H5官网") -@RestController -@RequestMapping("/official") -public class OfficialController { - - @Autowired - private OfficialConfigService officialConfigService; - - @ApiOperation("获取配置") - @GetMapping("config") - public BusiResult<OfficialConfigVo> getConfig() { - return BusiResult.success(officialConfigService.getConfig()); - } - - /** - * 点击 - * - * @param downloadType - * @param downloadUrl - * @return - */ - @ApiOperation("点击") - @ApiImplicitParams({ - @ApiImplicitParam(name = "downloadType", value = "下载类型 0 iOS 1 Android", required = true), - @ApiImplicitParam(name = "downloadUrl", value = "下载链接") - }) - @GetMapping("click") - public BusiResult<Void> click(@RequestParam(value = "downloadType") Integer downloadType, @RequestParam(value = "downloadUrl", required = false) String downloadUrl) { - officialConfigService.click(downloadType, downloadUrl); - return BusiResult.success(); - } -} diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/phone/PhoneAuthApplyRecordController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/phone/PhoneAuthApplyRecordController.java deleted file mode 100644 index 20af98b73..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/phone/PhoneAuthApplyRecordController.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.accompany.business.controller.phone; - -import com.accompany.business.common.BaseController; -import com.accompany.common.device.DeviceInfo; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.service.phone.PhoneAuthApplyRecordService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; - -/** - * 手机授权码注册管理 - * - * @author lzm - * @email - * @date 2022-11-22 17:30:12 - */ -@Slf4j -@RestController -@RequestMapping("/phone/auth") -public class PhoneAuthApplyRecordController extends BaseController { - @Autowired - private PhoneAuthApplyRecordService phoneAuthApplyRecordService; - - @ApiOperation("手机号申请授权码操作") - @ApiImplicitParams({ - @ApiImplicitParam(name = "phoneAreaCode", value = "区号", required = true, dataType = "String"), - @ApiImplicitParam(name = "phone", value = "手机号 如: 178xxxxxxxx", required = true, dataType = "String"), - }) - @PostMapping("/apply") - public BusiResult apply(String phoneAreaCode, String phone) { - phoneAuthApplyRecordService.applyAuthCode(phone,phoneAreaCode); - return new BusiResult(BusiStatus.SUCCESS); - } - - - - @ApiOperation("綁定手机授權碼操作") - @ApiImplicitParams({ - @ApiImplicitParam(name = "phoneAreaCode", value = "区号", required = true, dataType = "String"), - @ApiImplicitParam(name = "phone", value = "手机号 如: 178xxxxxxxx", required = true, dataType = "String"), - @ApiImplicitParam(name = "authCode", value = "授權碼", required = true, dataType = "String"), - }) - @PostMapping("/bound") - public BusiResult boundAuthCode(HttpServletRequest request, String authCode) { - Long uid = getUid(); - DeviceInfo deviceInfo = getDeviceInfo(request); - phoneAuthApplyRecordService.boundAuthCode(uid,authCode,deviceInfo); - return new BusiResult(BusiStatus.SUCCESS); - } - - @ApiOperation("用戶綁定的手機號是否 輸入過對應的授權碼") - @GetMapping("/isBoundPhoneAuthCode") - public BusiResult<Boolean> isBoundPhoneAuthCode() { - return BusiResult.success(true); - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/phone/PhoneAuthRecordController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/phone/PhoneAuthRecordController.java deleted file mode 100644 index b8fcd43d0..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/phone/PhoneAuthRecordController.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.accompany.business.controller.phone; - -import com.accompany.business.common.BaseController; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 用户填写授权码记录表 - * - * @author lzm - * @email - * @date 2022-11-22 17:30:12 - */ -@Slf4j -@RestController -@RequestMapping("/phone/auth/record") -public class PhoneAuthRecordController extends BaseController { - -} \ No newline at end of file diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/RoomBlindDateController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/RoomBlindDateController.java index f19549f3f..f4ae7d92b 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/RoomBlindDateController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/RoomBlindDateController.java @@ -15,7 +15,6 @@ import com.accompany.common.constant.Constant; import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; -import com.accompany.core.annotation.LogTime; import com.accompany.core.exception.ServiceException; import com.accompany.core.model.Room; import com.accompany.core.service.common.JedisService; @@ -64,7 +63,6 @@ public class RoomBlindDateController { @ApiOperation("状态变更,返回最新状态") @PostMapping("/state") - @LogTime public BaseResponseVO<Integer> next(BlindDateStateChangeRequest request) { String lockKey = String.valueOf(request.getRoomUserId()); boolean locked = false; @@ -148,7 +146,6 @@ public class RoomBlindDateController { @ApiOperation("选择") @PostMapping("/connection") - @LogTime public BaseResponseVO<Void> connection(BlindDateConnectionRequest request) { BlindDateRoundConnectionDTO blindDateRoundConnectionDTO = new BlindDateRoundConnectionDTO(); Room roomByUserId = roomService.getRoomByUid(request.getRoomUserId()); @@ -167,7 +164,6 @@ public class RoomBlindDateController { @ApiOperation("开启相亲") @Authorization @RequestMapping(value = "/enable", method = RequestMethod.POST) - @LogTime public BaseResponseVO<Void> openBlindDate(Long roomUid) { blindDateService.updateBlindDateInfo(roomUid, true); return new BaseResponseVO<>(); @@ -176,7 +172,6 @@ public class RoomBlindDateController { @ApiOperation("关闭相亲") @Authorization @RequestMapping(value = "/disable", method = RequestMethod.POST) - @LogTime public BaseResponseVO<Void> closeBlindDate(Long roomUid) { blindDateService.updateBlindDateInfo(roomUid, false); return new BaseResponseVO<>(); @@ -184,7 +179,6 @@ public class RoomBlindDateController { @ApiOperation("获取相亲配置") @RequestMapping(value = "/getConfig", method = RequestMethod.GET) - @LogTime public BaseResponseVO<BlindDataConfigVO> getBlindDataConfig() { BlindDataConfigVO blindDataConfig = blindDateService.getBlindDataConfig(); return new BaseResponseVO<>(blindDataConfig); diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/RoomController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/RoomController.java index 000f2177f..a5157e498 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/RoomController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/RoomController.java @@ -72,8 +72,6 @@ public class RoomController extends BaseController { @Autowired private RoomService roomService; @Autowired - private LiveAttestationService liveAttestationService; - @Autowired private BoxCommonService boxCommonService; @Autowired private RedEnvelopeService redEnvelopeService; @@ -106,6 +104,8 @@ public class RoomController extends BaseController { private SysConfService sysConfService; private RateLimiter roomGetLimiter = RateLimiter.create(1000); + @Autowired + private LiveAttestationService liveAttestationService; @SneakyThrows diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/TopicBoxItemController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/TopicBoxItemController.java deleted file mode 100644 index 76c708189..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/TopicBoxItemController.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.accompany.business.controller.user; - -import com.accompany.business.common.BaseController; -import com.accompany.business.model.TopicBoxItemVo; -import com.accompany.business.service.user.TopicBoxItemService; -import com.accompany.common.constant.Constant; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; - -import java.util.List; - -/** - * ｛这里添加描述｝ - * - * @author fangchengyan - * @date 2019-05-30 17:19 - */ -@Controller -@RequestMapping("topicBoxItem") -public class TopicBoxItemController extends BaseController { - - @Autowired - private TopicBoxItemService topicBoxItemService; - - @ResponseBody - @RequestMapping("list") - public BusiResult list() { - List<TopicBoxItemVo> topicBoxItems = topicBoxItemService.list(Constant.status.valid); - BusiResult<List> result = new BusiResult<>(BusiStatus.SUCCESS); - result.setData(topicBoxItems); - return result; - } - -} diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/TopicBoxMsgController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/TopicBoxMsgController.java deleted file mode 100644 index 2a6a2e0ee..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/TopicBoxMsgController.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.accompany.business.controller.user; - -import com.accompany.business.common.BaseController; -import com.accompany.business.service.user.TopicBoxMsgService; -import com.accompany.common.constant.Constant; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; - -/** - * ｛这里添加描述｝ - * - * @author fangchengyan - * @date 2019-05-30 17:34 - */ -@Controller -@RequestMapping("/topicBoxMsg") -public class TopicBoxMsgController extends BaseController { - - private Logger logger = LoggerFactory.getLogger(TopicBoxMsgController.class); - - @Autowired - private TopicBoxMsgService topicBoxMsgService; - - /** - * - * @param from 消息的发送方 - * @param to 消息的接收方 - * @param type 1-话匣子消息，2-抛点数消息 - * @return - */ - @ResponseBody - @RequestMapping("/report") - public BusiResult report(Long from, Long to, Integer type) { - logger.info("话匣子消息上报，from:{}, to:{}, type:{}", from, to, type); - if (null == from || null == to || null == type) { - return new BusiResult(BusiStatus.PARAMERROR); - } - if(type != Constant.TopicBoxMsgType.TOPIC_BOX && type != Constant.TopicBoxMsgType.THROW_POINT) { - return new BusiResult(BusiStatus.PARAMERROR); - } - boolean flag = topicBoxMsgService.report(from, to, type); - if (flag) { - return new BusiResult(BusiStatus.SUCCESS); - } else { - return new BusiResult(BusiStatus.UNKNOWN); - } - } - - @ResponseBody - @RequestMapping("/canSend") - public BusiResult canSend(Long from, Long to) { - if(null == from || null == to) { - return new BusiResult(BusiStatus.PARAMERROR); - } - BusiResult result = new BusiResult(BusiStatus.SUCCESS); - result.setData(topicBoxMsgService.canSend(from, to)); - return result; - } -} diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/UserYearReportController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/UserYearReportController.java deleted file mode 100644 index 30b8691a8..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/UserYearReportController.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.accompany.business.controller.user; - -import com.accompany.business.common.BaseController; -import com.accompany.business.service.user.UserYearReportService; -import com.accompany.business.vo.user.UserYearReportVo; -import com.accompany.common.annotation.Authorization; -import com.accompany.common.result.BusiResult; -import io.swagger.annotations.Api; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; - -@Api(tags = "年度报告") -@RequestMapping("/user/yearReport") -@RestController -public class UserYearReportController extends BaseController { - - @Autowired - private UserYearReportService service; - - @GetMapping("/get") - @Authorization - public BusiResult<UserYearReportVo> get(HttpServletRequest request) { - Long uid = getUid(request); - UserYearReportVo userVo = service.getUserYearReport(uid); - return new BusiResult<>(userVo); - } - - -} diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/withdraw/SmsWithdrawController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/withdraw/SmsWithdrawController.java deleted file mode 100644 index 5dcc5491b..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/withdraw/SmsWithdrawController.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.accompany.business.controller.withdraw; - -import com.accompany.business.common.BaseController; -import com.accompany.business.service.withdraw.SmsWithdrawService; -import com.accompany.common.annotation.Authorization; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.service.user.PhoneBlackService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; - -/** - * @author: liaozetao - * @date: 2023/7/25 18:02 - * @description: - */ -@Api(tags = "提现短信管理") -@RestController -@RequestMapping(value = "/withDraw") -public class SmsWithdrawController extends BaseController { - - @Autowired - private PhoneBlackService phoneBlackService; - - @Autowired - private SmsWithdrawService withdrawService; - - /** - * 绑定手机号 - * - * @param phone - * @param code - * @param phoneAreaCode - * @return - */ - @ApiOperation("绑定手机号") - @PostMapping(value = "/phone") - @Authorization - public BusiResult<Boolean> boundPhone(@RequestParam("phone") String phone, - @RequestParam("code") String code, - @RequestParam(value = "phoneAreaCode", required = false) String phoneAreaCode, - HttpServletRequest request) { - phone = decryptSensitiveInfo(request, phone); - if (phoneBlackService.checkIsNeedIntercept(phone)) { - throw new ServiceException(BusiStatus.PHONE_NUMBER_BE_INTERCEPTED); - } - return BusiResult.success(withdrawService.boundPhone(getUid(), phone, code, phoneAreaCode)); - } - -} diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/withdraw/WithdrawAccountDtlController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/withdraw/WithdrawAccountDtlController.java deleted file mode 100644 index e746e11c3..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/withdraw/WithdrawAccountDtlController.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.accompany.business.controller.withdraw; - -import com.accompany.business.service.withdraw.WithdrawAccountDtlService; -import com.accompany.business.vo.withdraw.WithdrawAccountDtlVo; -import com.accompany.common.annotation.H5Authorization; -import com.accompany.common.result.BusiResult; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - * @author: liaozetao - * @date: 2023/7/11 11:57 - * @description: - */ -@Api(tags = "提现账户管理") -@RestController -@RequestMapping(value = "/withdrawAccountDtl") -public class WithdrawAccountDtlController { - - @Autowired - private WithdrawAccountDtlService withdrawAccountDtlService; - - /** - * 账户列表 - * - * @param uid - * @return - */ - @H5Authorization - @ApiOperation("账户列表") - @ApiImplicitParam(name = "uid", value = "用户ID") - @GetMapping("getAccounts") - public BusiResult<List<WithdrawAccountDtlVo>> getAccounts(@RequestParam(value = "uid", required = false) Long uid) { - return BusiResult.success(withdrawAccountDtlService.getAccounts(uid)); - } - -} diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/withdraw/WithdrawUserAccountController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/withdraw/WithdrawUserAccountController.java deleted file mode 100644 index 26d2a4a98..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/withdraw/WithdrawUserAccountController.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.accompany.business.controller.withdraw; - -import com.accompany.business.dto.withdraw.WithdrawAmountHolder; -import com.accompany.business.model.withdraw.WithdrawUserAccount; -import com.accompany.business.service.withdraw.WithdrawUserAccountService; -import com.accompany.business.vo.withdraw.WithdrawUserAccountVo; -import com.accompany.common.annotation.H5Authorization; -import com.accompany.common.result.BusiResult; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * @author: liaozetao - * @date: 2023/7/11 14:07 - * @description: - */ -@Api(tags = "提现银行管理") -@RestController -@RequestMapping(value = "/withdrawUserAccount") -public class WithdrawUserAccountController { - - @Autowired - private WithdrawUserAccountService withdrawUserAccountService; - - /** - * 保存 - * - * @param account - * @return - */ - @H5Authorization - @ApiOperation("保存") - @PostMapping("save") - public BusiResult<Void> save(@RequestBody WithdrawUserAccount account) { - withdrawUserAccountService.saveAccount(account); - return BusiResult.success(); - } - - /** - * 列表 - * - * @param uid - * @return - */ - @H5Authorization - @ApiOperation("列表") - @ApiImplicitParam(name = "uid", value = "用户ID") - @GetMapping("list") - public BusiResult<List<WithdrawUserAccountVo>> accountList(@RequestParam("uid") Long uid) { - return BusiResult.success(withdrawUserAccountService.accountList(uid)); - } - - /** - * 汇率计算 - * - * @param uid - * @param accountType - * @param goldNum - * @return - */ - @H5Authorization - @ApiOperation("汇率计算") - @ApiImplicitParams({ - @ApiImplicitParam(name = "uid", value = "用户ID", required = true), - @ApiImplicitParam(name = "accountType", value = "账户类型", required = true), - @ApiImplicitParam(name = "goldNum", value = "金币", required = true) - }) - @GetMapping("calculate") - public BusiResult<WithdrawAmountHolder> calculate(@RequestParam("uid") Long uid, @RequestParam("accountType") Integer accountType, @RequestParam("goldNum") Double goldNum) { - return BusiResult.success(withdrawUserAccountService.calculate(uid, accountType, goldNum.intValue())); - } - - /** - * 提现申请 - * - * @param uid - * @param accountType - * @param goldNum - * @return - */ - @H5Authorization - @ApiOperation(value = "提现申请", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE) - @ApiImplicitParams({ - @ApiImplicitParam(name = "uid", value = "用户ID", required = true), - @ApiImplicitParam(name = "accountType", value = "账户类型", required = true), - @ApiImplicitParam(name = "goldNum", value = "金币", required = true) - }) - @PostMapping("apply") - public BusiResult<Void> apply(@RequestParam("uid") Long uid, @RequestParam("accountType") Integer accountType, @RequestParam("goldNum") Double goldNum) { - withdrawUserAccountService.apply(uid, accountType, goldNum.intValue()); - return BusiResult.success(); - } - -} diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/withdraw/WithdrawUserController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/withdraw/WithdrawUserController.java deleted file mode 100644 index 3057b26bb..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/withdraw/WithdrawUserController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.accompany.business.controller.withdraw; - -import com.accompany.business.model.withdraw.WithdrawConfig; -import com.accompany.business.service.withdraw.WithdrawUserAccountService; -import com.accompany.common.annotation.H5Authorization; -import com.accompany.common.result.BusiResult; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -/** - * @author: liaozetao - * @date: 2023/7/10 18:57 - * @description: - */ -@Api(tags = "提现管理") -@RestController -@RequestMapping(value = "/withdrawUser") -public class WithdrawUserController { - - @Autowired - private WithdrawUserAccountService withdrawUserAccountService; - - /** - * 提现配置 - * - * @param uid - * @return - */ - @H5Authorization - @ApiOperation("提现配置") - @GetMapping("config") - public BusiResult<WithdrawConfig> config(@RequestParam("uid") Long uid) { - return BusiResult.success(withdrawUserAccountService.config(uid)); - } - -} diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/listener/ApplicationInitListener.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/listener/ApplicationInitListener.java deleted file mode 100644 index b0763d9cb..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/listener/ApplicationInitListener.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.accompany.business.listener; - -import com.accompany.business.service.level.LevelService; -import com.accompany.common.utils.EnvComponent; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; -import org.springframework.context.ApplicationListener; -import org.springframework.context.event.ContextRefreshedEvent; -import org.springframework.stereotype.Component; - -/** - * @description 容器启动的监听器 - */ -@Slf4j -@Component -public class ApplicationInitListener implements ApplicationListener<ContextRefreshedEvent> { - - @Autowired - private EnvComponent envComponent; - - @Override - public void onApplicationEvent(ContextRefreshedEvent event) { - //容器Bean初始化完成后 - if (event.getApplicationContext().getParent() != null) { - log.info("+++++++++++++++ Application context init finish"); - // TODO 系统初始化代码可以放在下面 - } - } -} diff --git a/accompany-business/accompany-business-web/src/test/java/servicetest/LuckySeaActServiceTest.java b/accompany-business/accompany-business-web/src/test/java/servicetest/LuckySeaActServiceTest.java deleted file mode 100644 index af0539b93..000000000 --- a/accompany-business/accompany-business-web/src/test/java/servicetest/LuckySeaActServiceTest.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * 文 件 名: ClanServiceTest - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2020/11/18 - * 修改人: - * 修改内容: - * 修改时间: - */ -package servicetest; - -import com.accompany.business.BusinessApplication; -import com.accompany.business.service.activities.luckySea.ActivitiesLuckySeaService; -import com.accompany.business.service.activities.vo.LuckySeaRankVo; -import com.alibaba.fastjson.JSON; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -/** - * <br>类描述: - * <br>功能详细描述: - * - * @author H1 - * @date [2020/11/18] - */ -@RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = BusinessApplication.class, webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT) -public class LuckySeaActServiceTest { - - @Autowired - private ActivitiesLuckySeaService activitiesLuckySeaService; - - - @Test - public void ListRankTest() { - Long uid = 936573L; - Integer type = 1; - LuckySeaRankVo rankVo = activitiesLuckySeaService.listRank(type, null, null, uid); - System.out.println(JSON.toJSONString(rankVo)); - } -} diff --git a/accompany-mq/accompany-mq-web/src/main/java/com/accompany/mq/consumer/MyCardChargeMessageConsumer.java b/accompany-mq/accompany-mq-web/src/main/java/com/accompany/mq/consumer/MyCardChargeMessageConsumer.java deleted file mode 100644 index 967f25fa4..000000000 --- a/accompany-mq/accompany-mq-web/src/main/java/com/accompany/mq/consumer/MyCardChargeMessageConsumer.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.accompany.mq.consumer; - -import cn.hutool.core.util.StrUtil; -import com.accompany.business.service.mycard.MyCardBizService; -import com.accompany.common.constant.Constant; -import com.accompany.common.redis.RedisKey; -import com.accompany.core.service.common.JedisService; -import com.accompany.mq.constant.MqConstant; -import com.accompany.mq.listener.AbstractMessageListener; -import com.accompany.mq.model.ChargeMqMessage; -import com.accompany.mq.producer.MQMessageProducer; -import com.accompany.payment.model.ChargeRecord; -import com.accompany.payment.service.ChargeRecordService; -import lombok.extern.slf4j.Slf4j; -import org.apache.rocketmq.spring.annotation.ConsumeMode; -import org.apache.rocketmq.spring.annotation.RocketMQMessageListener; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.stereotype.Component; - -/** - * @author: liaozetao - * @date: 2024/1/24 11:30 - * @description: - */ -@Slf4j -@Component -@ConditionalOnProperty(name = "spring.application.name", havingValue = "web") -@RocketMQMessageListener(topic = MqConstant.CHANGE_TOPIC, consumerGroup = MqConstant.CHARGE_CONSUME_GROUP, consumeMode = ConsumeMode.ORDERLY) -public class MyCardChargeMessageConsumer extends AbstractMessageListener<ChargeMqMessage> { - - @Autowired - private ChargeRecordService chargeRecordService; - - @Autowired - private MyCardBizService myCardBizService; - - @Autowired - private MQMessageProducer mqMessageProducer; - @Autowired - private JedisService jedisService; - - @Override - protected void onMessage(ChargeMqMessage object) { - String chargeRecordId = object.getChargeRecordId(); - ChargeRecord chargeRecord = chargeRecordService.getChargeRecordById(chargeRecordId); - if (chargeRecord == null) { - return; - } - String channel = chargeRecord.getChannel(); - if (!Constant.ChargeChannel.my_card.equals(channel)) { - return; - } - Byte chargeStatus = chargeRecord.getChargeStatus(); - if (Constant.ChargeRecordStatus.finish.equals(chargeStatus)) { - log.info("订单 {} 已完成", chargeRecordId); - return; - } - log.info("开始执行MyCard mq监控流程 chargeRecordId : {}", chargeRecordId); - boolean isSuccess = myCardBizService.updateOrder(chargeRecordId); - String countStr = jedisService.hget(RedisKey.charge_record_mq_count.getKey(), chargeRecordId); - if (!isSuccess) { - if (StrUtil.isNotEmpty(countStr) && Integer.parseInt(countStr) >= 3) { - log.error("chargeRecordId : {}重试终止", chargeRecordId); - return; - } - log.info("send retry mq chargeRecordId : {}", chargeRecordId); - jedisService.hincr(RedisKey.charge_record_mq_count.getKey(), chargeRecordId); - ChargeMqMessage message = new ChargeMqMessage(); - message.setChargeRecordId(chargeRecordId); - mqMessageProducer.send(MqConstant.CHANGE_TOPIC, message, 9); - } - } -} diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/activity/ActCallBattlePreWarningTask.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/activity/ActCallBattlePreWarningTask.java deleted file mode 100644 index b1aee07f0..000000000 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/activity/ActCallBattlePreWarningTask.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * 文 件 名: LuckySeaPreWarningTask - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/9/23 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.scheduler.task.activity; - -import com.accompany.business.service.callbattle.ActCallBattlePreWarningService; -import com.accompany.scheduler.base.BaseTask; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; - -/** - * <br>类描述: - * <br>功能详细描述: - * - * @author H1 - * @date [2021/9/23] - */ -@Component -@Slf4j -public class ActCallBattlePreWarningTask extends BaseTask { - - @Autowired - private ActCallBattlePreWarningService actCallBattlePreWarningService; - - /** - * 自动轮播守护星球 - */ - @Scheduled(cron = "0 0 */1 * * ?") - public void handleBroadcastTask() { - try { - log.info("开始自动轮播守护星球"); - actCallBattlePreWarningService.handleBroadcast(); - log.info("结束自动轮播守护星球"); - } catch (Exception e) { - log.error("开始自动轮播守护星球失败...", e); - } - } -} diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/activity/ActCallBattleTask.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/activity/ActCallBattleTask.java deleted file mode 100644 index 7e112de10..000000000 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/activity/ActCallBattleTask.java +++ /dev/null @@ -1,191 +0,0 @@ -/* - * 文 件 名: LuckySeaActTask - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/1/6 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.scheduler.task.activity; - -import com.accompany.business.dto.activity.callbattle.ActCallBattleConfig; -import com.accompany.business.model.callbattle.ActCallBattleItem; -import com.accompany.business.service.callbattle.ActCallBattleBizService; -import com.accompany.business.service.callbattle.ActCallBattlePreWarningService; -import com.accompany.business.service.callbattle.ActCallBattleStockService; -import com.accompany.business.vo.callbattle.ActCallBattleInfoVo; -import com.accompany.common.constant.Constant; -import com.accompany.common.redis.RedisKey; -import com.accompany.core.service.SysConfService; -import com.accompany.scheduler.base.BaseTask; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.redisson.api.RLock; -import org.redisson.api.RedissonClient; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.context.event.ApplicationStartedEvent; -import org.springframework.context.ApplicationListener; -import org.springframework.stereotype.Component; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; -import java.util.Optional; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; - -/** - * <br>类描述: - * <br>功能详细描述: - * - * @author H1 - * @date [2021/1/6] - */ -@Component -@Slf4j -public class ActCallBattleTask extends BaseTask implements ApplicationListener<ApplicationStartedEvent> { - - @Autowired - private SysConfService sysConfService; - @Autowired - private ActCallBattlePreWarningService actCallBattlePreWarningService; - @Autowired - private RedissonClient redissonClient; - @Autowired - private ActCallBattleBizService actCallBattleBizService; - @Autowired - private ActCallBattleStockService actCallBattleStockService; - - private volatile static boolean taskStarted = false; - - public void runTask() { - RLock lock = redissonClient.getLock(RedisKey.call_battle_run_task.getKey()); - try { - // 加锁,保证只有一个线程能执行这个流程 - boolean isHasLock = lock.tryLock(30, -1, TimeUnit.SECONDS); - - if (isHasLock) { - log.info("召唤战斗活动, 获取锁成功"); - while (true) { - // 活动开关是否开着 - Boolean actSwitch = Optional.of( - Boolean.parseBoolean(sysConfService.getSysConfValueById(Constant.SysConfId.CALL_BATTLE_SWITCH))).orElse(false); - log.info("召唤战斗活动, 开关状态: {}", actSwitch); - if (actSwitch) { - String roundId = null; - Date nextRoundStartTime = null; - BigDecimal stock = actCallBattleStockService.getStock(); - // 获取游戏的配置 - List<ActCallBattleItem> itemList = actCallBattleBizService.listActItem(); - ActCallBattleConfig timeConfig = actCallBattleBizService.getActTimeConfig(); - long drawMills = 0L; - try { - boolean needCreateNewAct = true; - boolean needWaitUserDraw = true; - Integer waitUserDrawTime = timeConfig.getChooseStageTime(); - // 处理异常活动 - ActCallBattleInfoVo actInfo = actCallBattleBizService.getNewestActInfo(null); - if (null != actInfo && StringUtils.isNotBlank(actInfo.getRoundId())) { - if (actInfo.getStatus().equals(Constant.LuckySeaActStatus.CHOOSE_STAGE)) { - needCreateNewAct = false; - roundId = actInfo.getRoundId(); - Long intervalSecond = (System.currentTimeMillis() - actInfo.getStartTime().getTime()) / 1000; - log.info("召唤战斗活动, 上一轮投注时间发生异常的活动到现在的间隔时间{}秒, roundId:{}", intervalSecond, roundId); - if (intervalSecond <= timeConfig.getChooseStageTime()) { - waitUserDrawTime = timeConfig.getChooseStageTime() - intervalSecond.intValue(); - log.info("召唤战斗活动, 上一轮投注时间发生异常的活动留给用户的下注时间{}秒", waitUserDrawTime); - } else { - log.info("召唤战斗活动, 上一轮投注时间发生异常的活动直接进行开奖, roundId:{}", roundId); - needWaitUserDraw = false; - } - } else if (actInfo.getStatus().equals(Constant.LuckySeaActStatus.DRAWING)) { - needCreateNewAct = false; - needWaitUserDraw = false; - roundId = actInfo.getRoundId(); - log.info("召唤战斗活动, 上一轮投注时间发生异常的活动直接进行开奖, roundId:{}", roundId); - } - } - // 创建新的一轮游戏 - if (needCreateNewAct) { - roundId = actCallBattleBizService.createNewRoundAct(nextRoundStartTime,timeConfig.getChooseStageTime() ); - } - // 等待用户投碎片 - if (needWaitUserDraw) { - log.info("召唤战斗活动, 开始等待用户投入碎片, currTime: {}", System.currentTimeMillis()); - Thread.sleep(waitUserDrawTime * 1000); - log.info("召唤战斗活动, 结束等待用户投入碎片, currTime: {}", System.currentTimeMillis()); - } - actCallBattleBizService.updateActStatus(roundId, Constant.LuckySeaActStatus.DRAWING); - // 开奖 - drawMills = actCallBattleBizService.actDraw(itemList, roundId, timeConfig, stock); - } catch (Exception e) { - // 更新活动状态, 此轮游戏标识为异常，不开始下一轮游戏 - log.error("召唤战斗活动开奖时出现异常, roundId: " + roundId, e); - actCallBattleBizService.updateActStatus(roundId, Constant.LuckySeaActStatus.GAME_ABNORMAL); - actCallBattleBizService.compensateUserPieceWhenGameAbnormal(roundId, stock); - break; - } - try { - // 异步更新用户抽奖记录 - actCallBattleBizService.updateUserDrawRecordAsync(roundId, itemList); - // 等待开奖动画与页面渲染开奖结果时间 - long sleepMills = (timeConfig.getDrawOverStageTime() + timeConfig.getWaitingDrawStageTime()) * 1000L - - drawMills; - if (sleepMills > 0) { - log.info("召唤战斗活动, 等待开奖动画与页面渲染开奖结果时间{}毫秒", sleepMills); - Thread.sleep(sleepMills); - } - log.info("召唤战斗活动此轮结束, roundId:{}", roundId); - // 异步更新活动endTime - nextRoundStartTime = new Date(); - actCallBattleBizService.endAct(roundId, nextRoundStartTime); - // 进行预警数据统计 - actCallBattlePreWarningService.handleGoldPreWarning(); - } catch (Exception e) { - // 更新活动状态 - log.error("召唤战斗活动更新用户抽奖记录与分发奖励时出现异常, roundId: " + roundId, e); - actCallBattleBizService.updateActStatus(roundId, Constant.LuckySeaActStatus.SUCCESS_DRAW_UPDATE_DATA_FAIL); - } - } else { - try { - log.info("召唤战斗活动, 开关未开启，线程进入休眠: {}", actSwitch); - Thread.sleep(60 * 1000); - continue; - } catch (Exception e){ - log.error("召唤战斗活动线程休眠时出现异常", e); - } - } - } - } else { - log.warn("召唤战斗活动, 获取锁失败"); - } - } catch (Exception e) { - log.error("启动召唤战斗活动流程任务异常",e); - } finally { - if (lock.isLocked()) { - log.info("召唤战斗活动, 释放锁"); - lock.unlock(); - } - } - } - - @Override - public void onApplicationEvent(ApplicationStartedEvent event) { - log.info("ready to start lucky sea task"); - if (!ActCallBattleTask.taskStarted) { - synchronized (ActCallBattleTask.class) { - if (!ActCallBattleTask.taskStarted) { - ExecutorService executorService = Executors.newSingleThreadExecutor(); - executorService.execute(() -> { - log.info("start lucky sea task"); - ActCallBattleTask.taskStarted = true; - runTask(); - }); - } - } - } - } -} diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/activity/LuckySeaActTask.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/activity/LuckySeaActTask.java deleted file mode 100644 index 12fc29e9a..000000000 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/activity/LuckySeaActTask.java +++ /dev/null @@ -1,257 +0,0 @@ -package com.accompany.scheduler.task.activity; - -import com.accompany.business.dto.luckysea.LuckySeaActConfig; -import com.accompany.business.model.activity.luckysea.LuckySeaActInfo; -import com.accompany.business.model.activity.luckysea.LuckySeaItem; -import com.accompany.business.model.activity.luckysea.LuckySeaItemGroup; -import com.accompany.business.model.activity.luckysea.LuckySeaUserDrawRecord; -import com.accompany.business.service.LuckySeaPreWarningService; -import com.accompany.business.service.activities.luckySea.*; -import com.accompany.common.constant.Constant; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.common.utils.StringUtils; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.service.SysConfService; -import com.accompany.scheduler.base.BaseTask; -import com.alibaba.fastjson.JSON; -import lombok.extern.slf4j.Slf4j; -import org.redisson.api.RAtomicLong; -import org.redisson.api.RLock; -import org.redisson.api.RedissonClient; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import org.springframework.util.StopWatch; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.HashSet; -import java.util.List; -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; - -@Component -@Slf4j -public class LuckySeaActTask extends BaseTask implements InitializingBean, Runnable { - - @Autowired - private SysConfService sysConfService; - @Autowired - private RedissonClient redissonClient; - @Autowired - private LuckySeaActConfigService configService; - @Autowired - private LuckySeaItemService itemService; - @Autowired - private LuckySeaItemGroupService itemGroupService; - @Autowired - private LuckySeaActInfoService actInfoService; - @Autowired - private LuckySeaPreWarningService preWarningService; - @Autowired - private LuckySeaUserDrawRecordService drawRecordService; - @Autowired - private LuckySeaStockService stockService; - @Autowired - private LuckySeaTicketService ticketService; - @Autowired - private LuckySeaSettlementService settlementService; - @Autowired - private LuckySeaDrawService drawService; - - @Override - public void afterPropertiesSet() throws Exception { - Executors.newSingleThreadExecutor().execute(this); - } - - @Override - public void run() { - while (true) { - // 活动开关是否开着 - boolean actSwitch = Boolean.parseBoolean(sysConfService.getDefaultSysConfValueById(Constant.SysConfId.LUCKY_SEA_SWITCH, "false")); - log.info("春日游园活动, 开关状态: {}", actSwitch); - if (!actSwitch){ - try { - log.info("春日游园活动, 开关未开启，线程进入休眠: {}", actSwitch); - Thread.sleep(60 * 1000); - continue; - } catch (Exception e){ - log.error("春日游园活动线程休眠时出现异常", e); - } - } - start(); - } - } - - public void start() { - LuckySeaActConfig timeConfig = configService.getLuckySeaTimeConfig(); - int waitUserDrawTime = timeConfig.getChooseStageTime(); - int totalTime = waitUserDrawTime + timeConfig.getWaitingDrawStageTime() + timeConfig.getDrawOverStageTime(); - - List<LuckySeaItem> itemList = itemService.listItemFromDB(); - List<LuckySeaItemGroup> itemGroupList = itemGroupService.listItemGroup(); - log.info("春日游园活动, 当前开奖的活动信息, itemList:{} itemGroupList:{}", JSON.toJSONString(itemList), JSON.toJSONString(itemGroupList)); - - String roundId = null; - long drawMills = 0L; - - // 加锁,确保创建与开奖是单线程执行 - boolean locked = false; - RLock lock = redissonClient.getLock(RedisKey.lucky_sea_run_task.getKey()); - try { - locked = lock.tryLock(10, totalTime, TimeUnit.SECONDS); - if (!locked){ - log.error("春日游园活动, 获取锁失败"); - throw new ServiceException(BusiStatus.SERVERBUSY); - } - - boolean needCreateNewAct = true; - boolean needWaitUserDraw = true; - - // 处理异常活动 - LuckySeaActInfo lastLuckySeaActInfo = actInfoService.getByCurrTime(); - // 处理上轮游戏 - if (null != lastLuckySeaActInfo && StringUtils.isNotBlank(lastLuckySeaActInfo.getRoundId())) { - roundId = lastLuckySeaActInfo.getRoundId(); - if (Constant.LuckySeaActStatus.CHOOSE_STAGE.equals(lastLuckySeaActInfo.getStatus())){ - needCreateNewAct = false; - Long intervalSecond = (System.currentTimeMillis() - lastLuckySeaActInfo.getStartTime().getTime()) / 1000; - log.info("春日游园活动, 上一轮投注时间发生异常的活动到现在的间隔时间{}秒, roundId:{}", intervalSecond, roundId); - if (intervalSecond <= waitUserDrawTime) { - waitUserDrawTime = waitUserDrawTime - intervalSecond.intValue(); - log.info("春日游园活动, 上一轮投注时间发生异常的活动留给用户的下注时间{}秒", waitUserDrawTime); - } else { - needWaitUserDraw = false; - log.info("春日游园活动, 上一轮投注时间发生异常的活动直接进行开奖, roundId:{}", roundId); - } - } else if (Constant.LuckySeaActStatus.DRAWING.equals(lastLuckySeaActInfo.getStatus())){ - needCreateNewAct = false; - needWaitUserDraw = false; - log.info("春日游园活动, 上一轮投注时间发生异常的活动直接进行开奖, roundId:{}", roundId); - } - } - // 创建新的一轮游戏 - if (needCreateNewAct) { - lastLuckySeaActInfo = actInfoService.createNewRoundAct(timeConfig); - roundId = lastLuckySeaActInfo.getRoundId(); - } - // 等待用户投碎片 - if (needWaitUserDraw) { - log.info("春日游园活动, 开始等待用户投入碎片, currTime: {}", System.currentTimeMillis()); - Thread.sleep(waitUserDrawTime * 1000L); - log.info("春日游园活动, 结束等待用户投入碎片, currTime: {}", System.currentTimeMillis()); - } - - StopWatch watch = new StopWatch(); - watch.start(); - - draw(lastLuckySeaActInfo, timeConfig, itemList, itemGroupList); - - watch.stop(); - drawMills = watch.getTotalTimeMillis(); - - } catch (Exception e) { - // 更新活动状态, 此轮游戏标识为异常，不开始下一轮游戏 - log.error("春日游园活动开奖时出现异常, roundId: " + roundId, e); - actInfoService.updateStatus(roundId, Constant.LuckySeaActStatus.GAME_ABNORMAL); - //activitiesLuckySeaService.compensateUserPieceWhenGameAbnormal(roundId, stock); - throw new ServiceException(BusiStatus.SERVERERROR); - } finally { - if (locked){ - lock.unlock(); - } - } - - try { - // 等待开奖动画与页面渲染开奖结果时间 - long sleepMills = (timeConfig.getDrawOverStageTime() + timeConfig.getWaitingDrawStageTime()) * 1000L - drawMills; - if (sleepMills > 0) { - log.info("春日游园活动, 等待开奖动画与页面渲染开奖结果时间{}毫秒", sleepMills); - Thread.sleep(sleepMills); - } - // 异步更新活动endTime - actInfoService.endRound(roundId); - log.info("春日游园活动此轮结束, roundId:{}", roundId); - - // 进行预警数据统计 - preWarningService.handleWarning(roundId); - } catch (Exception e) { - // 更新活动状态 - log.error("春日游园活动更新用户抽奖记录与分发奖励时出现异常, roundId: " + roundId, e); - actInfoService.updateStatus(roundId, Constant.LuckySeaActStatus.SUCCESS_DRAW_UPDATE_DATA_FAIL); - } - } - - private void draw(LuckySeaActInfo actInfo, LuckySeaActConfig timeConfig, - List<LuckySeaItem> itemList, List<LuckySeaItemGroup> itemGroupList) throws InterruptedException { - StopWatch watch = new StopWatch(); - watch.start(); - - String roundId = actInfo.getRoundId(); - if (!actInfoService.updateStatus(roundId, Constant.LuckySeaActStatus.DRAWING)) { - throw new ServiceException("活动开奖状态异常"); - } - - // 查询当前是否有用户正在进行写入抽奖数据 - int retryTimes = 0; - RAtomicLong atomic = redissonClient.getAtomicLong(RedisKey.lucky_sea_curr_write_data_user_count.getKey(actInfo.getRoundId())); - while (atomic.isExists() && atomic.get() > 0L) { - log.info("春日游园活动, 当前还有用户正在写入抽奖数据, 轮数:{}, 重试次数:{}", roundId, retryTimes); - - Thread.sleep(100); - if (++retryTimes >= 10){ - throw new ServiceException("活动开奖状态异常"); - } - } - - List<LuckySeaUserDrawRecord> userDrawRecords = drawRecordService.listRecordByRoundId(roundId, Constant.LuckySeaUserStatus.NOT_WIN); - - BigDecimal stock = stockService.getStock(); - BigDecimal ticketRate = ticketService.getTicketRate(stock); - long userInput = userDrawRecords.stream().mapToLong(LuckySeaUserDrawRecord::getCostPriceNum).sum(); - BigDecimal ticket = BigDecimal.valueOf(userInput).multiply(ticketRate); - // 计算此轮应该抽取的门票 - log.info("春日游园活动,轮次号:{}, 库存:{}, 用户扣除前投入总和:{}, 需要扣除门票:{}", roundId, stock, userInput, ticket); - // 扣除门票之后的用户投入 - BigDecimal userInputAfterDeduct = BigDecimal.valueOf(userInput).subtract(ticket); - log.info("春日游园活动,轮次号:{}, 用户扣除后投入总和:{}", roundId, userInputAfterDeduct); - // 扣除门票之后加入库存 - BigDecimal stockAfter = stockService.addStock(userInputAfterDeduct); - log.info("春日游园活动,轮次号:{}, 加入用户投入之后的库存:{}", roundId, stockAfter); - BigDecimal todayTotalTicket = ticketService.addTodayTotalTicket(ticket); - log.info("春日游园活动,轮次号:{}, 加入用户投入门票之后的当天累计门票:{}", roundId, todayTotalTicket); - - long uv = userDrawRecords.stream().map(LuckySeaUserDrawRecord::getUid).distinct().count(); - Integer drawMode = drawService.getDrawMode(actInfo.getDrawMode(), (int) uv); - - List<LuckySeaItem> drawItems = drawService.handleDrawPrize(drawMode, userDrawRecords, itemList, itemGroupList, stockAfter); - - List<Long> drawIds = drawItems.stream().map(LuckySeaItem::getId).collect(Collectors.toList()); - String drawName = drawItems.size() == 1? drawItems.get(0).getName() - : itemGroupList.stream().filter(g-> g.getItemIds().size() == drawIds.size() && new HashSet<>(g.getItemIds()).containsAll(drawIds)) - .map(LuckySeaItemGroup::getName).findAny().orElse(""); - log.info("春日游园活动,轮次号:{}, 开奖结束，drawItems :{}", roundId, drawItems); - - drawRecordService.updateDrawRecordStatus(roundId, drawIds, Constant.LuckySeaUserStatus.WIN); - - watch.stop(); - Long drawMillis = watch.getTotalTimeMillis(); - log.info("春日游园活动, 结束开奖，处理开奖花费 {} 毫秒", drawMillis); - - // 更新活动状态 - int drawTime = Math.max(timeConfig.getWaitingDrawStageTime() * 1000, drawMillis.intValue()); - Date showResultStageStartTime = DateTimeUtil.addMilliSecond(actInfo.getDrawStageStartTime(), drawTime); - if (!actInfoService.updateDrawResult(roundId, drawMode, drawName, drawItems, showResultStageStartTime, ticket.doubleValue())) { - throw new ServiceException("活动开奖状态异常"); - } - - redissonClient.getAtomicLong(RedisKey.lucky_sea_curr_write_data_user_count.getKey(roundId)).deleteAsync(); - - // 异步更新用户抽奖记录 - settlementService.sendReward(roundId); - settlementService.addUserDrawResult(roundId, itemList, drawItems); - } -} diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/activity/LuckySeaPreWarningTask.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/activity/LuckySeaPreWarningTask.java deleted file mode 100644 index ef9054d91..000000000 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/activity/LuckySeaPreWarningTask.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.accompany.scheduler.task.activity; - -import com.accompany.business.service.LuckySeaPreWarningService; -import com.accompany.scheduler.base.BaseTask; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; - -@Component -@Slf4j -public class LuckySeaPreWarningTask extends BaseTask { - - @Autowired - private LuckySeaPreWarningService luckySeaPreWarningService; - - /** - * 自动轮播寻找小精灵 - */ - @Scheduled(cron = "0 0 */1 * * ?") - public void handleBroadcastTask() { - try { - log.info("开始自动轮播星级厨房"); - luckySeaPreWarningService.handleBroadcast(); - log.info("开始自动轮播星级厨房"); - } catch (Exception e) { - log.error("开始自动轮播星级厨房失败...", e); - } - } -} diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/chat/PublicChatTask.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/chat/PublicChatTask.java deleted file mode 100644 index c353b6785..000000000 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/chat/PublicChatTask.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.accompany.scheduler.task.chat; - -import com.accompany.business.service.chat.PublicChatTopRecordService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; - -/** - * @author: liaozetao - * @date: 2024/5/7 10:09 - * @description: - */ -@Slf4j -//@Component -public class PublicChatTask { - - @Autowired - private PublicChatTopRecordService publicChatTopRecordService; - - @Scheduled(cron = "0 */1 * * * ?") - public void execute() { - publicChatTopRecordService.execute(); - } -} diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/newbie/NewbiePoolUpdateTask.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/newbie/NewbiePoolUpdateTask.java deleted file mode 100644 index b52e85d72..000000000 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/newbie/NewbiePoolUpdateTask.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.accompany.scheduler.task.newbie; - -import com.accompany.business.service.newbie.NewbiePoolService; -import com.accompany.scheduler.base.BaseTask; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; - -import java.util.Date; - -@Component -public class NewbiePoolUpdateTask extends BaseTask { - - private static final Logger logger = LoggerFactory.getLogger(NewbiePoolUpdateTask.class); - - @Autowired - NewbiePoolService newbiePoolService; - - /** - * 每小时更新萌新池用户 - */ - @Scheduled(cron = "0 0 * * * ?") - public void addYesterdayNewbie() { - logger.info("updateNewbiePool start ==============="); - newbiePoolService.addYesterdayNewbie(new Date()); - logger.info("updateNewbiePool finish ==============="); - } - - - /** - * 每天凌晨更新萌新池用户 - */ - @Scheduled(cron = "0 0 0 * * ?") - public void updateNewbiePool() { - logger.info("updateNewbiePool start ==============="); - newbiePoolService.updateNewbiePool(); - logger.info("updateNewbiePool finish ==============="); - } - -} diff --git a/accompany-scheduler/accompany-scheduler-web/src/main/java/com/accompany/scheduler/config/BeanConfig.java b/accompany-scheduler/accompany-scheduler-web/src/main/java/com/accompany/scheduler/config/BeanConfig.java deleted file mode 100644 index 924a41928..000000000 --- a/accompany-scheduler/accompany-scheduler-web/src/main/java/com/accompany/scheduler/config/BeanConfig.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.accompany.scheduler.config; - -import com.accompany.common.support.InjectBeanSelfBeanPostProcessor; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -/** - * @Author yubin - * @Description //TODO - * @Date 2019-05-05 19:20 - */ - -@Configuration -public class BeanConfig { - - - @Bean - public InjectBeanSelfBeanPostProcessor initBean() { - return new InjectBeanSelfBeanPostProcessor(); - } - -}