java/PlayPai.git

			@@ -78,7 +78,6 @@
			private PayMoneyUtil payMoneyUtil;



			private String aliAppid = "2021004105665036";//支付宝appid

			private String appPrivateKey = "MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCi5i9nW/hGLJ3A06cZxTQdviFC7THpdSihoTYGLr9q006hu0V26ecBMY/o4w5bvIX0Ok/yofmZsVcCJpAPvbXL/uqVrIjnRRxXiaeBFThlxoBUTdunvbUSDYfzlEhJr5NvUKI6H6lz2niXlQGx4qy8Hau4ccWit9kM8jwUvsBVQoFgJA+xrjMvooA7YLopQtpOD+UJr5thApTSf1xrnr1W12yolTLEH15JmNV372cqXrYUuqnY0QsaPtxeqJUGAOcGdVLllQ7easEznP8DFBvDdHATcmp2SHNQDUEWN6MCVPbMgY06NQVqAXxqjTAYSVh+6TRu6bofPmpYC3TZB003AgMBAAECggEBAJAcR2+PA3NBYUYHeFrqBRMS8uX8ZR19kjZ7IgoSLTFaQsP9opRylPSPXhrPVBKAE5leRQAHn4MCSlESwHvMfxo7KFjFTFAc6dffZZpipYQUOc9bGampwJh58/3e/pyBgVMG6J23CPf/HJQtNFSkjd/V9+ayb/9l2dUEL3bC0fAZ/dbx8HsxdLw8wn3fLlWLj68hOMqa2deCZe3JdSVsPbeWqkh56FFsMLug0Nd+Ar4TgRl9/jnhXF0JWiD0LmPUYLhboY7EfUBzN4w1iYbDi1P+3zvoOYsiVKAXox9GMhQ2VzOO2UcSTuizSza2e98mGpabl/GpKmCz+RDFjtkX6eECgYEA2MyCij65eO3aGIm3FUe93DULRBYTfX8qJQSJq2WOWA3mmQlEW6L3O2B5/lG2h+8WmN6iLEs9eHpgycGYp7vAqgrANEn16ACVcuyx0scFtrZfZ+kmHMzFfiUWxJjVYk/6YngsGVBLdw6ueM42C8TTP67X9tU5TdVGoGWuqEj4W98CgYEAwFqwprXOch5Pqk/RPbb49r0Ou03K/UbciWnWWKzUhFFNS8MdlQPoDvQZbMwHLeWsa2VhaKITK3x5biLQb3U+0GLOn6lTvEyrEUH+ucREyLgVYTRAvwBPtnvlrzpyxPk2HnslQjju8WrvvLLBMKWUjlTrTOzhaHT21gz3pHMiOakCgYEAhLmfaXdBITGshb054sNLDtdCkGpbgEcrzAHdLps769iGxkYQHXHFngpQZUwtTUcoNGqIKknd1jZFrv7gsD+XkgKG7PwimehRlkwmCX5ilxtLiVgJRzRt6+5U5AMVD90a0tHzXYP0z2yjj73fBJF5KtGl0a10KZxaYrQdm1UhB00CgYBZZgzx/k9rtHC8LAqIj1CYhHejT92G53c6Gkl3vyOqN4sgKhfGmSEySfrDGPRBPZxr8ZtbIPCd5mUdberH0osWGMYFaJI1UsCy7aQwvGpniz7MhZeN7dweaOjwDs8mgtjHQ96mL4XGCDhR0BZ/wIURvZ/6iaGdhbbu9unlsWj3uQKBgQCmZYdsbbZkd3ev6f8rwyvMz+DrCQyYpY44cegBYuJgrZiQnL2fJioeN7ixX0UM48SfwsZEIrzshP/LGAwnc2MdjxKUl4jLN8SEe0NAjXOnz9Zaw740+aOmLpXcLWdP4uM2gIhWsvW1tEkQZCXmm7c9s/RsU8Pmzv+YL3+fSijOzA==";//支付宝开发者应用私钥
			@@ -90,6 +89,7 @@

			/**
			* 获取赛事列表
			*
			* @param content
			* @param registerCondition
			* @param heat
			@@ -111,6 +111,7 @@

			/**
			* 获取赛事详情
			*
			* @param uid
			* @param id
			* @return
			@@ -215,9 +216,9 @@
			}



			/**
			* 赛事报名
			*
			* @param uid
			* @param paymentCompetitionVo
			* @return
			@@ -229,7 +230,19 @@
			String[] split = paymentCompetitionVo.getIds().split(";");
			Competition competition = this.getById(paymentCompetitionVo.getId());

			int competitionId = userCompetitionService.count(new QueryWrapper<UserCompetition>().eq("competitionId", paymentCompetitionVo.getId()));
			List<PaymentCompetition> list = paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>().eq("competitionId", paymentCompetitionVo.getId()).ne("payStatus", 3));
			List<Long> pays = new ArrayList<>();
			for (PaymentCompetition paymentCompetition : list) {
			pays.add(paymentCompetition.getId());
			}

			int competitionId = 0;
			if (!pays.isEmpty()) {
			competitionId = userCompetitionService.count(new QueryWrapper<UserCompetition>().in("paymentCompetitionId", pays));
			}


			// int competitionId = userCompetitionService.count(new QueryWrapper<UserCompetition>().eq("competitionId", paymentCompetitionVo.getId()));
			if ((competitionId+split.length)>competition.getApplicantsNumber()){
			return ResultUtil.error("报名人数超过最大限制");
			}
			@@ -332,6 +345,7 @@

			/**
			* 赛事微信支付
			*
			* @param code
			* @param money
			* @return
			@@ -399,6 +413,7 @@

			/**
			* 赛事支付宝支付
			*
			* @param code
			* @param money
			* @return
			@@ -472,6 +487,7 @@

			@Autowired
			private CompetitionService competitionService;

			public void moneyOut(String outNum,String tradeNo) throws AlipayApiException {
			AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do", aliAppid, appPrivateKey, "json", "UTF-8", alipay_public_key, "RSA2");
			AlipayTradeOrderSettleRequest request = new AlipayTradeOrderSettleRequest();
			@@ -503,7 +519,6 @@
			}



			// RoyaltyDetailInfos royaltyDetailInfos1 = new RoyaltyDetailInfos();
			// royaltyDetailInfos1.setTransOutType("loginName");
			// royaltyDetailInfos1.setTransOut("happysports@weparklife.com");
			@@ -522,7 +537,6 @@
			OperatorUser operatorUser = storeClient.queryByStoreId(byId1.getOperatorId());



			// Integer paymentCompetitions = competitionsClient.queryByCode(outTradeNo);
			// Integer siteBookings = siteClient.queryByCode(outTradeNo);
			// List<Integer> stores = new ArrayList<>();
			@@ -530,8 +544,6 @@
			// stores.add(paymentCompetitions);
			// stores.add(siteBookings);
			// OperatorUser operatorUser = siteClient.queryOperator(stores);




			OpenApiRoyaltyDetailInfoPojo op = new OpenApiRoyaltyDetailInfoPojo();