Commit b37a282f by ping.wu

门店小助手不能操作需要品牌审核的售后单

parent 49c5bb31
...@@ -82,10 +82,10 @@ public class OrderManagerRequest { ...@@ -82,10 +82,10 @@ public class OrderManagerRequest {
/** /**
* 售后渠道 1:POS插件 2:小助手 3:开放平台 4:自动任务 5:用户端 6:系统 7:万象 8:太一 * 售后渠道 1:POS插件 2:小助手 3:开放平台 4:自动任务 5:用户端 6:系统 7:万象 8:太一
*/ */
private Integer afterSalesApplyClient; private Integer afterSalesApplyClient = 0;
/** /**
* 品牌审核售后单 不传默认无需品牌审核 * 品牌审核售后单 不传默认无需品牌审核
*/ */
private Boolean brandVerifyAfterSales; private Boolean brandVerifyAfterSales = false;
} }
...@@ -183,6 +183,7 @@ public enum ResponseResult { ...@@ -183,6 +183,7 @@ public enum ResponseResult {
NOT_SUFFICIENT_FUNDS("8200201", "商户余额不足"), NOT_SUFFICIENT_FUNDS("8200201", "商户余额不足"),
CHECK_PARAM_ERROR("58006", "支付退款请求参数校验异常"), CHECK_PARAM_ERROR("58006", "支付退款请求参数校验异常"),
REFUND_FAIL_WAIT_CALLBACK("58007", "支付退款失败,等待回调补偿中"), REFUND_FAIL_WAIT_CALLBACK("58007", "支付退款失败,等待回调补偿中"),
CAN_NOT_REFUND("58008", "等待品牌操作同意退款"),
/** /**
* 优惠券活动 * 优惠券活动
*/ */
......
...@@ -4,6 +4,7 @@ import cn.freemud.base.entity.BaseResponse; ...@@ -4,6 +4,7 @@ import cn.freemud.base.entity.BaseResponse;
import cn.freemud.management.entities.dto.request.order.OrderManagerRequest; import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
import cn.freemud.management.entities.dto.response.order.OrderManagerResponse; import cn.freemud.management.entities.dto.response.order.OrderManagerResponse;
import cn.freemud.management.enums.*; import cn.freemud.management.enums.*;
import cn.freemud.management.enums.OperateType;
import cn.freemud.management.util.ResponseUtil; import cn.freemud.management.util.ResponseUtil;
import cn.freemud.redis.RedisCache; import cn.freemud.redis.RedisCache;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
...@@ -12,10 +13,7 @@ import com.freemud.api.assortment.datamanager.manager.cache.CacheOpenPlatformPar ...@@ -12,10 +13,7 @@ import com.freemud.api.assortment.datamanager.manager.cache.CacheOpenPlatformPar
import com.freemud.application.sdk.api.ordercenter.entities.v1.AccountBeanV1; import com.freemud.application.sdk.api.ordercenter.entities.v1.AccountBeanV1;
import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1; import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
import com.freemud.application.sdk.api.ordercenter.entities.v1.RefundBeanV1; import com.freemud.application.sdk.api.ordercenter.entities.v1.RefundBeanV1;
import com.freemud.application.sdk.api.ordercenter.enums.BizTypeEnum; import com.freemud.application.sdk.api.ordercenter.enums.*;
import com.freemud.application.sdk.api.ordercenter.enums.MarketTypeEnum;
import com.freemud.application.sdk.api.ordercenter.enums.NewOrderStatus;
import com.freemud.application.sdk.api.ordercenter.enums.OperateClient;
import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderSourceV1; import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderSourceV1;
import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderStatusV1; import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderStatusV1;
import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderTypeV1; import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderTypeV1;
...@@ -347,6 +345,14 @@ public class OrderVerifyHandle { ...@@ -347,6 +345,14 @@ public class OrderVerifyHandle {
|| orderBean.getRefundList().get(orderBean.getRefundList().size() - 1).getStatus() != 1) { || orderBean.getRefundList().get(orderBean.getRefundList().size() - 1).getStatus() != 1) {
return ResponseUtil.error(ResponseResult.ORDER_REFUND_NOT_APPLY); return ResponseUtil.error(ResponseResult.ORDER_REFUND_NOT_APPLY);
} }
//门店发起退款,需要品牌审核,则小助手不能发同意退款
if(Objects.equals(AfterSalesType.STORE_CANCEL.getIndex(),orderBean.getAfterSalesOrderResp().getAfterSalesType())){
//售后渠道 1:POS插件 2:小助手 3:开放平台 4:自动任务 5:用户端 6:系统 7:万象 8:太一
if(Objects.equals(request.getAfterSalesApplyClient() , 2) && request.getBrandVerifyAfterSales()){
return ResponseUtil.error(ResponseResult.CAN_NOT_REFUND);
}
return ResponseUtil.success();
}
//订单是否支持退款 //订单是否支持退款
boolean isCanRefund = false; boolean isCanRefund = false;
//订单 //订单
......
...@@ -24,7 +24,9 @@ public enum AfterSalesType { ...@@ -24,7 +24,9 @@ public enum AfterSalesType {
USER_SALE_RETURN(8, "用户售后退货/售后退款"), USER_SALE_RETURN(8, "用户售后退货/售后退款"),
SYSTEM_CANCEL(9, "系统取消"), SYSTEM_CANCEL(9, "系统取消"),
CUSTOMER_SERVICE_CANCEL(10, "客服取消"), CUSTOMER_SERVICE_CANCEL(10, "客服取消"),
USER_UNIFY_CANCEL(11, "用户统一取消,相当于USER_CANCEL以及USER_SALE_RETURN包含的场景,内部会根据状态解析成具体类型"),; USER_UNIFY_CANCEL(11, "用户统一取消,相当于USER_CANCEL以及USER_SALE_RETURN包含的场景,内部会根据状态解析成具体类型"),
STORE_CANCEL(13, "门店主动取消"),
;
private Integer index; private Integer index;
private String name; private String name;
......
...@@ -50,6 +50,7 @@ public class AfterSalesOrderResp { ...@@ -50,6 +50,7 @@ public class AfterSalesOrderResp {
/** 售后单类型 1:其他取消 2:用户取消 3:商户取消 4:未支付超时关单 5:商户接单超时取消 6:商家拒单 7:配送用户拒收 */ /** 售后单类型 1:其他取消 2:用户取消 3:商户取消 4:未支付超时关单 5:商户接单超时取消 6:商家拒单 7:配送用户拒收 */
/** /**
* 8:用户售后退货/售后退款 9:系统取消 10:客服取消 11:用户统一取消,相当于USER_CANCEL以及USER_SALE_RETURN包含的场景,内部会根据状态解析成具体类型 * 8:用户售后退货/售后退款 9:系统取消 10:客服取消 11:用户统一取消,相当于USER_CANCEL以及USER_SALE_RETURN包含的场景,内部会根据状态解析成具体类型
* 13 门店主动取消
*/ */
private Integer afterSalesType; private Integer afterSalesType;
/** /**
......
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