From 7b464faaaa9ef0bf6acd86b7f46b7c74ebabf5e7 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 28 Aug 2023 18:57:08 +0800 Subject: [PATCH] // --- .../schedule/ProductOrderSchedule.java | 4 +-- .../service/impl/ProductOrderServiceImpl.java | 23 ++++++------- .../iformall/sm/AiDigitalAvatarHelper.java | 34 +++++++++---------- 3 files changed, 29 insertions(+), 32 deletions(-) diff --git a/suimangSchedule/src/main/java/com/iformall/schedule/ProductOrderSchedule.java b/suimangSchedule/src/main/java/com/iformall/schedule/ProductOrderSchedule.java index 3433015..96d7aff 100644 --- a/suimangSchedule/src/main/java/com/iformall/schedule/ProductOrderSchedule.java +++ b/suimangSchedule/src/main/java/com/iformall/schedule/ProductOrderSchedule.java @@ -28,11 +28,11 @@ public class ProductOrderSchedule { @Autowired private ProductOrderSharingService productOrderSharingService; - @Scheduled(cron = "0 1/10 * * * *?") + @Scheduled(cron = "0 3/5 * * * *?") public void productOrderSharingSchedule() { ProductOrder productOrderQ = new ProductOrder(); productOrderQ.setOrderStatus(EnumProductOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()); - productOrderQ.setEndDate(DateUtils.getHourDateBefore(1,new Date())); +// productOrderQ.setEndDate(DateUtils.getHourDateBefore(1,new Date())); List orderList = productOrderService.findList(productOrderQ); for (ProductOrder order: orderList) { try{ diff --git a/suimangService/src/main/java/com/iformall/service/impl/ProductOrderServiceImpl.java b/suimangService/src/main/java/com/iformall/service/impl/ProductOrderServiceImpl.java index 3040cb5..463f2d5 100644 --- a/suimangService/src/main/java/com/iformall/service/impl/ProductOrderServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/impl/ProductOrderServiceImpl.java @@ -246,10 +246,6 @@ public class ProductOrderServiceImpl implements ProductOrderService { if(!EnumProductOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode().equals(productOrder.getOrderStatus())){ return; } - Date hourDateBefore = DateUtils.getHourDateBefore(1, new Date()); - if(productOrder.getCreateDate().after(hourDateBefore)){ - return; - } if(productOrder.getPayVendor() != null){ PayAdapterService payAdapterService = payServiceFactory.getPayAdapterService(productOrder.getPayVendor()); @@ -261,16 +257,17 @@ public class ProductOrderServiceImpl implements ProductOrderService { if(ResultData.SUCCESS != resultData.code){ return; } - if(!EnumProductOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode().equals(productOrder.getProfitSharing())){ - return; - } } - - productOrder.setOrderStatus(EnumProductOrderStatus.ORDER_STATUS_OVERTIME_CANCEL.getCode()); - productOrder.setIsOrderStatus(EnumProductOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()); - productOrder.setUpdateDate(new Date()); - int num = productOrderMapper.orderPayUpdStatus(productOrder); - + if(!EnumProductOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode().equals(productOrder.getProfitSharing())){ + return; + } + Date hourDateBefore = DateUtils.getHourDateBefore(1, new Date()); + if(productOrder.getCreateDate().before(hourDateBefore)){ + productOrder.setOrderStatus(EnumProductOrderStatus.ORDER_STATUS_OVERTIME_CANCEL.getCode()); + productOrder.setIsOrderStatus(EnumProductOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()); + productOrder.setUpdateDate(new Date()); + int num = productOrderMapper.orderPayUpdStatus(productOrder); + } } } diff --git a/suimangService/src/main/java/com/iformall/sm/AiDigitalAvatarHelper.java b/suimangService/src/main/java/com/iformall/sm/AiDigitalAvatarHelper.java index ab01946..bc8845c 100644 --- a/suimangService/src/main/java/com/iformall/sm/AiDigitalAvatarHelper.java +++ b/suimangService/src/main/java/com/iformall/sm/AiDigitalAvatarHelper.java @@ -33,8 +33,8 @@ public class AiDigitalAvatarHelper { public static AiCheckPhotoResult checkPhoto(AiCheckPhotoParam param) { -// String response = HttpUtil.doAiVideoPost("http://nas.pucao.cn:2005/dec_face", JSONObject.toJSONString(param)); - String response = HttpUtil.doAiVideoPost(digital_avatar + "/dec_face", JSONObject.toJSONString(param)); + String response = HttpUtil.doAiVideoPost("http://nas.pucao.cn:2005/dec_face", JSONObject.toJSONString(param)); +// String response = HttpUtil.doAiVideoPost(digital_avatar + "/dec_face", JSONObject.toJSONString(param)); log.info("图片人脸检测 end response:" + response); AiCheckPhotoResult result = new AiCheckPhotoResult(); @@ -70,8 +70,8 @@ public class AiDigitalAvatarHelper { param.setCallback_url("https://phototest.metavatar.cc/C/callback/photo/speak"); // param.setCallback_url(callbackUrl + "/callback/photo/speak"); // log.info("生成照片start request:" + param.getBg_img()); -// String response = HttpUtil.doAiVideoPost("http://nas.pucao.cn:2005/make_face", JSONObject.toJSONString(param)); - String response = HttpUtil.doAiVideoPost(digital_avatar + "/make_face", JSONObject.toJSONString(param)); + String response = HttpUtil.doAiVideoPost("http://nas.pucao.cn:2005/make_face", JSONObject.toJSONString(param)); +// String response = HttpUtil.doAiVideoPost(digital_avatar + "/make_face", JSONObject.toJSONString(param)); log.info("生成照片end response:"+response); DigitalAvatarResult result = new DigitalAvatarResult(); @@ -182,21 +182,21 @@ public class AiDigitalAvatarHelper { } public static void main(String[] args) { -// AiCheckPhotoParam param = new AiCheckPhotoParam(); -// String img = Base64Util.imageUrlToBase64("https://suimang.oss-accelerate.aliyuncs.com/builtin/personmould/16760216806604820_cSHoijDX_grace_1080.jpg"); -// param.setImg(img); -// AiCheckPhotoResult result = AiDigitalAvatarHelper.checkPhoto(param); -// System.out.println(result); - - - DigitalAvatarParam param = new DigitalAvatarParam(); - param.setBg_img("style_threeface"); + AiCheckPhotoParam param = new AiCheckPhotoParam(); String img = Base64Util.imageUrlToBase64("https://suimang.oss-accelerate.aliyuncs.com/builtin/personmould/16760216806604820_cSHoijDX_grace_1080.jpg"); - param.setImg_lift(img); - param.setImg_middle(img); - param.setImg_right(img); - DigitalAvatarResult result = AiDigitalAvatarHelper.digitalAvatarPhoto(param,100001l); + param.setImg(img); + AiCheckPhotoResult result = AiDigitalAvatarHelper.checkPhoto(param); System.out.println(result); + + +// DigitalAvatarParam param = new DigitalAvatarParam(); +// param.setBg_img("style_threeface"); +// String img = Base64Util.imageUrlToBase64("https://suimang.oss-accelerate.aliyuncs.com/builtin/personmould/16760216806604820_cSHoijDX_grace_1080.jpg"); +// param.setImg_lift(img); +// param.setImg_middle(img); +// param.setImg_right(img); +// DigitalAvatarResult result = AiDigitalAvatarHelper.digitalAvatarPhoto(param,100001l); +// System.out.println(result); }