java/PlayPai.git

			@@ -37,6 +37,7 @@
			import com.dsh.course.model.vo.response.*;
			import com.dsh.course.service.*;
			import com.dsh.course.util.*;
			import com.dsh.course.util.wx.WxV3PayConfig;
			import com.fasterxml.jackson.core.JsonProcessingException;
			import com.fasterxml.jackson.databind.ObjectMapper;
			import org.springframework.beans.factory.annotation.Autowired;
			@@ -928,80 +929,19 @@
			Integer storeId = byId.getStoreId();
			Store store = storeClient.queryStoreById(storeId);
			System.err.println("门店查询"+store);
			// 是否分账 0否1是
			int isFenZhang= 1;
			String merchantNumber = "";
			if (store.getOperatorId()==null \|\| store.getOperatorId()==0){
			// 平台
			isFenZhang = 0;
			}
			System.err.println("拉起支付");
			ResultUtil weixinpay = payMoneyUtil.weixinpay("课包续费"+"-"+isFenZhang, "", code, request.toString(),
			ResultUtil weixinpay = payMoneyUtil.weixinpay("课包续费", "", code, request.toString(),
			"/base/coursePackage/wechatRegisteredCoursesCallback", "APP", "");
			if (weixinpay.getCode() == 200) {
			String finalCode = code;
			new Thread(new Runnable() {
			@Override
			public void run() {
			try {
			int num = 1;
			int wait = 0;
			while (num <= 10) {
			int min = 5000;
			wait += (min * num);
			Thread.sleep(wait);
			CoursePackageOrder coursePackageOrder1 = coursePackageOrderService.getOne(new QueryWrapper<CoursePackageOrder>()
			.eq("code", finalCode).eq("state", 1));
			if (coursePackageOrder1.getPayStatus() == 2) {
			break;
			}
			ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryWXOrder(finalCode, "");
			if (resultUtil.getCode() == 200 && coursePackageOrder1.getPayStatus() == 1) {
			/**
			* SUCCESS—支付成功，
			* REFUND—转入退款，
			* NOTPAY—未支付，
			* CLOSED—已关闭，
			* REVOKED—已撤销（刷卡支付），
			* USERPAYING--用户支付中，
			* PAYERROR--支付失败(其他原因，如银行返回失败)
			*/
			Map<String, String> data1 = resultUtil.getData();
			String s = data1.get("trade_state");
			String transaction_id = data1.get("transaction_id");
			if ("REFUND".equals(s) \|\| "CLOSED".equals(s) \|\| "REVOKED".equals(s) \|\| "PAYERROR".equals(s) \|\| num == 10) {
			//有待支付的订单，这里不处理
			// coursePackageOrder1.setState(3);
			// coursePackageOrderService.updateById(coursePackageOrder1);
			break;
			}
			if ("SUCCESS".equals(s)) {
			coursePackageOrder1.setPayStatus(2);
			coursePackageOrder1.setOrderNumber(transaction_id);
			coursePackageOrder1.setAppUserId(null);
			coursePackageOrderService.updateById(coursePackageOrder1);
			//修改课时有效期

			CoursePackagePaymentConfig coursePackagePaymentConfig = coursePackagePaymentConfigService.getOne(new QueryWrapper<CoursePackagePaymentConfig>()
			.eq("coursePackageId", coursePackageOrder1.getId())
			.eq("classHours", coursePackageOrder1.getClassHours())
			);
			coursePackageService.addCoursePackageOrderStudent(coursePackageOrder1.getId(), coursePackagePaymentConfig);

			break;
			}
			if ("USERPAYING".equals(s) \|\| "NOTPAY".equals(s)) {
			num++;
			}
			}
			}
			} catch (Exception e) {
			e.printStackTrace();
			}
			}
			}).start();
			return weixinpay;
			}else{
			String s = storeClient.getmerchantNumberByOperatorId(store.getOperatorId());
			System.err.println("微信商户号"+s);
			if(!StringUtils.hasLength(s)){
			return ResultUtil.error("运营商未配置微信商户号，获取支付失败!");
			}
			return payMoneyUtil.weixinpayV3(s,"课包续费",code,
			"/base/coursePackage/wechatRegisteredCoursesCallback1",request.toString(),"");
			}
			return weixinpay;
			}
			private String smid = "2088330203191220";//平台支付宝商户号

			@@ -1034,79 +974,82 @@
			}else if (store.getOperatorId() == 0){
			smid1 = smid;
			}else{
			smid1 = storeClient.getSMIDByOperatorId(store.getOperatorId());
			smid1 = storeClient.getmerchantNumberAliByOperatorId(store.getOperatorId());
			}
			if (!StringUtils.hasLength(smid1)){
			return ResultUtil.error("运营商未配置支付宝商户号，获取支付失败!");
			}
			ResultUtil alipay = payMoneyUtil.alipay(smid1,"课包购买", "课包购买", "", code, request.toString(),
			"/base/coursePackage/alipayRegisteredCoursesCallback");
			if (alipay.getCode() == 200) {
			String finalCode = code;
			new Thread(new Runnable() {
			@Override
			public void run() {
			try {
			Thread.sleep(1000);
			int num = 1;
			int wait = 0;
			while (num <= 10) {
			int min = 5000;
			wait += (min * num);
			Thread.sleep(wait);
			CoursePackageOrder coursePackageOrder1 = coursePackageOrderService.getOne(new QueryWrapper<CoursePackageOrder>()
			.eq("code", finalCode).eq("state", 1));
			if (coursePackageOrder1.getPayStatus() == 2) {
			break;
			}
			AlipayTradeQueryResponse alipayTradeQueryResponse = payMoneyUtil.queryALIOrder(finalCode);
			if (null != alipayTradeQueryResponse) {
			/**
			* WAIT_BUYER_PAY（交易创建，等待买家付款）、
			* TRADE_CLOSED（未付款交易超时关闭，或支付完成后全额退款）、
			* TRADE_SUCCESS（交易支付成功）、
			* TRADE_FINISHED（交易结束，不可退款）
			*/
			String s = alipayTradeQueryResponse.getTradeStatus();

			String tradeNo = alipayTradeQueryResponse.getTradeNo();
			if ("TRADE_CLOSED".equals(s) \|\| "TRADE_FINISHED".equals(s) \|\| num == 10) {
			//有待支付的订单，这里不处理
			// coursePackageOrder1.setState(3);
			// coursePackageOrderService.updateById(coursePackageOrder1);
			break;
			}
			if ("TRADE_SUCCESS".equals(s)) {
			coursePackagePayment.setPayStatus(2);
			coursePackagePayment.setOrderNumber(tradeNo);
			baseMapper1.updateById(coursePackagePayment);
			// 判断这个课包属于哪个门店属于哪个运营商根据运营商 id 获取对应的商户号
			Integer coursePackageId = coursePackagePayment.getCoursePackageId();
			TCoursePackage byId = coursePackageService.getById(coursePackageId);
			Store store = storeClient.queryStoreById(byId.getStoreId());
			if (store.getOperatorId() == null ){
			// 说明是平台的门店无需冻结资金不走分账
			payMoneyUtil.confirm1(smid,code,tradeNo,request.toString());
			}else if (store.getOperatorId() == 0){
			// 说明是平台的门店
			payMoneyUtil.confirm1(smid,code,tradeNo,request.toString());
			// 发起分账
			extracted(store, coursePackageOrder1, tradeNo);
			}else{
			payMoneyUtil.confirm(storeClient.getSMIDByOperatorId(store.getOperatorId()),code,tradeNo,request.toString());
			// 发起分账
			extracted(store, coursePackageOrder1, tradeNo);
			}
			break;
			}
			if ("WAIT_BUYER_PAY".equals(s)) {
			num++;
			}
			}
			}
			} catch (Exception e) {
			e.printStackTrace();
			}
			}
			}).start();
			}
			// if (alipay.getCode() == 200) {
			// String finalCode = code;
			// new Thread(new Runnable() {
			// @Override
			// public void run() {
			// try {
			// Thread.sleep(1000);
			// int num = 1;
			// int wait = 0;
			// while (num <= 10) {
			// int min = 5000;
			// wait += (min * num);
			// Thread.sleep(wait);
			// CoursePackageOrder coursePackageOrder1 = coursePackageOrderService.getOne(new QueryWrapper<CoursePackageOrder>()
			// .eq("code", finalCode).eq("state", 1));
			// if (coursePackageOrder1.getPayStatus() == 2) {
			// break;
			// }
			// AlipayTradeQueryResponse alipayTradeQueryResponse = payMoneyUtil.queryALIOrder(finalCode);
			// if (null != alipayTradeQueryResponse) {
			// /**
			// * WAIT_BUYER_PAY（交易创建，等待买家付款）、
			// * TRADE_CLOSED（未付款交易超时关闭，或支付完成后全额退款）、
			// * TRADE_SUCCESS（交易支付成功）、
			// * TRADE_FINISHED（交易结束，不可退款）
			// */
			// String s = alipayTradeQueryResponse.getTradeStatus();
			//
			// String tradeNo = alipayTradeQueryResponse.getTradeNo();
			// if ("TRADE_CLOSED".equals(s) \|\| "TRADE_FINISHED".equals(s) \|\| num == 10) {
			// //有待支付的订单，这里不处理
			//// coursePackageOrder1.setState(3);
			//// coursePackageOrderService.updateById(coursePackageOrder1);
			// break;
			// }
			// if ("TRADE_SUCCESS".equals(s)) {
			// coursePackagePayment.setPayStatus(2);
			// coursePackagePayment.setOrderNumber(tradeNo);
			// baseMapper1.updateById(coursePackagePayment);
			// // 判断这个课包属于哪个门店属于哪个运营商根据运营商 id 获取对应的商户号
			// Integer coursePackageId = coursePackagePayment.getCoursePackageId();
			// TCoursePackage byId = coursePackageService.getById(coursePackageId);
			// Store store = storeClient.queryStoreById(byId.getStoreId());
			// if (store.getOperatorId() == null ){
			// // 说明是平台的门店无需冻结资金不走分账
			// payMoneyUtil.confirm1(smid,code,tradeNo,request.toString());
			// }else if (store.getOperatorId() == 0){
			// // 说明是平台的门店
			// payMoneyUtil.confirm1(smid,code,tradeNo,request.toString());
			// // 发起分账
			// extracted(store, coursePackageOrder1, tradeNo);
			// }else{
			// payMoneyUtil.confirm(storeClient.getSMIDByOperatorId(store.getOperatorId()),code,tradeNo,request.toString());
			// // 发起分账
			// extracted(store, coursePackageOrder1, tradeNo);
			// }
			// break;
			// }
			// if ("WAIT_BUYER_PAY".equals(s)) {
			// num++;
			// }
			// }
			// }
			// } catch (Exception e) {
			// e.printStackTrace();
			// }
			// }
			// }).start();
			// }
			return alipay;
			}

			@@ -1353,27 +1296,7 @@
			Integer storeId = byId.getStoreId();
			Store store = storeClient.queryStoreById(storeId);

			if (store.getOperatorId()!=null && store.getOperatorId()!=0){
			// 休眠两分钟后再调用分账接口避免提示订单正在处理中
			Thread.sleep(120000);
			// 根据运营商id获取对应运营商分账比例返回格式: 微信分账比例,支付宝分账比例
			String proportionByOperatorId = storeClient.getProportionByOperatorId(store.getOperatorId());
			String[] split = proportionByOperatorId.split(",");
			String s1 = split[0];
			if (!s1.equals("未设置")){
			BigDecimal bigDecimal = new BigDecimal(s1);
			// 分账比例
			BigDecimal bigDecimal1 = bigDecimal.divide(new BigDecimal(100)).setScale(2);
			// 微信商户号
			String s2 = storeClient.getmerchantNumberByOperatorId(store.getOperatorId());
			String nonce_str = UUIDUtil.getRandomCode(16);

			ResultUtil fenzhang = payMoneyUtil.fenzhang(orderNumber, coursePackageOrder1.getCashPayment().multiply(bigDecimal1), s2,nonce_str);
			if (!fenzhang.getCode().equals(200)){
			System.err.println("分账失败原因是:"+fenzhang.getData());
			}
			}
			}
			return ResultUtil.success();
			}