@@ -32,6 +32,9 @@ public class CallbackPayController extends BaseController { | |||
public void _payV3Notify(@RequestBody Map<String, Object> paranMap, HttpServletRequest request, HttpServletResponse response) throws IOException, JDOMException { | |||
logger.debug("[" + getIpAddr() + "] CallbackPayController::photoSpeak"); | |||
logger.info("支付回调结果通知{}"+JSONObject.toJSONString(paranMap)); | |||
/** | |||
* {"id":"4330b030-788f-5067-8c8a-69ee373d43ad","create_time":"2023-08-28T18:44:56+08:00","resource_type":"encrypt-resource","event_type":"TRANSACTION.SUCCESS","summary":"支付成功","resource":{"original_type":"transaction","algorithm":"AEAD_AES_256_GCM","ciphertext":"PneNTwSVDoirBNQsJstB/yX1dNMupj7uKQVEVfLOoyMSCqKh+KMwIdanidbcs6OnSy1Xmx4MploMaQ5rSg66sFDQ9nDuSVc4S/I3OVflu1l7z9vR+FJiztpTqhr/ekeNz9VivtqPPtn6N3dCyZb6iCEwnXT+TEB8SBZe4bPSPFGhB/MB9w1ZpqP14OvMDUnzKM15mdex6wmAJH6qIbd1aH3jrW/Lv7KeyfXEYrRDljq2Za6476UQxeAcsR3JA6QpWwrhYxpKFQEHuGMdiVC1KvQsP3+JUWOKSiQQ1r5upTACPI8n5B/kOeXJA8MnTgY/7lZiA6ys2dt8jqxzL8IlDracnlwvsiRAuXjRjcX6pYCz4q0HwIYb1nHXE+iRcSGm8h+xFFsnhGgxrhEVz6ARhK6ZtKtibCv7Ll/a/d090FBKtVXzCWB6cLMMmfrIwLQFqiFUtb6zsV/zusAJdwHZt3LmtgGahoV3+UPTnbztEAp5IJGz2imGPTsk7QpvKWQknf5FM/Z1fhr/vb+pZV5NGBZ+6l/mI8isA4HtljzNHU/PuKCGO8uWu6QFevgAftGGww==","associated_data":"transaction","nonce":"Hrcahgdp1eO6"}} | |||
*/ | |||
response.setStatus(200); | |||
} | |||
@@ -121,45 +121,45 @@ public class PhotoSpeakSchedule { | |||
* 超分上传阿里云 | |||
*/ | |||
// @Scheduled(cron = "0 */30 * * * *?") // 每半小时检查一次 | |||
public void userVideoHyUploadSchedule() { | |||
List<PhotoSpeakVideo> videos = photoSpeakVideoService.getNotHyUploadList(); | |||
if (videos != null && videos.size() > 0) { | |||
for (PhotoSpeakVideo video : videos) { | |||
try { | |||
photoSpeakVideoService.uploadHyVideo(video); | |||
} catch (Exception e) { | |||
logger.error("TtCouponVideoSchedule error.couponVideoSchedule:"+video.getId(),e); | |||
} | |||
} | |||
} | |||
} | |||
// public void userVideoHyUploadSchedule() { | |||
// List<PhotoSpeakVideo> videos = photoSpeakVideoService.getNotHyUploadList(); | |||
// if (videos != null && videos.size() > 0) { | |||
// for (PhotoSpeakVideo video : videos) { | |||
// try { | |||
// photoSpeakVideoService.uploadHyVideo(video); | |||
// } catch (Exception e) { | |||
// logger.error("TtCouponVideoSchedule error.couponVideoSchedule:"+video.getId(),e); | |||
// } | |||
// } | |||
// } | |||
// } | |||
/** | |||
* 获取超分时长和大小 | |||
*/ | |||
// @Scheduled(cron = "0 1/5 * * * *?") // 每五分钟检查一次 | |||
public void userVideoHyDetailSchedule() { | |||
List<PhotoSpeakVideo> videos = photoSpeakVideoService.getUpLoadHyIngList(); | |||
if (videos != null && videos.size() > 0) { | |||
for (PhotoSpeakVideo video : videos) { | |||
try { | |||
VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(video.getVideoId(),false); | |||
if (videoDetail.isSuccess() | |||
&& StringUtils.isNotBlank(videoDetail.getDuration()) | |||
&& !"0.0".equals(videoDetail.getDuration())) { | |||
video.setCoverImg(videoDetail.getCoverURL()); | |||
video.setVideoPlayUrl(videoDetail.getVideoUrl()); | |||
video.setVideoTime(videoDetail.getDuration()); | |||
video.setVideoSize(videoDetail.getSize()); | |||
video.setVideoStatus(EnumVideoStatus.hy_upload_success.getCode()); | |||
photoSpeakVideoService.updateById(video); | |||
} | |||
} catch (Exception e) { | |||
logger.error("TtCouponVideoSchedule error.couponVideoSchedule:"+video.getId(),e); | |||
} | |||
} | |||
} | |||
} | |||
// public void userVideoHyDetailSchedule() { | |||
// List<PhotoSpeakVideo> videos = photoSpeakVideoService.getUpLoadHyIngList(); | |||
// if (videos != null && videos.size() > 0) { | |||
// for (PhotoSpeakVideo video : videos) { | |||
// try { | |||
// VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(video.getVideoId(),false); | |||
// if (videoDetail.isSuccess() | |||
// && StringUtils.isNotBlank(videoDetail.getDuration()) | |||
// && !"0.0".equals(videoDetail.getDuration())) { | |||
// video.setCoverImg(videoDetail.getCoverURL()); | |||
// video.setVideoPlayUrl(videoDetail.getVideoUrl()); | |||
// video.setVideoTime(videoDetail.getDuration()); | |||
// video.setVideoSize(videoDetail.getSize()); | |||
// video.setVideoStatus(EnumVideoStatus.hy_upload_success.getCode()); | |||
// photoSpeakVideoService.updateById(video); | |||
// } | |||
// } catch (Exception e) { | |||
// logger.error("TtCouponVideoSchedule error.couponVideoSchedule:"+video.getId(),e); | |||
// } | |||
// } | |||
// } | |||
// } | |||
/** | |||
* 超分生成视频 | |||
@@ -413,7 +413,7 @@ public class WxMiniAppPayV3AdapterService extends BaseWxPayV3AdapterService impl | |||
}else if (payAccount.getMchType() == EnumPayMchType.DIRECT.getCode()) { | |||
req.setSub_mchid(record.getSingleChildOrderShare().getMerchantUid()); | |||
} | |||
req.setOut_trade_no(record.getPayOrderNo()); | |||
req.setOut_trade_no(record.getPayOrderNo()); | |||
try { | |||
WxPayV3.payCommonClose(payService, req); | |||
return new PayAdapterResult(true, "close success", req, null); | |||
@@ -480,12 +480,12 @@ public class PhotoSpeakVideoServiceImpl implements PhotoSpeakVideoService { | |||
@Override | |||
public List<PhotoSpeakVideo> getNotHaveUrl() { | |||
PhotoSpeakVideo umVideoQ = new PhotoSpeakVideo(); | |||
List<Integer> videoStatuss = new ArrayList<>(); | |||
videoStatuss.add(EnumVideoStatus.hy_upload_ing.getCode()); | |||
// videoStatuss.add(EnumVideoStatus.hy_upload_success.getCode()); | |||
videoStatuss.add(EnumVideoStatus.upload_ing.getCode()); | |||
// videoStatuss.add(EnumVideoStatus.upload_success.getCode()); | |||
umVideoQ.setVideoStatuss(videoStatuss); | |||
// List<Integer> videoStatuss = new ArrayList<>(); | |||
// videoStatuss.add(EnumVideoStatus.hy_upload_ing.getCode()); | |||
//// videoStatuss.add(EnumVideoStatus.hy_upload_success.getCode()); | |||
// videoStatuss.add(EnumVideoStatus.upload_ing.getCode()); | |||
//// videoStatuss.add(EnumVideoStatus.upload_success.getCode()); | |||
// umVideoQ.setVideoStatuss(videoStatuss); | |||
return photoSpeakVideoMapper.getNotHaveUrl(umVideoQ); | |||
} | |||
@@ -176,13 +176,9 @@ | |||
select id,title,video_id,video_path, video_play_url,video_status | |||
from photo_speak_video | |||
where `is_del` = 0 | |||
<if test=" null != videoStatuss "> | |||
and video_status in | |||
<foreach collection="videoStatuss" index="index" item="videoStatusItem" open="(" separator="," close=")"> | |||
#{videoStatusItem} | |||
</foreach> | |||
</if> | |||
or `cover_img` = '' | |||
and `video_id` is not null | |||
and `video_id` != '' | |||
and (`cover_img` = '' or `cover_img` is null) | |||
</select> | |||
</mapper> |