From 0f638db757941ab42466286a8ff5d0532dc59e10 Mon Sep 17 00:00:00 2001 From: nickchange <126672920+nickchange@users.noreply.github.com> Date: 星期五, 27 十月 2023 17:56:04 +0800 Subject: [PATCH] 10.27.5 --- cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 2 cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 1 cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java | 14 ++++-- cloud-server-course/src/main/java/com/dsh/course/feignclient/activity/model/Coupon.java | 3 + cloud-server-competition/src/main/java/com/dsh/competition/util/PayMoneyUtil.java | 7 ++- cloud-server-other/src/main/java/com/dsh/other/util/TaskUtil.java | 24 ++++++++++++ cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java | 13 ++++++ 7 files changed, 55 insertions(+), 9 deletions(-) diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java index 9b003a2..bdb6234 100644 --- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java +++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java @@ -873,7 +873,7 @@ commodity.setShopIds(integers); break; case 2: - commodity.setGoodId(vicinityGood.getCoursePackageId()); + commodity.setGoodId(vicinityGood.getId()); CoursePackage coursePackage = cpageClient.queryCoursePackageById(vicinityGood.getCoursePackageId()); commodity.setGoodImg(coursePackage.getCoverDrawing()); commodity.setGoodName(coursePackage.getName()); diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java index 2f7a131..91bafa8 100644 --- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java +++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java @@ -480,6 +480,7 @@ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); ProductDetailsVo detailsVo = new ProductDetailsVo(); PointsMerchandise merchandise = pmdsService.getById(detailRequest.getGoodId()); + detailsVo.setCardType(merchandise.getCardType()); switch (detailRequest.getGoodsType()){ case 2: diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java index 16c106f..0e35e4b 100644 --- a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java +++ b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java @@ -10,6 +10,7 @@ import com.alipay.api.request.AlipayTradeOrderSettleRequest; import com.alipay.api.request.AlipayTradeRoyaltyRelationBindRequest; import com.alipay.api.response.AlipayTradeOrderSettleResponse; +import com.alipay.api.response.AlipayTradeQueryResponse; import com.alipay.api.response.AlipayTradeRoyaltyRelationBindResponse; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -396,17 +397,20 @@ if(paymentCompetition.getPayStatus() == 2){ break; } - ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryALIOrder(code); - if(resultUtil.getCode() == 200 && paymentCompetition.getPayStatus() == 1){ + AlipayTradeQueryResponse resultUtil = payMoneyUtil.queryALIOrder(code); + if(resultUtil.getCode().equals("10000") && paymentCompetition.getPayStatus() == 1){ /** * WAIT_BUYER_PAY(交易创建,等待买家付款)、 * TRADE_CLOSED(未付款交易超时关闭,或支付完成后全额退款)、 * TRADE_SUCCESS(交易支付成功)、 * TRADE_FINISHED(交易结束,不可退款) */ - Map<String, String> data1 = resultUtil.getData(); - String s = data1.get("tradeStatus"); - String tradeNo = data1.get("tradeNo"); +// Map<String, String> data1 = resultUtil.getData(); +// String s = data1.get("tradeStatus"); +// String tradeNo = data1.get("tradeNo"); + String tradeNo = resultUtil.getTradeNo(); + String s = resultUtil.getTradeStatus(); + if("TRADE_CLOSED".equals(s) || "TRADE_FINISHED".equals(s) || num == 10){ paymentCompetition.setAppUserId(null); paymentCompetition.setState(3); diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/util/PayMoneyUtil.java b/cloud-server-competition/src/main/java/com/dsh/competition/util/PayMoneyUtil.java index 4386ba0..d293072 100644 --- a/cloud-server-competition/src/main/java/com/dsh/competition/util/PayMoneyUtil.java +++ b/cloud-server-competition/src/main/java/com/dsh/competition/util/PayMoneyUtil.java @@ -255,7 +255,7 @@ * @return * @throws Exception */ - public ResultUtil queryALIOrder(String out_trade_no) throws Exception{ + public AlipayTradeQueryResponse queryALIOrder(String out_trade_no) throws Exception{ AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do",aliAppid, appPrivateKey,"json","UTF-8",alipay_public_key,"RSA2"); AlipayTradeQueryRequest request = new AlipayTradeQueryRequest(); request.setBizContent("{" + @@ -264,9 +264,10 @@ AlipayTradeQueryResponse response = alipayClient.execute(request); if(response.isSuccess()){ String tradeStatus = response.getTradeStatus();//交易状态:WAIT_BUYER_PAY(交易创建,等待买家付款)、TRADE_CLOSED(未付款交易超时关闭,或支付完成后全额退款)、TRADE_SUCCESS(交易支付成功)、TRADE_FINISHED(交易结束,不可退款) - return ResultUtil.success(tradeStatus); +// return ResultUtil.success(tradeStatus); + return response; } else { - return ResultUtil.error(response.getMsg()); + return response; } } diff --git a/cloud-server-course/src/main/java/com/dsh/course/feignclient/activity/model/Coupon.java b/cloud-server-course/src/main/java/com/dsh/course/feignclient/activity/model/Coupon.java index eaa0e5f..aadff20 100644 --- a/cloud-server-course/src/main/java/com/dsh/course/feignclient/activity/model/Coupon.java +++ b/cloud-server-course/src/main/java/com/dsh/course/feignclient/activity/model/Coupon.java @@ -112,4 +112,7 @@ */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date insertTime; + + + private String timePeriod; } diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java index 6ff5922..9d76025 100644 --- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java +++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java @@ -1044,6 +1044,7 @@ // AlipayTradeRoyaltyRelationBindRequest request1 = new AlipayTradeRoyaltyRelationBindRequest(); + AlipayTradeRoyaltyRelationBindModel bindModel = new AlipayTradeRoyaltyRelationBindModel(); request1.setBizContent("{" + @@ -1580,6 +1581,18 @@ coursePackagePaymentConfig.setCouponIds("-1"); } List<Coupon> coupons = couponClient.getCoupons(coursePackagePaymentConfig.getCouponIds()); + + for (Coupon coupon : coupons) { + Date date1 = coupon.getStartTime(); // 2023-10-01 00:00:00 + Date date2 = coupon.getEndTime(); // 2023-10-12 00:00:00 + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd"); + String dateString1 = sdf.format(date1); + String dateString2 = sdf.format(date2); + + String result = dateString1 + "-" + dateString2; + coupon.setTimePeriod(result); + } return ResultUtil.success(coupons); } } diff --git a/cloud-server-other/src/main/java/com/dsh/other/util/TaskUtil.java b/cloud-server-other/src/main/java/com/dsh/other/util/TaskUtil.java index 7eeb104..b294a0c 100644 --- a/cloud-server-other/src/main/java/com/dsh/other/util/TaskUtil.java +++ b/cloud-server-other/src/main/java/com/dsh/other/util/TaskUtil.java @@ -34,6 +34,7 @@ if(System.currentTimeMillis()>l){ siteBooking.setStatus(5); siteBookingMapper.updateById(siteBooking); + } } //定时修改赛事状态 @@ -41,4 +42,27 @@ e.printStackTrace(); } } + + + + //预约场地后,时间超过endTime,状态变为已过期 + @Scheduled(fixedRate = 60000) + public void taskMinute1(){ + try { + List<SiteBooking> siteBookings = siteBookingMapper.selectList(new LambdaQueryWrapper<SiteBooking>().eq(SiteBooking::getStatus, 1)); + for (SiteBooking siteBooking : siteBookings) { + long time = siteBooking.getEndTime().getTime(); + if (System.currentTimeMillis() > time) { + siteBooking.setStatus(4); + siteBookingMapper.updateById(siteBooking); + } + + } + //定时修改赛事状态 + } catch (Exception e) { + e.printStackTrace(); + } + } + + } -- Gitblit v1.7.1