Commit 2668325e by ping.wu

支付配置表逻辑迁移非码付,退款不做校验门店支付配置

parent c3efd2eb
...@@ -1389,7 +1389,7 @@ public class PayServiceImpl { ...@@ -1389,7 +1389,7 @@ public class PayServiceImpl {
refundRequest.setTotalAmount(refundRequest.getRefundAmount()); refundRequest.setTotalAmount(refundRequest.getRefundAmount());
} }
AssortmentOpenPlatformIappWxappStore wxAppStore = this.assortmentOpenPlatformIappWxappStoreManager.selectWxappStoreByWxAppIdAndStoreId(refundRequest.getAppId(), refundRequest.getStoreId(), payCode); // AssortmentOpenPlatformIappWxappStore wxAppStore = this.assortmentOpenPlatformIappWxappStoreManager.selectWxappStoreByWxAppIdAndStoreId(refundRequest.getAppId(), refundRequest.getStoreId(), payCode);
PayRefundRequestDto request = new PayRefundRequestDto(); PayRefundRequestDto request = new PayRefundRequestDto();
request.setStoreId(refundRequest.getStoreId()); request.setStoreId(refundRequest.getStoreId());
request.setStationId(refundRequest.getStationId()); request.setStationId(refundRequest.getStationId());
...@@ -1405,7 +1405,7 @@ public class PayServiceImpl { ...@@ -1405,7 +1405,7 @@ public class PayServiceImpl {
request.setPartnerId(refundRequest.getPartnerId()); request.setPartnerId(refundRequest.getPartnerId());
request.setVer(2); request.setVer(2);
request.setExtendParams(refundRequest.getExtendParams()); request.setExtendParams(refundRequest.getExtendParams());
com.freemud.application.sdk.api.base.BaseResponse<OrderRefundResponse> checkParam = this.checkParam(refundRequest.getPartnerId(), refundRequest.getStoreId(), refundRequest.getRefundAmount(), wxAppStore); com.freemud.application.sdk.api.base.BaseResponse<OrderRefundResponse> checkParam = this.checkParam(refundRequest.getPartnerId(), refundRequest.getStoreId(), refundRequest.getRefundAmount());
if (!Objects.equals(checkParam.getCode(), "100")) { if (!Objects.equals(checkParam.getCode(), "100")) {
return checkParam; return checkParam;
} else { } else {
...@@ -1458,7 +1458,7 @@ public class PayServiceImpl { ...@@ -1458,7 +1458,7 @@ public class PayServiceImpl {
} }
public com.freemud.application.sdk.api.base.BaseResponse<OrderRefundResponse> checkParam(String partnerId, String storeId, Long amount, AssortmentOpenPlatformIappWxappStore wxAppStore) { public com.freemud.application.sdk.api.base.BaseResponse<OrderRefundResponse> checkParam(String partnerId, String storeId, Long amount) {
if (StringUtils.isBlank(partnerId)) { if (StringUtils.isBlank(partnerId)) {
return ResponseUtils.error("501", "商户号不能为空"); return ResponseUtils.error("501", "商户号不能为空");
} else if (StringUtils.isBlank(storeId)) { } else if (StringUtils.isBlank(storeId)) {
...@@ -1466,7 +1466,7 @@ public class PayServiceImpl { ...@@ -1466,7 +1466,7 @@ public class PayServiceImpl {
} else if (amount == null) { } else if (amount == null) {
return ResponseUtils.error("501", "金额不能为空"); return ResponseUtils.error("501", "金额不能为空");
} else { } else {
return wxAppStore == null ? ResponseUtils.error("500", "支付信息没有配置") : ResponseUtils.success(); return ResponseUtils.success();
} }
} }
......
...@@ -255,7 +255,7 @@ public class PaymentHandle { ...@@ -255,7 +255,7 @@ public class PaymentHandle {
if (refundRequest.getTotalAmount() == null || refundRequest.getTotalAmount() == 0L) { if (refundRequest.getTotalAmount() == null || refundRequest.getTotalAmount() == 0L) {
refundRequest.setTotalAmount(refundRequest.getRefundAmount()); refundRequest.setTotalAmount(refundRequest.getRefundAmount());
} }
AssortmentOpenPlatformIappWxappStore wxAppStore = this.assortmentOpenPlatformIappWxappStoreManager.selectWxappStoreByWxAppIdAndStoreId(refundRequest.getAppId(), refundRequest.getStoreId(), payCode); // AssortmentOpenPlatformIappWxappStore wxAppStore = this.assortmentOpenPlatformIappWxappStoreManager.selectWxappStoreByWxAppIdAndStoreId(refundRequest.getAppId(), refundRequest.getStoreId(), payCode);
PayRefundRequestDto request = new PayRefundRequestDto(); PayRefundRequestDto request = new PayRefundRequestDto();
request.setStoreId(refundRequest.getStoreId()); request.setStoreId(refundRequest.getStoreId());
request.setStationId(refundRequest.getStationId()); request.setStationId(refundRequest.getStationId());
...@@ -271,7 +271,7 @@ public class PaymentHandle { ...@@ -271,7 +271,7 @@ public class PaymentHandle {
request.setPartnerId(refundRequest.getPartnerId()); request.setPartnerId(refundRequest.getPartnerId());
request.setVer(2); request.setVer(2);
request.setExtendParams(refundRequest.getExtendParams()); request.setExtendParams(refundRequest.getExtendParams());
com.freemud.application.sdk.api.base.BaseResponse<OrderRefundResponse> checkParam = this.checkParam(refundRequest.getPartnerId(), refundRequest.getStoreId(), refundRequest.getRefundAmount(), wxAppStore); com.freemud.application.sdk.api.base.BaseResponse<OrderRefundResponse> checkParam = this.checkParam(refundRequest.getPartnerId(), refundRequest.getStoreId(), refundRequest.getRefundAmount());
if (!Objects.equals(checkParam.getCode(), "100")) { if (!Objects.equals(checkParam.getCode(), "100")) {
return null; return null;
} }
...@@ -450,7 +450,7 @@ public class PaymentHandle { ...@@ -450,7 +450,7 @@ public class PaymentHandle {
} }
private com.freemud.application.sdk.api.base.BaseResponse<OrderRefundResponse> checkParam(String partnerId, String storeId, Long amount, AssortmentOpenPlatformIappWxappStore wxAppStore) { private com.freemud.application.sdk.api.base.BaseResponse<OrderRefundResponse> checkParam(String partnerId, String storeId, Long amount) {
if (StringUtils.isBlank(partnerId)) { if (StringUtils.isBlank(partnerId)) {
return ResponseUtils.error("501", "商户号不能为空"); return ResponseUtils.error("501", "商户号不能为空");
} else if (StringUtils.isBlank(storeId)) { } else if (StringUtils.isBlank(storeId)) {
...@@ -458,7 +458,7 @@ public class PaymentHandle { ...@@ -458,7 +458,7 @@ public class PaymentHandle {
} else if (amount == null) { } else if (amount == null) {
return ResponseUtils.error("501", "金额不能为空"); return ResponseUtils.error("501", "金额不能为空");
} else { } else {
return wxAppStore == null ? ResponseUtils.error("500", "支付信息没有配置") : ResponseUtils.success(); return ResponseUtils.success();
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment