From 778ed9b42c2177b44d3976d60e5a5e2655c0eff0 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 28 Aug 2023 13:13:57 +0800 Subject: [PATCH] // --- .../service/impl/ProductOrderServiceImpl.java | 27 +++++++++---------- .../sm/impl/PhotoSpeakVideoServiceImpl.java | 4 +-- 2 files changed, 15 insertions(+), 16 deletions(-) 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 ee154d5..cf6b9f8 100644 --- a/suimangService/src/main/java/com/iformall/service/impl/ProductOrderServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/impl/ProductOrderServiceImpl.java @@ -242,10 +242,6 @@ public class ProductOrderServiceImpl implements ProductOrderService { if(productOrder == null){ return; } - if(productOrder.getPayVendor() == null){ - return; - } - if(!EnumProductOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode().equals(productOrder.getOrderStatus())){ return; } @@ -253,17 +249,20 @@ public class ProductOrderServiceImpl implements ProductOrderService { if(productOrder.getCreateDate().after(hourDateBefore)){ return; } - PayAdapterService payAdapterService = payServiceFactory.getPayAdapterService(productOrder.getPayVendor()); - EnumProductOrderPayVendor payVendoEnum = EnumProductOrderPayVendor.getEnum(productOrder.getPayVendor()); - WxAppinfo appinfo = wxAppinfoService.getProjectCAppInfoFromRedis(productOrder.getProjectType(), payVendoEnum.getPlat()); - WxPayAccount payAccount = wxPayAccountService.getByIdFromRedis(appinfo.getPayId()); - ResultData resultData = handleProductOrderByQuery(appinfo,payAccount,productOrder,payAdapterService); - if(ResultData.SUCCESS != resultData.code){ - return; - } - if(!EnumProductOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode().equals(productOrder.getProfitSharing())){ - return; + if(productOrder.getPayVendor() != null){ + PayAdapterService payAdapterService = payServiceFactory.getPayAdapterService(productOrder.getPayVendor()); + EnumProductOrderPayVendor payVendoEnum = EnumProductOrderPayVendor.getEnum(productOrder.getPayVendor()); + + WxAppinfo appinfo = wxAppinfoService.getProjectCAppInfoFromRedis(productOrder.getProjectType(), payVendoEnum.getPlat()); + WxPayAccount payAccount = wxPayAccountService.getByIdFromRedis(appinfo.getPayId()); + ResultData resultData = handleProductOrderByQuery(appinfo,payAccount,productOrder,payAdapterService); + 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()); diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java index 1b13c77..89ebd27 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java @@ -482,9 +482,9 @@ public class PhotoSpeakVideoServiceImpl implements PhotoSpeakVideoService { PhotoSpeakVideo umVideoQ = new PhotoSpeakVideo(); List videoStatuss = new ArrayList<>(); videoStatuss.add(EnumVideoStatus.hy_upload_ing.getCode()); - videoStatuss.add(EnumVideoStatus.hy_upload_success.getCode()); +// videoStatuss.add(EnumVideoStatus.hy_upload_success.getCode()); videoStatuss.add(EnumVideoStatus.upload_ing.getCode()); - videoStatuss.add(EnumVideoStatus.upload_success.getCode()); +// videoStatuss.add(EnumVideoStatus.upload_success.getCode()); umVideoQ.setVideoStatuss(videoStatuss); return photoSpeakVideoMapper.getNotHaveUrl(umVideoQ); }