java/PlayPai.git

			@@ -85,7 +85,7 @@
			private String alipayPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAouYvZ1v4RiydwNOnGcU0Hb4hQu0x6XUooaE2Bi6/atNOobtFdunnATGP6OMOW7yF9DpP8qH5mbFXAiaQD721y/7qlayI50UcV4mngRU4ZcaAVE3bp721Eg2H85RISa+Tb1CiOh+pc9p4l5UBseKsvB2ruHHForfZDPI8FL7AVUKBYCQPsa4zL6KAO2C6KULaTg/lCa+bYQKU0n9ca569VtdsqJUyxB9eSZjVd+9nKl62FLqp2NELGj7cXqiVBgDnBnVS5ZUO3mrBM5z/AxQbw3RwE3JqdkhzUA1BFjejAlT2zIGNOjUFagF8ao0wGElYfuk0bum6Hz5qWAt02QdNNwIDAQAB";//支付宝应用公钥

			private String alipay_public_key = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmu8n/4yTHWbn7VOrNc9OsLtDL1bEQ8gC1dHkj8Wy5z0mkaOsjJRIG/28ze12M0V8jdCKuuDr5Z1OPKiqf+XO3ypguEh+mYUVMBM/cZodDFQfTY1TKLWjvQCuaqlA+QUTCK6f7T7stsgyQ1o9Jj0rXZDz6PM4QHSTzjrLIBaeqM5WIBvH+fy/X+QG5Utd+/UT0kc0JyvuKhZ65yVUd/C9VcwJJAPliRsAQNrqYterwAJ9zvw9tF11wj9W0XgJ8Ccu4x3gR1vrlLRJJo/OA97RmxPQ+5hSacWQZCUd1dwiBq+YCrKVHGTj14izRHXrLc0yBlRXo7tBOIqcy3IsvKVthQIDAQAB";//支付宝支付公钥

			private String smid = "2088330203191220";//平台支付宝商户号

			/**
			* 获取赛事列表
			@@ -253,7 +253,6 @@
			if (paymentCompetitionVo.getPayType() == 3) {//玩湃币
			money = new BigDecimal(competition.getPlayPaiCoin()).multiply(new BigDecimal(split.length)).setScale(2, RoundingMode.HALF_EVEN);
			if (money.compareTo(new BigDecimal(appUser.getPlayPaiCoins())) > 0) {

			return new ResultUtil(2, "报名失败，玩湃币不足，请充值");
			}
			}
			@@ -301,7 +300,16 @@
			}

			if (paymentCompetitionVo.getPayType() == 2) {//支付宝
			return aliPaymentCompetition(code, money);
			// 判断当前赛事属于哪个运营商
			Competition byId = competitionService.getById(paymentCompetitionVo.getId());
			Integer operatorId = byId.getOperatorId();
			if (operatorId == null ){
			// 说明是平台
			return aliPaymentCompetition(smid,code, money);
			}
			// 获取该运营商的商户号
			String smid = storeClient.getSMIDByOperatorId(operatorId);
			return aliPaymentCompetition(smid,code, money);
			}
			if (paymentCompetitionVo.getPayType() == 3) {//玩湃币
			appUser.setPlayPaiCoins(appUser.getPlayPaiCoins() - money.intValue());
			@@ -419,8 +427,9 @@
			* @return
			* @throws Exception
			*/
			public ResultUtil aliPaymentCompetition(String code, BigDecimal money) throws Exception {
			ResultUtil alipay = payMoneyUtil.alipay("报名赛事", "", "", code, money.toString(), "/base/competition/aliPaymentCompetitionCallback");
			public ResultUtil aliPaymentCompetition(String smid,String code, BigDecimal money) throws Exception {
			ResultUtil alipay = payMoneyUtil.alipay
			(smid,"报名赛事", "", "", code, money.toString(), "/base/competition/aliPaymentCompetitionCallback");
			if (alipay.getCode() == 200) {
			new Thread(new Runnable() {
			@Override
			@@ -454,6 +463,7 @@
			paymentCompetition.setAppUserId(null);
			paymentCompetition.setState(3);
			userCompetitionService.remove(new QueryWrapper<UserCompetition>().eq("paymentCompetitionId", paymentCompetition.getId()));

			break;
			}
			if ("TRADE_SUCCESS".equals(s)) {
			@@ -462,10 +472,10 @@
			paymentCompetition.setPayTime(new Date());
			paymentCompetition.setPayOrderNo(tradeNo);
			paymentCompetitionService.updateById(paymentCompetition);

			// 结算资金到商户账号
			payMoneyUtil.confirm(smid,code,tradeNo,money.toString());
			//分账
			moneyOut(tradeNo, tradeNo);

			// moneyOut(tradeNo, tradeNo,code);
			break;
			}
			if ("WAIT_BUYER_PAY".equals(s)) {
			@@ -488,14 +498,14 @@
			@Autowired
			private CompetitionService competitionService;

			public void moneyOut(String outNum, String tradeNo) throws AlipayApiException {
			public void moneyOut(String outNum, String tradeNo,String code) 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();
			AlipayTradeOrderSettleModel model = new AlipayTradeOrderSettleModel();
			model.setOutRequestNo(outNum);
			model.setTradeNo(tradeNo);
			List<RoyaltyDetailInfos> royaltyDetailInfos = new ArrayList<>();
			//


			AlipayTradeRoyaltyRelationBindRequest request1 = new AlipayTradeRoyaltyRelationBindRequest();

			@@ -519,39 +529,25 @@
			}


			// RoyaltyDetailInfos royaltyDetailInfos1 = new RoyaltyDetailInfos();
			// royaltyDetailInfos1.setTransOutType("loginName");
			// royaltyDetailInfos1.setTransOut("happysports@weparklife.com");
			// royaltyDetailInfos1.setTransInType("loginName");
			// royaltyDetailInfos1.setTransIn("19522115070");
			//// royaltyDetailInfos1.setAmount("0.01");
			// royaltyDetailInfos1.setAmountPercentage("100");

			// royaltyDetailInfos.add(royaltyDetailInfos1);


			PaymentCompetition code = paymentCompetitionService.getOne(new QueryWrapper<PaymentCompetition>().eq("code", outNum));
			Competition byId1 = competitionService.getById(code.getCompetitionId());
			PaymentCompetition code1 = paymentCompetitionService.getOne(new QueryWrapper<PaymentCompetition>().eq("code", code));
			Competition byId1 = competitionService.getById(code1.getCompetitionId());

			// TCoursePackage byId = coursePackageService.getById(one.getCoursePackageId());
			OperatorUser operatorUser = storeClient.queryByStoreId(byId1.getOperatorId());


			// Integer paymentCompetitions = competitionsClient.queryByCode(outTradeNo);
			// Integer siteBookings = siteClient.queryByCode(outTradeNo);
			// List<Integer> stores = new ArrayList<>();
			// stores.add(coursePackagePayments);
			// stores.add(paymentCompetitions);
			// stores.add(siteBookings);
			// OperatorUser operatorUser = siteClient.queryOperator(stores);


			OpenApiRoyaltyDetailInfoPojo op = new OpenApiRoyaltyDetailInfoPojo();
			op.setTransOutType("loginName");
			op.setTransOut("happysports@weparklife.com");
			op.setTransInType("userId");
			op.setTransIn(operatorUser.getAlipayNum());
			op.setAmountPercentage(Long.valueOf(operatorUser.getAlipayProportion()));
			op.setTransInType("loginName");
			// op.setTransInType("userId");
			op.setTransIn("19522115070");
			// op.setTransIn(operatorUser.getAlipayNum());
			// op.setAmountPercentage(Long.valueOf(operatorUser.getAlipayProportion()));
			op.setAmountPercentage(100L);

			List<OpenApiRoyaltyDetailInfoPojo> ops = new ArrayList<>();
			ops.add(op);
			@@ -601,4 +597,22 @@
			List<PayCourseRes> list = coursePackagePaymentClient.paymentCompetitionCourseList(uid + "_" + storeId);
			return ResultUtil.success(list);
			}

			@Override
			public void moneyOut() throws AlipayApiException {
			Date date = new Date();
			List<Competition> list = competitionService.list(new QueryWrapper<Competition>().lt("endTime",date).ne("isOut",1));
			List<Integer> coms = new ArrayList<>();
			for (Competition competition : list) {
			coms.add(competition.getId());
			competition.setIsOut(1);
			}
			List<PaymentCompetition> pays = paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>().in("competitionId", coms));
			for (PaymentCompetition pay : pays) {
			moneyOut(pay.getPayOrderNo(),pay.getPayOrderNo(),pay.getCode());
			}
			competitionService.updateBatchById(list);


			}
			}