diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/AbstractOrderLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/AbstractOrderLogic.java index 02d52883a..42f959b0f 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/AbstractOrderLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/AbstractOrderLogic.java @@ -24,6 +24,7 @@ import com.jsowell.wxpay.service.WxAppletRemoteService; import org.apache.commons.collections4.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import javax.annotation.Resource; @@ -35,7 +36,7 @@ import java.util.Map; /** * 描述订单逻辑 */ -public abstract class AbstractOrderLogic { +public abstract class AbstractOrderLogic implements InitializingBean { protected Logger logger = LoggerFactory.getLogger(this.getClass()); @Resource diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/DelayMerchantOrderLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/DelayMerchantOrderLogic.java index bf6b83113..5ef3f2056 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/DelayMerchantOrderLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/DelayMerchantOrderLogic.java @@ -39,6 +39,11 @@ import java.util.stream.Collectors; @Service public class DelayMerchantOrderLogic extends AbstractOrderLogic { + @Override + public void afterPropertiesSet() throws Exception { + + } + /** * 余额支付订单 */ diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/NotDelayMerchantOrderLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/NotDelayMerchantOrderLogic.java index a711e2f7d..d63b81024 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/NotDelayMerchantOrderLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/NotDelayMerchantOrderLogic.java @@ -38,6 +38,10 @@ import java.util.stream.Collectors; @Service public class NotDelayMerchantOrderLogic extends AbstractOrderLogic{ + @Override + public void afterPropertiesSet() throws Exception { + + } /** * 余额支付订单 diff --git a/jsowell-ui/src/views/order/order/orderDetail.vue b/jsowell-ui/src/views/order/order/orderDetail.vue index 053c6f652..271b5f01b 100644 --- a/jsowell-ui/src/views/order/order/orderDetail.vue +++ b/jsowell-ui/src/views/order/order/orderDetail.vue @@ -505,21 +505,21 @@ export default { return [this.lastMonitorData]; }, retryRefundFlag() { - if (this.orderInfo == null || this.orderInfo.orderStatus !== "6") { - return false; - } - if (this.payDetail[0] == null || this.payDetail[0].payMode !== "4") { - return false; - } - if ( - this.payDetail[0].refundAmount == null || - this.payDetail[0].refundAmount <= 0.0 - ) { - return false; - } - if (this.orderRefundInfoList.length === 0) { - return false; - } + // if (this.orderInfo == null || this.orderInfo.orderStatus !== "6") { + // return false; + // } + // if (this.payDetail[0] == null || this.payDetail[0].payMode !== "4") { + // return false; + // } + // if ( + // this.payDetail[0].refundAmount == null || + // this.payDetail[0].refundAmount <= 0.0 + // ) { + // return false; + // } + // if (this.orderRefundInfoList.length === 0) { + // return false; + // } return true; }, },