Commit 6b5a2652 by zhiheng.zhang

根据太一配置修改

parent e8a65b9d
...@@ -133,6 +133,8 @@ public class OrderAdapter { ...@@ -133,6 +133,8 @@ public class OrderAdapter {
private String withOrderBuyCouponCode; private String withOrderBuyCouponCode;
@Value("${pay.turnoff.refund}") @Value("${pay.turnoff.refund}")
private String payTurnoffRefund = "0"; private String payTurnoffRefund = "0";
@Value("${pay.turnoff.refund.partnerId}")
private String payTurnoffRefundPartnerId = "0";
/** /**
* coco商户 * coco商户
...@@ -1427,7 +1429,7 @@ public class OrderAdapter { ...@@ -1427,7 +1429,7 @@ public class OrderAdapter {
responseVo.setProgress(ordersBean.getProgress()); responseVo.setProgress(ordersBean.getProgress());
responseVo.setQueueIndex(ordersBean.getQueueIndex()); responseVo.setQueueIndex(ordersBean.getQueueIndex());
responseVo.setOrderProgressBarStatus(ordersBean.getOrderProgressBarStatus()); responseVo.setOrderProgressBarStatus(ordersBean.getOrderProgressBarStatus());
responseVo.setPayTurnoffRefund(getPayTurnoffRefund(ordersBean)); responseVo.setPayTurnoffRefund(getPayTurnoffRefund());
list.add(responseVo); list.add(responseVo);
}); });
return list; return list;
...@@ -4128,9 +4130,9 @@ public class OrderAdapter { ...@@ -4128,9 +4130,9 @@ public class OrderAdapter {
/** /**
* 获取是否支持订单退款 * 获取是否支持订单退款
*/ */
public String getPayTurnoffRefund(QueryOrdersResponse.DataBean.OrderBean orderBean){ public String getPayTurnoffRefund(){
try { try {
AssortmentOpenPlatformPartnerConfig assortmentOpenPlatformPartnerConfig = assortmentOpenPlatformPartnerConfigManager.selectPartnerConfigByPartnerKey(orderBean.getCompanyId(),RedisKeyConstant.PARTNER_PAY_TURNOFF_REFUND,1); AssortmentOpenPlatformPartnerConfig assortmentOpenPlatformPartnerConfig = assortmentOpenPlatformPartnerConfigManager.selectPartnerConfigByPartnerKey(payTurnoffRefundPartnerId,RedisKeyConstant.PARTNER_PAY_TURNOFF_REFUND,1);
if (null != assortmentOpenPlatformPartnerConfig) { if (null != assortmentOpenPlatformPartnerConfig) {
payTurnoffRefund = assortmentOpenPlatformPartnerConfig.getPartnerValue(); payTurnoffRefund = assortmentOpenPlatformPartnerConfig.getPartnerValue();
} }
......
...@@ -116,7 +116,7 @@ public class MallOrderServiceImplTest { ...@@ -116,7 +116,7 @@ public class MallOrderServiceImplTest {
public void test() { public void test() {
String payTurnoffRefund = "0"; String payTurnoffRefund = "0";
try { try {
AssortmentOpenPlatformPartnerConfig assortmentOpenPlatformPartnerConfig = assortmentOpenPlatformPartnerConfigManager.selectPartnerConfigByPartnerKey("2239",RedisKeyConstant.PARTNER_PAY_TURNOFF_REFUND,1); AssortmentOpenPlatformPartnerConfig assortmentOpenPlatformPartnerConfig = assortmentOpenPlatformPartnerConfigManager.selectPartnerConfigByPartnerKey("0",RedisKeyConstant.PARTNER_PAY_TURNOFF_REFUND,1);
if (null != assortmentOpenPlatformPartnerConfig) { if (null != assortmentOpenPlatformPartnerConfig) {
payTurnoffRefund = assortmentOpenPlatformPartnerConfig.getPartnerValue(); payTurnoffRefund = assortmentOpenPlatformPartnerConfig.getPartnerValue();
} }
......
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