Commit a2f6ce43 by 查志伟

修复key和hkey在sdk中写反的问题

parent 4cf11ffb
...@@ -2084,7 +2084,7 @@ public class OrderAdapter { ...@@ -2084,7 +2084,7 @@ public class OrderAdapter {
// 查询小程序配置的退款设置 // 查询小程序配置的退款设置
boolean canRefund = false; boolean canRefund = false;
String hkey = OrderType.TAKE_OUT.getCode().equals(orderBean.getOrderType()) ? KgdRedisKeyConstant.REFUND_CFG_TAKE_OUT : KgdRedisKeyConstant.REFUND_CFG_EAT_IN; String hkey = OrderType.TAKE_OUT.getCode().equals(orderBean.getOrderType()) ? KgdRedisKeyConstant.REFUND_CFG_TAKE_OUT : KgdRedisKeyConstant.REFUND_CFG_EAT_IN;
String configStr = redisCache.hashGet(hkey, MessageFormat.format(KgdRedisKeyConstant.ORDER_REFUND_CONFIG, orderBean.getCompanyId(), wxAppId)); String configStr = redisCache.hashGet(MessageFormat.format(KgdRedisKeyConstant.ORDER_REFUND_CONFIG, orderBean.getCompanyId(), wxAppId), hkey);
if (StringUtils.isEmpty(configStr)) { if (StringUtils.isEmpty(configStr)) {
return true; return true;
} }
......
...@@ -1923,7 +1923,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -1923,7 +1923,7 @@ public class OrderServiceImpl implements Orderservice {
} }
}else { }else {
// 查询小程序是否配置了退运费 // 查询小程序是否配置了退运费
String configStr = redisCache.hashGet(KgdRedisKeyConstant.REFUND_CFG_TAKE_OUT, MessageFormat.format(KgdRedisKeyConstant.ORDER_REFUND_CONFIG, orderBean.getCompanyId(), wxAppId)); String configStr = redisCache.hashGet(MessageFormat.format(KgdRedisKeyConstant.ORDER_REFUND_CONFIG, orderBean.getCompanyId(), wxAppId), KgdRedisKeyConstant.REFUND_CFG_TAKE_OUT);
if (StringUtils.isNotEmpty(configStr)) { if (StringUtils.isNotEmpty(configStr)) {
JSONObject config = JSON.parseObject(configStr); JSONObject config = JSON.parseObject(configStr);
String refundDeliveryFeeConfig = config.getString(OrderRefundEnum.REFUND_DELIVERY_FEE_ENABLE.getKeyValue()); String refundDeliveryFeeConfig = config.getString(OrderRefundEnum.REFUND_DELIVERY_FEE_ENABLE.getKeyValue());
......
...@@ -563,7 +563,7 @@ public class OrderVerifyHandle { ...@@ -563,7 +563,7 @@ public class OrderVerifyHandle {
// 查询小程序配置的退款设置 // 查询小程序配置的退款设置
String hkey = OrderType.TAKE_OUT.getCode().equals(data.getOrderType()) ? KgdRedisKeyConstant.REFUND_CFG_TAKE_OUT : KgdRedisKeyConstant.REFUND_CFG_EAT_IN; String hkey = OrderType.TAKE_OUT.getCode().equals(data.getOrderType()) ? KgdRedisKeyConstant.REFUND_CFG_TAKE_OUT : KgdRedisKeyConstant.REFUND_CFG_EAT_IN;
String configStr = redisCache.hashGet(hkey, MessageFormat.format(KgdRedisKeyConstant.ORDER_REFUND_CONFIG, data.getCompanyId(), extInfo.getAppid())); String configStr = redisCache.hashGet(MessageFormat.format(KgdRedisKeyConstant.ORDER_REFUND_CONFIG, data.getCompanyId(), extInfo.getAppid()), hkey);
if (StringUtils.isEmpty(configStr)) { if (StringUtils.isEmpty(configStr)) {
return true; return true;
} }
......
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