Commit 836a0f88 by 周晓航

新增注释,无代码改动

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent 0c207dca
...@@ -1869,6 +1869,7 @@ public class OrderAdapter { ...@@ -1869,6 +1869,7 @@ public class OrderAdapter {
return false; return false;
} }
String redisKey = MessageFormat.format(OrderRedisKeyConstant.ORDER_REFUND_CONFIG, partnerId, wxAppId); String redisKey = MessageFormat.format(OrderRedisKeyConstant.ORDER_REFUND_CONFIG, partnerId, wxAppId);
// 这里默认是 EAT_IN , 为了兼容后期可能会有改动
String hashKey = OrderType.TAKE_OUT.getCode().equals(orderType) String hashKey = OrderType.TAKE_OUT.getCode().equals(orderType)
? OrderRedisKeyConstant.HashKeyForOrderRefundConfig.TAKE_OUT ? OrderRedisKeyConstant.HashKeyForOrderRefundConfig.TAKE_OUT
: OrderRedisKeyConstant.HashKeyForOrderRefundConfig.EAT_IN;; : OrderRedisKeyConstant.HashKeyForOrderRefundConfig.EAT_IN;;
......
...@@ -3738,10 +3738,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -3738,10 +3738,7 @@ public class OrderServiceImpl implements Orderservice {
if (CollectionUtils.isNotEmpty(orderBean.getRefundList())) { if (CollectionUtils.isNotEmpty(orderBean.getRefundList())) {
return ResponseUtil.error(ResponseResult.COUPON_ORDER_COMMON_VERIFY_FAIL.getCode(), "已存在退款申请,请耐心等待处理"); return ResponseUtil.error(ResponseResult.COUPON_ORDER_COMMON_VERIFY_FAIL.getCode(), "已存在退款申请,请耐心等待处理");
} }
// fisherman 需要核实一下 是否申请退款,订单主状态还不会变
// fisherman 查询配置是否能退款 未完成 // fisherman 查询配置是否能退款 未完成
boolean isTrue = orderAdapter.checkRefundButtionBizTypeIs6(orderBean.getCompanyId(), orderBean.getBizType(), boolean isTrue = orderAdapter.checkRefundButtionBizTypeIs6(orderBean.getCompanyId(), orderBean.getBizType(),
orderBean.getStatus(),userLoginInfoDto.getWxAppId(), new Date(orderBean.getGmtCreate()), orderBean.getOrderType()); orderBean.getStatus(),userLoginInfoDto.getWxAppId(), new Date(orderBean.getGmtCreate()), orderBean.getOrderType());
if (isTrue) { if (isTrue) {
......
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