autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-13 11:49:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-09-01 10:46:54 +08:00
parent 554b1482ee
commit 3fd71220de
4 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/AbstractOrderLogic.java
View File

@@ -24,6 +24,7 @@ import com.jsowell.wxpay.service.WxAppletRemoteService;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import javax.annotation.Resource; 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()); protected Logger logger = LoggerFactory.getLogger(this.getClass());
@Resource @Resource

5
jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/DelayMerchantOrderLogic.java
View File

@@ -39,6 +39,11 @@ import java.util.stream.Collectors;
@Service @Service
public class DelayMerchantOrderLogic extends AbstractOrderLogic { public class DelayMerchantOrderLogic extends AbstractOrderLogic {
@Override
public void afterPropertiesSet() throws Exception {
}
/** /**
* 余额支付订单 * 余额支付订单
*/ */

4
jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/NotDelayMerchantOrderLogic.java
View File

@@ -38,6 +38,10 @@ import java.util.stream.Collectors;
@Service @Service
public class NotDelayMerchantOrderLogic extends AbstractOrderLogic{ public class NotDelayMerchantOrderLogic extends AbstractOrderLogic{
@Override
public void afterPropertiesSet() throws Exception {
}
/** /**
* 余额支付订单 * 余额支付订单

30
jsowell-ui/src/views/order/order/orderDetail.vue
View File

@@ -505,21 +505,21 @@ export default {
return [this.lastMonitorData]; return [this.lastMonitorData];
}, },
retryRefundFlag() { retryRefundFlag() {
if (this.orderInfo == null || this.orderInfo.orderStatus !== "6") { // if (this.orderInfo == null || this.orderInfo.orderStatus !== "6") {
return false; // return false;
} // }
if (this.payDetail[0] == null || this.payDetail[0].payMode !== "4") { // if (this.payDetail[0] == null || this.payDetail[0].payMode !== "4") {
return false; // return false;
} // }
if ( // if (
this.payDetail[0].refundAmount == null || // this.payDetail[0].refundAmount == null ||
this.payDetail[0].refundAmount <= 0.0 // this.payDetail[0].refundAmount <= 0.0
) { // ) {
return false; // return false;
} // }
if (this.orderRefundInfoList.length === 0) { // if (this.orderRefundInfoList.length === 0) {
return false; // return false;
} // }
return true; return true;
}, },
}, },