java/PlayPai.git

			@@ -1,5 +1,6 @@
			package com.dsh.account.service.impl;

			import com.alipay.api.response.AlipayTradeQueryResponse;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import com.dsh.account.entity.TAppUser;
			@@ -84,7 +85,6 @@
			if(vipPayment1.getPayStatus() != 1){
			return;
			}

			/**
			* SUCCESS--支付成功
			* REFUND--转入退款
			@@ -122,6 +122,8 @@
			appUser.setIsVip(1);
			appUser.setVipEndTime(calendar.getTime());
			appUserService.updateById(appUser);
			// 注册会员送券先判断是否有注册送券类型的优惠券判断优惠券状态审核是否通过是否删除是否在有效期内是否领取数量达上限
			userConponClient.queryCouponByUser(appUser.getId());
			return;
			}
			if("USERPAYING".equals(trade_state) \|\| "ACCEPT".equals(trade_state)){
			@@ -179,11 +181,16 @@
			* TRADE_SUCCESS（交易支付成功）、
			* TRADE_FINISHED（交易结束，不可退款）
			*/
			ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryALIOrder(code);
			if(resultUtil.getCode() == 200){
			Map<String, String> map = resultUtil.getData();
			String tradeStatus = map.get("tradeStatus");
			String tradeNo = map.get("tradeNo");
			AlipayTradeQueryResponse resultUtil = payMoneyUtil.queryALIOrder(code);

			if(resultUtil.getCode().equals("10000")){
			// Map<String, String> map = resultUtil.getData();
			// String tradeStatus = map.get("tradeStatus");
			// String tradeNo = map.get("tradeNo");

			String tradeNo = resultUtil.getTradeNo();
			String tradeStatus = resultUtil.getTradeStatus();
			System.out.println("ssssss"+tradeStatus);
			if("TRADE_CLOSED".equals(tradeStatus) \|\| "TRADE_FINISHED".equals(tradeStatus)){
			vipPayment1.setState(3);
			VipPaymentServiceImpl.this.updateById(vipPayment1);
			@@ -197,6 +204,7 @@

			TAppUser appUser = appUserService.getById(vipPayment1.getAppUserId());
			Date vipEndTime = appUser.getVipEndTime();
			appUser.setIsVip(1);
			if(null == vipEndTime){
			vipEndTime = new Date();
			}
			@@ -205,6 +213,8 @@
			calendar.set(Calendar.YEAR, calendar.get(Calendar.YEAR) + 1);
			appUser.setVipEndTime(calendar.getTime());
			appUserService.updateById(appUser);
			// 注册会员送券先判断是否有注册送券类型的优惠券判断优惠券状态审核是否通过是否删除是否在有效期内是否领取数量达上限
			userConponClient.queryCouponByUser(appUser.getId());
			return;
			}
			if("WAIT_BUYER_PAY".equals(tradeStatus)){
			@@ -256,12 +266,11 @@
			vipEndTime = new Date();
			}
			Calendar calendar = Calendar.getInstance();
			calendar.setTime(vipEndTime);
			calendar.setTime(new Date());
			calendar.set(Calendar.YEAR, calendar.get(Calendar.YEAR) + 1);
			appUser.setVipEndTime(calendar.getTime());
			appUserService.updateById(appUser);
			// 注册会员送券先判断是否有注册送券类型的优惠券判断优惠券状态审核是否通过是否删除是否在有效期内是否领取数量达上限
			userConponClient.queryCouponByUser(appUser.getId());

			return ResultUtil.success();
			}