Commit f8487a87 by 胡博文

增加查询接口 是否可申诉按钮控制

parent c01c87b3
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
package cn.freemud.adapter; package cn.freemud.adapter;
import cn.freemud.base.util.DateUtil; import cn.freemud.base.util.DateUtil;
import cn.freemud.constant.CommonsConstant;
import cn.freemud.constant.CustomerScoreConstant; import cn.freemud.constant.CustomerScoreConstant;
import cn.freemud.constant.KgdRedisKeyConstant; import cn.freemud.constant.KgdRedisKeyConstant;
import cn.freemud.constant.RedisKeyConstant; import cn.freemud.constant.RedisKeyConstant;
...@@ -1167,9 +1168,20 @@ public class OrderAdapter { ...@@ -1167,9 +1168,20 @@ public class OrderAdapter {
if (CollectionUtils.isEmpty(ordersBeans)) { if (CollectionUtils.isEmpty(ordersBeans)) {
return Collections.emptyList(); return Collections.emptyList();
} }
List<QueryOrderResponseVo> list = Lists.newArrayList(); List<QueryOrderResponseVo> list = Lists.newArrayList();
QueryOrdersResponse.DataBean.OrderBean orderBean = ordersBeans.get(0);
String partnerId = "";
if (null != orderBean) {
partnerId = orderBean.getCompanyId();
}
String configStr = redisCache.hashGet(MessageFormat.format(KgdRedisKeyConstant.ORDER_COMPLAIN_KEY, partnerId, wxAppId), KgdRedisKeyConstant.ORDER_COMPLAIN_TYPE);
Boolean buttonComplain = true;
if (CommonsConstant.ORDER_COMPLAIN_CLOSE.equals(configStr)) {
buttonComplain = false;
}
for (QueryOrdersResponse.DataBean.OrderBean ordersBean : ordersBeans) {
ordersBeans.forEach(ordersBean -> {
QueryOrderResponseVo responseVo = new QueryOrderResponseVo(); QueryOrderResponseVo responseVo = new QueryOrderResponseVo();
responseVo.setOid(ordersBean.getOid()); responseVo.setOid(ordersBean.getOid());
responseVo.setShopId(ordersBean.getShopId()); responseVo.setShopId(ordersBean.getShopId());
...@@ -1177,6 +1189,7 @@ public class OrderAdapter { ...@@ -1177,6 +1189,7 @@ public class OrderAdapter {
responseVo.setShopNameEn(ordersBean.getShopNameEn()); responseVo.setShopNameEn(ordersBean.getShopNameEn());
responseVo.setShopAddress(ordersBean.getShopAddress()); responseVo.setShopAddress(ordersBean.getShopAddress());
responseVo.setShopPhone(ordersBean.getShopPhone()); responseVo.setShopPhone(ordersBean.getShopPhone());
responseVo.setButtonComplain(buttonComplain);
responseVo.setReceiveAddress(ordersBean.getAddress()); responseVo.setReceiveAddress(ordersBean.getAddress());
if (OrderClientType.SAASMALL.getIndex().toString() == ordersBean.getOrderClient()) { if (OrderClientType.SAASMALL.getIndex().toString() == ordersBean.getOrderClient()) {
responseVo.setReceiveUsername(ordersBean.getContactsName()); responseVo.setReceiveUsername(ordersBean.getContactsName());
...@@ -1533,7 +1546,8 @@ public class OrderAdapter { ...@@ -1533,7 +1546,8 @@ public class OrderAdapter {
responseVo.setAutoReviceTime(null == orderExtInfoDto ? null : orderExtInfoDto.getAutoReceiveTime()); responseVo.setAutoReviceTime(null == orderExtInfoDto ? null : orderExtInfoDto.getAutoReceiveTime());
responseVo.setAfterSalesOrderResp(ordersBean.getAfterSalesOrderResp()); responseVo.setAfterSalesOrderResp(ordersBean.getAfterSalesOrderResp());
list.add(responseVo); list.add(responseVo);
}); }
AppLogUtil.infoLog("fisherman orderBean:", JSON.toJSONString(ordersBeans), JSON.toJSONString(list)); AppLogUtil.infoLog("fisherman orderBean:", JSON.toJSONString(ordersBeans), JSON.toJSONString(list));
return list; return list;
} }
......
...@@ -6,4 +6,9 @@ public class CommonsConstant { ...@@ -6,4 +6,9 @@ public class CommonsConstant {
public final static Integer WEIGHT_PRODUCT = 1; public final static Integer WEIGHT_PRODUCT = 1;
public static final String ORDER_COMPLAIN_OPEN = "open";
public static final String ORDER_COMPLAIN_CLOSE = "close";
} }
\ No newline at end of file
...@@ -27,10 +27,13 @@ public class KgdRedisKeyConstant { ...@@ -27,10 +27,13 @@ public class KgdRedisKeyConstant {
*/ */
public static final String REFUND_CFG_TAKE_OUT = "takeOutType"; public static final String REFUND_CFG_TAKE_OUT = "takeOutType";
public static final String ORDER_COMPLAIN_KEY= "kgd:order_config_{0}_{1}"; public static final String ORDER_COMPLAIN_KEY = "kgd:order_config_{0}_{1}";
public static final String ORDER_COMPLAIN_TYPE = "orderComplaintType"; public static final String ORDER_COMPLAIN_TYPE = "orderComplaintType";
} }
...@@ -196,6 +196,8 @@ public class QueryOrderResponseVo { ...@@ -196,6 +196,8 @@ public class QueryOrderResponseVo {
* 申请退款按钮 * 申请退款按钮
*/ */
private Boolean buttonRefund; private Boolean buttonRefund;
private Boolean buttonComplain;
/** /**
* 联系商家按钮 * 联系商家按钮
*/ */
......
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