Parcourir la source

//

private_deployment
xhxu il y a 1 an
Parent
révision
778ed9b42c
2 fichiers modifiés avec 15 ajouts et 16 suppressions
  1. +13
    -14
      suimangService/src/main/java/com/iformall/service/impl/ProductOrderServiceImpl.java
  2. +2
    -2
      suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java

+ 13
- 14
suimangService/src/main/java/com/iformall/service/impl/ProductOrderServiceImpl.java Voir le fichier

@@ -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());


+ 2
- 2
suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java Voir le fichier

@@ -482,9 +482,9 @@ public class PhotoSpeakVideoServiceImpl implements PhotoSpeakVideoService {
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.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);
}


Chargement…
Annuler
Enregistrer