Skip to content

O
order-group
Commit a390aa19 by ping.wu
Options

Merge branches 'feature/20220622_退款失败记录到订单_wuping' and 'qa' of… 

Merge branches 'feature/20220622_退款失败记录到订单_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/PayServiceImpl.java
parents 5a9ba160 e0aec3a4
Showing with 386 additions and 200 deletions
order-application-service/src/main/java/cn/freemud/controller/delivery/DeliveryController.java
...@@ -55,7 +55,8 @@ public class DeliveryController { ...@@ -55,7 +55,8 @@ public class DeliveryController {
@ApiOperation(value = "麦咖啡配送回调", notes = "麦咖啡配送回调", produces = "application/json") @ApiOperation(value = "麦咖啡配送回调", notes = "麦咖啡配送回调", produces = "application/json")
@PostMapping("/delivery/macCafeCallback") @PostMapping("/delivery/macCafeCallback")
public BaseResponse macCafeCallback(@Valid @LogParams @RequestBody MacCafeCallbackUrlRequestDto request) { public BaseResponse macCafeCallback(@Valid @LogParams @RequestBody MacCafeCallbackUrlRequestDto request) {
return deliveryService.macCafeCallbackUrl(request); // return deliveryService.macCafeCallbackUrl(request);
return new BaseResponse("1","101");
} }
@ApiAnnotation(logMessage = "商城配送回调") @ApiAnnotation(logMessage = "商城配送回调")
@ApiOperation(value = "商城配送回调", notes = "商城配送回调", produces = "application/json") @ApiOperation(value = "商城配送回调", notes = "商城配送回调", produces = "application/json")
......
order-application-service/src/main/java/cn/freemud/service/ThirdDeliveryService.java
...@@ -20,7 +20,7 @@ public interface ThirdDeliveryService { ...@@ -20,7 +20,7 @@ public interface ThirdDeliveryService {
/** /**
* 配送回调 * 配送回调
*/ */
BaseResponse macCafeCallbackUrl(MacCafeCallbackUrlRequestDto request); // BaseResponse macCafeCallbackUrl(MacCafeCallbackUrlRequestDto request);
/** /**
......
order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java
...@@ -212,76 +212,76 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService { ...@@ -212,76 +212,76 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
* *
* @param request * @param request
*/ */
@Override // @Override
public BaseResponse macCafeCallbackUrl(MacCafeCallbackUrlRequestDto request) { // public BaseResponse macCafeCallbackUrl(MacCafeCallbackUrlRequestDto request) {
OrderManagerRequest orderManagerRequest = new OrderManagerRequest(); // OrderManagerRequest orderManagerRequest = new OrderManagerRequest();
orderManagerRequest.setPartnerId(request.getPartnerId()); // orderManagerRequest.setPartnerId(request.getPartnerId());
orderManagerRequest.setOrderId(request.getOrderId()); // orderManagerRequest.setOrderId(request.getOrderId());
if ("1".equals(request.getCancelApplicant())) { // if ("1".equals(request.getCancelApplicant())) {
orderManagerRequest.setReason(StringUtils.isNotBlank(request.getCancelReason()) ? request.getCancelReason() : "餐道主动取消"); // orderManagerRequest.setReason(StringUtils.isNotBlank(request.getCancelReason()) ? request.getCancelReason() : "餐道主动取消");
} else { // } else {
orderManagerRequest.setReason(null); // orderManagerRequest.setReason(null);
} // }
orderManagerRequest.setOperator("配送回调"); // orderManagerRequest.setOperator("配送回调");
//
//
Integer reviewStatus = request.getReviewStatus(); // Integer reviewStatus = request.getReviewStatus();
int deliveryStatus = request.getDeliveryStatus(); // int deliveryStatus = request.getDeliveryStatus();
if (reviewStatus != null && reviewStatus.equals(DeliveryReviewStatus.AGREE.getCode())) { // if (reviewStatus != null && reviewStatus.equals(DeliveryReviewStatus.AGREE.getCode())) {
orderManagerRequest.setOperateType(OperateType.ORDER_AGREE_REFUND.getOpType()); // orderManagerRequest.setOperateType(OperateType.ORDER_AGREE_REFUND.getOpType());
orderManagerRequest.setReason("配送回调-同意退款"); // orderManagerRequest.setReason("配送回调-同意退款");
return orderManagerAdapter.orderPayRefund(orderManagerRequest); // return orderManagerAdapter.orderPayRefund(orderManagerRequest);
} // }
if (reviewStatus != null && reviewStatus.equals(DeliveryReviewStatus.REJECT.getCode())) { // if (reviewStatus != null && reviewStatus.equals(DeliveryReviewStatus.REJECT.getCode())) {
orderManagerRequest.setOperateType(OperateType.ORDER_REJECT_REFUND.getOpType()); // orderManagerRequest.setOperateType(OperateType.ORDER_REJECT_REFUND.getOpType());
orderManagerRequest.setReason("配送回调-拒绝退款"); // orderManagerRequest.setReason("配送回调-拒绝退款");
return orderManagerAdapter.mcCafeOrderRejectRefund(orderManagerRequest); // return orderManagerAdapter.mcCafeOrderRejectRefund(orderManagerRequest);
} // }
if (deliveryStatus == DeliveryStatus.RIDERGETMEAL.getCode() || deliveryStatus == DeliveryStatus.RIDERSTARTDELIVERY.getCode()) { // if (deliveryStatus == DeliveryStatus.RIDERGETMEAL.getCode() || deliveryStatus == DeliveryStatus.RIDERSTARTDELIVERY.getCode()) {
orderManagerRequest.setOperateType(OperateType.ORDER_SEND.getOpType()); // orderManagerRequest.setOperateType(OperateType.ORDER_SEND.getOpType());
BaseResponse<OrderManagerResponse> baseResponse = orderManagerAdapter.orderDelivery(orderManagerRequest); // BaseResponse<OrderManagerResponse> baseResponse = orderManagerAdapter.orderDelivery(orderManagerRequest);
if (ResponseConstant.SUCCESS_RESPONSE_CODE_STR.equals(baseResponse.getCode())) { // if (ResponseConstant.SUCCESS_RESPONSE_CODE_STR.equals(baseResponse.getCode())) {
updateDeliveryStatus(request); // updateDeliveryStatus(request);
} // }
sendMcCafeMicroMessage(request.getPartnerId(), request.getOrderId(), request.getDeliveryStatus()); // sendMcCafeMicroMessage(request.getPartnerId(), request.getOrderId(), request.getDeliveryStatus());
return baseResponse; // return baseResponse;
} else if (deliveryStatus == DeliveryStatus.DELIVERYARRIVED.getCode()) { // } else if (deliveryStatus == DeliveryStatus.DELIVERYARRIVED.getCode()) {
orderManagerRequest.setOperateType(OperateType.ORDER_AFFIRM.getOpType()); // orderManagerRequest.setOperateType(OperateType.ORDER_AFFIRM.getOpType());
BaseResponse<OrderManagerResponse> baseResponse = orderManagerAdapter.orderAffirm(orderManagerRequest, null); // BaseResponse<OrderManagerResponse> baseResponse = orderManagerAdapter.orderAffirm(orderManagerRequest, null);
if (ResponseConstant.SUCCESS_RESPONSE_CODE_STR.equals(baseResponse.getCode())) { // if (ResponseConstant.SUCCESS_RESPONSE_CODE_STR.equals(baseResponse.getCode())) {
updateDeliveryStatus(request); // updateDeliveryStatus(request);
} // }
sendMcCafeMicroMessage(request.getPartnerId(), request.getOrderId(), request.getDeliveryStatus()); // sendMcCafeMicroMessage(request.getPartnerId(), request.getOrderId(), request.getDeliveryStatus());
return baseResponse; // return baseResponse;
} else if (deliveryStatus == DeliveryStatus.WATINGORDER.getCode() || deliveryStatus == DeliveryStatus.SYSTEMGETORDER.getCode() // } else if (deliveryStatus == DeliveryStatus.WATINGORDER.getCode() || deliveryStatus == DeliveryStatus.SYSTEMGETORDER.getCode()
|| deliveryStatus == DeliveryStatus.ALLOTRIDER.getCode() || deliveryStatus == DeliveryStatus.RIDERARRIVESTORE.getCode()) { // || deliveryStatus == DeliveryStatus.ALLOTRIDER.getCode() || deliveryStatus == DeliveryStatus.RIDERARRIVESTORE.getCode()) {
updateDeliveryStatus(request); // updateDeliveryStatus(request);
return ResponseUtil.success(); // return ResponseUtil.success();
} else if (deliveryStatus == DeliveryStatus.COLLECTING.getCode()) { // } else if (deliveryStatus == DeliveryStatus.COLLECTING.getCode()) {
//推送订单到拉单队列 // //推送订单到拉单队列
OrderCollectReq orderCollectReq = new OrderCollectReq(); // OrderCollectReq orderCollectReq = new OrderCollectReq();
orderCollectReq.setOrderCode(request.getOrderId()); // orderCollectReq.setOrderCode(request.getOrderId());
orderCollectReq.setPartnerId(request.getPartnerId()); // orderCollectReq.setPartnerId(request.getPartnerId());
OrderBaseResp baseResponse = orderSdkService.collectOrder(orderCollectReq, LogThreadLocal.getTrackingNo()); // OrderBaseResp baseResponse = orderSdkService.collectOrder(orderCollectReq, LogThreadLocal.getTrackingNo());
if (ResponseConstant.SUCCESS_RESPONSE_CODE_STR.equals(baseResponse.getCode())) { // if (ResponseConstant.SUCCESS_RESPONSE_CODE_STR.equals(baseResponse.getCode())) {
ResponseUtil.error(ResponseResult.ORDER_COLLECT_FAILED); // ResponseUtil.error(ResponseResult.ORDER_COLLECT_FAILED);
} // }
//回调成功，记录汇集状态 // //回调成功，记录汇集状态
updateDeliveryStatus(request); // updateDeliveryStatus(request);
return ResponseUtil.success(); // return ResponseUtil.success();
} else if (deliveryStatus == DeliveryStatus.DELIVERYERROR.getCode()) { // } else if (deliveryStatus == DeliveryStatus.DELIVERYERROR.getCode()) {
AssortmentUpdateDeliveryAbnormalRequest assortmentUpdateDeliveryAbnormalRequest = AssortmentUpdateDeliveryAbnormalRequest.builder() // AssortmentUpdateDeliveryAbnormalRequest assortmentUpdateDeliveryAbnormalRequest = AssortmentUpdateDeliveryAbnormalRequest.builder()
.abnormalDesc(request.getRemark()) // .abnormalDesc(request.getRemark())
.deliveryId(request.getDeliveryId()) // .deliveryId(request.getDeliveryId())
.orderCode(request.getOrderId()) // .orderCode(request.getOrderId())
.partnerId(request.getPartnerId()) // .partnerId(request.getPartnerId())
.operator("餐道") // .operator("餐道")
.build(); // .build();
orderCenterSdkService.updateDeliveryAbnormal(assortmentUpdateDeliveryAbnormalRequest); // orderCenterSdkService.updateDeliveryAbnormal(assortmentUpdateDeliveryAbnormalRequest);
return ResponseUtil.success(); // return ResponseUtil.success();
} // }
return ResponseUtil.error(ResponseResult.ORDER_DELIVERY_CALL_BACK_FAILED); // return ResponseUtil.error(ResponseResult.ORDER_DELIVERY_CALL_BACK_FAILED);
} // }
private OrderBaseResponse updateDeliveryStatus(MacCafeCallbackUrlRequestDto request) { private OrderBaseResponse updateDeliveryStatus(MacCafeCallbackUrlRequestDto request) {
UpdateDeliveryInfoByIdRequest updateDeliveryInfoByIdRequest = new UpdateDeliveryInfoByIdRequest(); UpdateDeliveryInfoByIdRequest updateDeliveryInfoByIdRequest = new UpdateDeliveryInfoByIdRequest();
......
order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
...@@ -1329,7 +1329,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -1329,7 +1329,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
extendParams.put("mealType", "pickup"); extendParams.put("mealType", "pickup");
} }
orderPayRefundRequest.setExtendParams(extendParams); orderPayRefundRequest.setExtendParams(extendParams);
response = payService.orderRefund(orderPayRefundRequest); // response = payService.orderRefund(orderPayRefundRequest);
if (response == null || response.getData() == null || !com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(response.getCode())) { if (response == null || response.getData() == null || !com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(response.getCode())) {
return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "orderRefund_failed"); return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "orderRefund_failed");
} }
......
order-application-service/src/main/java/cn/freemud/service/impl/MallOrderServiceImpl.java
...@@ -27,8 +27,10 @@ import cn.freemud.entities.vo.*; ...@@ -27,8 +27,10 @@ import cn.freemud.entities.vo.*;
import cn.freemud.enums.*; import cn.freemud.enums.*;
import cn.freemud.handler.MemberBlacklistHandler; import cn.freemud.handler.MemberBlacklistHandler;
import cn.freemud.interceptor.ServiceException; import cn.freemud.interceptor.ServiceException;
import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
import cn.freemud.management.entities.dto.request.pay.PayRefundRequestDto; import cn.freemud.management.entities.dto.request.pay.PayRefundRequestDto;
import cn.freemud.management.entities.dto.response.pay.OrderRefundResponse; import cn.freemud.management.entities.dto.response.pay.OrderRefundResponse;
import cn.freemud.management.entities.dto.response.pay.PayRefundResponse;
import cn.freemud.manager.SpellGroupOrderDataManager; import cn.freemud.manager.SpellGroupOrderDataManager;
import cn.freemud.redis.RedisCache; import cn.freemud.redis.RedisCache;
import cn.freemud.service.BuriedPointService; import cn.freemud.service.BuriedPointService;
...@@ -683,19 +685,24 @@ public class MallOrderServiceImpl implements MallOrderService { ...@@ -683,19 +685,24 @@ public class MallOrderServiceImpl implements MallOrderService {
* @param orderBean * @param orderBean
*/ */
private BaseResponse partnerNoTakeOrder(OrderRefundVo orderRefundVo, OrderBeanV1 orderBean, String fatherOrderId) { private BaseResponse partnerNoTakeOrder(OrderRefundVo orderRefundVo, OrderBeanV1 orderBean, String fatherOrderId) {
com.freemud.application.sdk.api.base.BaseResponse<OrderRefundResponse> response = null; // PayRefundResponse response = null;
Long refundId = System.currentTimeMillis(); Long refundId = System.currentTimeMillis();
String partnerId = orderBean.getCompanyId(); String partnerId = orderBean.getCompanyId();
int state = PayRefundStatus.SUCCESS.getCode(); int state = PayRefundStatus.SUCCESS.getCode();
if (orderBean.getAmount() != 0) { if (orderBean.getAmount() != 0) {
//调用支付退款 //调用支付退款
PayRefundRequestDto orderPayRefundRequest = orderAdapter.getOrderPayRefundRequest(orderBean, refundId, fatherOrderId); // PayRefundRequestDto orderPayRefundRequest = orderAdapter.getOrderPayRefundRequest(orderBean, refundId, fatherOrderId);
response = payServiceImpl.orderRefund(orderPayRefundRequest); // response = payServiceImpl.orderRefund(orderPayRefundRequest);
if (response == null || response.getData() == null || !com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(response.getCode())) { // if (response == null || response.getData() == null || !com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(response.getCode())) {
return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "orderRefund_failed"); // return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "orderRefund_failed");
} // }
//获取支付返回退款状态
// state = response.getData().getRefundStatus() == null ? PayRefundStatus.SUCCESS.getCode() : response.getData().getRefundStatus();
OrderManagerRequest request = new OrderManagerRequest();
request.setReason(orderRefundVo.getReason());
PayRefundResponse payRefundResponse = payServiceImpl.payRefundCommon(request, orderBean);
//获取支付返回退款状态 //获取支付返回退款状态
state = response.getData().getRefundStatus() == null ? PayRefundStatus.SUCCESS.getCode() : response.getData().getRefundStatus(); state = payRefundResponse.getPayRefundStatus() == null ? PayRefundStatus.SUCCESS.getCode() : payRefundResponse.getPayRefundStatus().getCode();
} }
CancelOrderRequest cancelOrderRequest = orderAdapter.convent2CancelOrderRequest(orderBean.getOid(), CancelOrderRequest cancelOrderRequest = orderAdapter.convent2CancelOrderRequest(orderBean.getOid(),
partnerId, AfterSalesType.USER_CANCEL, orderRefundVo.getReason(), LogThreadLocal.getTrackingNo(), refundId.toString()); partnerId, AfterSalesType.USER_CANCEL, orderRefundVo.getReason(), LogThreadLocal.getTrackingNo(), refundId.toString());
......
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
...@@ -2077,7 +2077,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -2077,7 +2077,7 @@ public class OrderServiceImpl implements Orderservice {
if (orderBean.getAmount() != 0) { if (orderBean.getAmount() != 0) {
OrderManagerRequest orderManagerRequest = new OrderManagerRequest(); OrderManagerRequest orderManagerRequest = new OrderManagerRequest();
orderManagerRequest.setReason(orderRefundVo.getReason()); orderManagerRequest.setReason(orderRefundVo.getReason());
PayRefundResponse refundResponse = paymentHandle.getCommonPayRefundResponse(orderManagerRequest, orderBean); PayRefundResponse refundResponse = payServiceImpl.payRefundCommon(orderManagerRequest, orderBean);
state = refundResponse.getPayRefundStatus().getCode(); state = refundResponse.getPayRefundStatus().getCode();
} }
...@@ -2820,7 +2820,11 @@ public class OrderServiceImpl implements Orderservice { ...@@ -2820,7 +2820,11 @@ public class OrderServiceImpl implements Orderservice {
String desc = "支付未及时回调"; String desc = "支付未及时回调";
PayRefundRequestDto orderPayRefundRequest = orderAdapter.getOrderPayRefundRequest(orderBean, refundId, orderBean.getOid()); PayRefundRequestDto orderPayRefundRequest = orderAdapter.getOrderPayRefundRequest(orderBean, refundId, orderBean.getOid());
// TODO: 22-6-23 待联调修改
response = payServiceImpl.orderRefund(orderPayRefundRequest); response = payServiceImpl.orderRefund(orderPayRefundRequest);
// OrderManagerRequest request = new OrderManagerRequest();
// request.setReason(desc);
// PayRefundResponse response = payServiceImpl.payRefundCommon(request, orderBean);
if (response != null && noPay.equals(response.getCode())) { if (response != null && noPay.equals(response.getCode())) {
return; return;
} }
...@@ -3513,6 +3517,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -3513,6 +3517,7 @@ public class OrderServiceImpl implements Orderservice {
if (Integer.valueOf(1).equals(queryRefundFailuresListDto.getLastFailureType()) || Integer.valueOf(2).equals(queryRefundFailuresListDto.getLastFailureType())) { if (Integer.valueOf(1).equals(queryRefundFailuresListDto.getLastFailureType()) || Integer.valueOf(2).equals(queryRefundFailuresListDto.getLastFailureType())) {
Long refundId = System.currentTimeMillis(); Long refundId = System.currentTimeMillis();
// TODO: 22-6-23 退款逻辑待合并
if (orderBean.getAmount() != 0) { if (orderBean.getAmount() != 0) {
if (null != orderBean.getOrderPayItem() && orderBean.getOrderPayItem().size() > 0) { if (null != orderBean.getOrderPayItem() && orderBean.getOrderPayItem().size() > 0) {
//调用支付退款 //调用支付退款
...@@ -3774,8 +3779,9 @@ public class OrderServiceImpl implements Orderservice { ...@@ -3774,8 +3779,9 @@ public class OrderServiceImpl implements Orderservice {
PayRefundResponse refundResponse; PayRefundResponse refundResponse;
try { try {
if (null != orderBean.getOrderPayItem() && orderBean.getOrderPayItem().size() > 0) { if (null != orderBean.getOrderPayItem() && orderBean.getOrderPayItem().size() > 0) {
refundResponse = paymentHandle.multiRefund(orderBean); refundResponse = payServiceImpl.payRefundCommon(null,orderBean);
} else { } else {
// TODO: 22-6-23 待考虑合并到上面一起
refundResponse = paymentHandle.refund("用户买券订单-申请退款", orderBean); refundResponse = paymentHandle.refund("用户买券订单-申请退款", orderBean);
} }
if (refundResponse.getPayRefundStatus().getCode().compareTo(PayRefundStatus.SUCCESS.getCode()) != 0) { if (refundResponse.getPayRefundStatus().getCode().compareTo(PayRefundStatus.SUCCESS.getCode()) != 0) {
...@@ -3932,5 +3938,4 @@ public class OrderServiceImpl implements Orderservice { ...@@ -3932,5 +3938,4 @@ public class OrderServiceImpl implements Orderservice {
this.sendPaySuccessMessage(orderBean); this.sendPaySuccessMessage(orderBean);
} }
} }
order-application-service/src/main/java/cn/freemud/service/impl/PayServiceImpl.java
...@@ -28,13 +28,16 @@ import cn.freemud.enums.ResponseResult; ...@@ -28,13 +28,16 @@ import cn.freemud.enums.ResponseResult;
import cn.freemud.enums.TradeState; import cn.freemud.enums.TradeState;
import cn.freemud.interceptor.ServiceException; import cn.freemud.interceptor.ServiceException;
import cn.freemud.management.entities.dto.request.BatchOrderRefundV2Request; import cn.freemud.management.entities.dto.request.BatchOrderRefundV2Request;
import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
import cn.freemud.management.entities.dto.request.pay.PayRefundRequestDto; import cn.freemud.management.entities.dto.request.pay.PayRefundRequestDto;
import cn.freemud.management.entities.dto.request.pay.PaymentQueryOrderRequestDto; import cn.freemud.management.entities.dto.request.pay.PaymentQueryOrderRequestDto;
import cn.freemud.management.entities.dto.response.pay.OrderRefundResponse; import cn.freemud.management.entities.dto.response.pay.OrderRefundResponse;
import cn.freemud.management.entities.dto.response.pay.PayBatchRefundResponse; import cn.freemud.management.entities.dto.response.pay.PayBatchRefundResponse;
import cn.freemud.management.entities.dto.response.pay.PayRefundData; import cn.freemud.management.entities.dto.response.pay.PayRefundData;
import cn.freemud.management.entities.dto.response.pay.PayRefundResponse;
import cn.freemud.management.entities.dto.response.pay.PaymentQueryOrderResponseDto; import cn.freemud.management.entities.dto.response.pay.PaymentQueryOrderResponseDto;
import cn.freemud.management.enums.PaymentRefundStatus; import cn.freemud.management.enums.PaymentRefundStatus;
import cn.freemud.management.service.handle.PaymentHandle;
import cn.freemud.management.thirdparty.MulitiPaymentClient; import cn.freemud.management.thirdparty.MulitiPaymentClient;
import cn.freemud.management.thirdparty.OMSPaymentClient; import cn.freemud.management.thirdparty.OMSPaymentClient;
import cn.freemud.redis.RedisCache; import cn.freemud.redis.RedisCache;
...@@ -100,6 +103,8 @@ public class PayServiceImpl { ...@@ -100,6 +103,8 @@ public class PayServiceImpl {
private PaymentNewClient paymentNewClient; private PaymentNewClient paymentNewClient;
@Autowired @Autowired
private OMSPaymentClient omsPaymentClient; private OMSPaymentClient omsPaymentClient;
@Autowired
private PaymentHandle paymentHandle;
@Autowired @Autowired
private AssortmentOpenPlatformWxappManager openPlatformWxappManager; private AssortmentOpenPlatformWxappManager openPlatformWxappManager;
...@@ -861,20 +866,6 @@ public class PayServiceImpl { ...@@ -861,20 +866,6 @@ public class PayServiceImpl {
/** /**
* 支付退款
*/
public com.freemud.application.sdk.api.base.BaseResponse<OrderRefundResponse> orderRefund(PayRefundRequestDto orderPayRefundRequest) {
return orderPayRefund(orderPayRefundRequest);
}
/**
* 混合支付退款接口
*/
public MultiOrderRefundResponse paymentApplicationRefund(MultiOrderRefundRequest multiOrderRefundRequest, String partnerId) {
return mulitiPaymentClient.paymentApplicationRefund(multiOrderRefundRequest, partnerId);
}
/**
* 批量支付退款 * 批量支付退款
*/ */
public PayBatchRefundResponse batchRefund(BatchOrderRefundV2Request batchOrderRefundV2Request) { public PayBatchRefundResponse batchRefund(BatchOrderRefundV2Request batchOrderRefundV2Request) {
...@@ -1663,4 +1654,33 @@ public class PayServiceImpl { ...@@ -1663,4 +1654,33 @@ public class PayServiceImpl {
return payTypeCode; return payTypeCode;
} }
/**
* 支付退款
*/
public com.freemud.application.sdk.api.base.BaseResponse<OrderRefundResponse> orderRefund(PayRefundRequestDto orderPayRefundRequest) {
return orderPayRefund(orderPayRefundRequest);
}
/**
* 混合支付退款接口
*/
public MultiOrderRefundResponse paymentApplicationRefund(MultiOrderRefundRequest multiOrderRefundRequest, String partnerId) {
return mulitiPaymentClient.paymentApplicationRefund(multiOrderRefundRequest, partnerId);
}
/**
* 提取 退款公共代码
*
* @param request
* @param orderBean
* @return
*/
public PayRefundResponse payRefundCommon(OrderManagerRequest request, OrderBeanV1 orderBean) {
PayRefundResponse refundResponse = paymentHandle.getCommonPayRefundResponse(request, orderBean);
return refundResponse;
}
} }
order-application-service/src/main/java/cn/freemud/service/thirdparty/PaymentNewClient.java
...@@ -72,6 +72,7 @@ public interface PaymentNewClient { ...@@ -72,6 +72,7 @@ public interface PaymentNewClient {
/** /**
* 支付查询 * 支付查询
* 关闭预支付使用
*/ */
@LogIgnoreFeign(logMessage="payQuery") @LogIgnoreFeign(logMessage="payQuery")
@PostMapping("paymentcenter/query") @PostMapping("paymentcenter/query")
......
order-management/src/main/java/cn/freemud/management/entities/dto/request/order/OrderManagerRequest.java
...@@ -78,4 +78,14 @@ public class OrderManagerRequest { ...@@ -78,4 +78,14 @@ public class OrderManagerRequest {
* 内部使用字段, 订单流转时间设置 * 内部使用字段, 订单流转时间设置
*/ */
private Integer timeout; private Integer timeout;
/**
* 售后渠道 1:POS插件 2:小助手 3:开放平台 4:自动任务 5:用户端 6:系统 7:万象 8:太一
*/
private Integer afterSalesApplyClient = 0;
/**
* 品牌审核售后单　不传默认无需品牌审核
*/
private Boolean brandVerifyAfterSales = false;
} }
order-management/src/main/java/cn/freemud/management/entities/dto/response/pay/PayRefundResponse.java
...@@ -34,4 +34,9 @@ public class PayRefundResponse { ...@@ -34,4 +34,9 @@ public class PayRefundResponse {
* 兼容爱马哥退款报错的字段 ,其他场景不会有值 * 兼容爱马哥退款报错的字段 ,其他场景不会有值
*/ */
private ResponseResult result; private ResponseResult result;
/**
* 退款失败记录原因
*/
private String message;
} }
order-management/src/main/java/cn/freemud/management/enums/ResponseResult.java
...@@ -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", "等待品牌操作同意退款"),
/** /**
* 优惠券活动 * 优惠券活动
*/ */
......
order-management/src/main/java/cn/freemud/management/service/adapter/OrderBeanFactory.java
...@@ -34,9 +34,9 @@ public class OrderBeanFactory { ...@@ -34,9 +34,9 @@ public class OrderBeanFactory {
// String source = orderBean.getSource(); // String source = orderBean.getSource();
String orderClient = orderBean.getOrderClient(); String orderClient = orderBean.getOrderClient();
String companyId = orderBean.getCompanyId(); String companyId = orderBean.getCompanyId();
if (macCafePartnerId.equals(companyId)){ // if (macCafePartnerId.equals(companyId)){
return applicationContext.getBean(McCafeMangerServiceImpl.class); // return applicationContext.getBean(McCafeMangerServiceImpl.class);
} // }
// if (OrderSource.BDWM.getSource().equals(source) || OrderSource.JDWM.getSource().equals(source) // if (OrderSource.BDWM.getSource().equals(source) || OrderSource.JDWM.getSource().equals(source)
// || OrderSource.MTWM.getSource().equals(source) || OrderSource.ELEME.getSource().equals(source) // || OrderSource.MTWM.getSource().equals(source) || OrderSource.ELEME.getSource().equals(source)
// || OrderSource.FMWD.getSource().equals(source) || OrderSource.EBAI.getSource().equals(source) // || OrderSource.FMWD.getSource().equals(source) || OrderSource.EBAI.getSource().equals(source)
......
order-management/src/main/java/cn/freemud/management/service/adapter/OrderManagerAdapter.java
...@@ -194,25 +194,25 @@ public class OrderManagerAdapter { ...@@ -194,25 +194,25 @@ public class OrderManagerAdapter {
/** /**
* 同意退款或者取消订单 * 同意退款或者取消订单
*/ */
public BaseResponse orderPayRefund(OrderManagerRequest request) { // public BaseResponse orderPayRefund(OrderManagerRequest request) {
//查询订单 // //查询订单
OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId()); // OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId());
if (null == orderBean) { // if (null == orderBean) {
return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST); // return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
} // }
if (CollectionUtils.isNotEmpty(orderBean.getRefundList())) { // if (CollectionUtils.isNotEmpty(orderBean.getRefundList())) {
//订单接单参数校验 // //订单接单参数校验
BaseResponse verifyResponse = orderVerifyHandle.orderAgreeRefundMCCafe(orderBean, request); // BaseResponse verifyResponse = orderVerifyHandle.orderAgreeRefundMCCafe(orderBean, request);
if (ObjectUtils.notEqual(verifyResponse.getCode(), ResponseResult.SUCCESS.getCode())) { // if (ObjectUtils.notEqual(verifyResponse.getCode(), ResponseResult.SUCCESS.getCode())) {
return handleResponse(request, orderBean, verifyResponse); // return handleResponse(request, orderBean, verifyResponse);
} // }
BaseResponse<OrderManagerResponse> orderManagerResponse = orderBeanFactory.getOrderManagerService(orderBean).orderAgreeRefund(request, orderBean); // BaseResponse<OrderManagerResponse> orderManagerResponse = orderBeanFactory.getOrderManagerService(orderBean).orderAgreeRefund(request, orderBean);
return handleResponse(request, orderBean, orderManagerResponse); // return handleResponse(request, orderBean, orderManagerResponse);
} else { // } else {
BaseResponse<OrderManagerResponse> orderManagerResponse = orderBeanFactory.getOrderManagerService(orderBean).orderCancel(request, orderBean); // BaseResponse<OrderManagerResponse> orderManagerResponse = orderBeanFactory.getOrderManagerService(orderBean).orderCancel(request, orderBean);
return handleResponse(request, orderBean, orderManagerResponse); // return handleResponse(request, orderBean, orderManagerResponse);
} // }
} // }
/** /**
* 拒绝退款 * 拒绝退款
...@@ -264,20 +264,20 @@ public class OrderManagerAdapter { ...@@ -264,20 +264,20 @@ public class OrderManagerAdapter {
* @param request * @param request
* @return * @return
*/ */
public BaseResponse mcCafeOrderRejectRefund(OrderManagerRequest request) { // public BaseResponse mcCafeOrderRejectRefund(OrderManagerRequest request) {
//查询订单 // //查询订单
OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId()); // OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId());
if (null == orderBean) { // if (null == orderBean) {
return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST); // return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
} // }
//订单接单参数校验 // //订单接单参数校验
BaseResponse verifyResponse = orderVerifyHandle.mcCafeOrderRejectRefund(orderBean, request); // BaseResponse verifyResponse = orderVerifyHandle.mcCafeOrderRejectRefund(orderBean, request);
if (ObjectUtils.notEqual(verifyResponse.getCode(), ResponseResult.SUCCESS.getCode())) { // if (ObjectUtils.notEqual(verifyResponse.getCode(), ResponseResult.SUCCESS.getCode())) {
return handleResponse(request, orderBean, verifyResponse); // return handleResponse(request, orderBean, verifyResponse);
} // }
BaseResponse<OrderManagerResponse> orderManagerResponse = orderBeanFactory.getOrderManagerService(orderBean).orderRejectRefund(request, orderBean); // BaseResponse<OrderManagerResponse> orderManagerResponse = orderBeanFactory.getOrderManagerService(orderBean).orderRejectRefund(request, orderBean);
return handleResponse(request, orderBean, orderManagerResponse); // return handleResponse(request, orderBean, orderManagerResponse);
} // }
private BaseResponse<OrderManagerResponse> handleResponse(OrderManagerRequest request, OrderBeanV1 orderBean, BaseResponse result) { private BaseResponse<OrderManagerResponse> handleResponse(OrderManagerRequest request, OrderBeanV1 orderBean, BaseResponse result) {
......
order-management/src/main/java/cn/freemud/management/service/handle/OrderVerifyHandle.java
...@@ -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;
//订单 //订单
......
order-management/src/main/java/cn/freemud/management/service/impl/MallOrderMangerServiceImpl.java
...@@ -14,12 +14,16 @@ import cn.freemud.management.service.handle.*; ...@@ -14,12 +14,16 @@ import cn.freemud.management.service.handle.*;
import cn.freemud.management.util.ResponseUtil; import cn.freemud.management.util.ResponseUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.freemud.application.sdk.api.constant.ResponseConstant; import com.freemud.application.sdk.api.constant.ResponseConstant;
import com.freemud.application.sdk.api.log.LogThreadLocal;
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.enums.AfterSalesStatus; import com.freemud.application.sdk.api.ordercenter.enums.AfterSalesStatus;
import com.freemud.application.sdk.api.ordercenter.enums.BizTypeEnum; import com.freemud.application.sdk.api.ordercenter.enums.BizTypeEnum;
import com.freemud.application.sdk.api.ordercenter.enums.MarketTypeEnum; import com.freemud.application.sdk.api.ordercenter.enums.MarketTypeEnum;
import com.freemud.application.sdk.api.ordercenter.enums.RefundModeEnum; import com.freemud.application.sdk.api.ordercenter.enums.RefundModeEnum;
import com.freemud.application.sdk.api.ordercenter.request.AfterOrderExtInfoDto; import com.freemud.application.sdk.api.ordercenter.request.AfterOrderExtInfoDto;
import com.freemud.application.sdk.api.ordercenter.request.AfterSalesRefundFailReq;
import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
import com.freemud.sdk.api.assortment.order.enums.PayRefundStatus;
import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -52,6 +56,8 @@ public class MallOrderMangerServiceImpl implements OrderManagerService { ...@@ -52,6 +56,8 @@ public class MallOrderMangerServiceImpl implements OrderManagerService {
private StockHandle stockHandle; private StockHandle stockHandle;
@Autowired @Autowired
private ActivityHandle activityHandle; private ActivityHandle activityHandle;
@Autowired
private OrderSdkService orderSdkService;
/** /**
* 同意退款 * 同意退款
...@@ -89,11 +95,10 @@ public class MallOrderMangerServiceImpl implements OrderManagerService { ...@@ -89,11 +95,10 @@ public class MallOrderMangerServiceImpl implements OrderManagerService {
} }
//支付退款 //支付退款
PayRefundResponse refundResponse = new PayRefundResponse(); PayRefundResponse refundResponse = this.payRefundCommon(request, orderBean);
try { //fisherman --> 退款中的状态 阻止后续流程 等待支付回调 不是退款成功 都终止下面的退款流程
refundResponse = paymentHandle.refund(request, orderBean); if (refundResponse.getPayRefundStatus().getCode().compareTo(PayRefundStatus.SUCCESS.getCode()) != 0) {
} catch (OrderServiceException orderEx) { return ResponseUtil.error(ResponseResult.REFUND_FAIL);
return ResponseUtil.error(orderEx.getResult());
} }
//订单同意退款 //订单同意退款
mallOrderHandle.refundAgree(request, refundResponse, orderBean); mallOrderHandle.refundAgree(request, refundResponse, orderBean);
...@@ -117,11 +122,10 @@ public class MallOrderMangerServiceImpl implements OrderManagerService { ...@@ -117,11 +122,10 @@ public class MallOrderMangerServiceImpl implements OrderManagerService {
} }
//支付退款 //支付退款
PayRefundResponse refundResponse = new PayRefundResponse(); PayRefundResponse refundResponse = this.payRefundCommon(request, orderBean);
try { //fisherman --> 退款中的状态 阻止后续流程 等待支付回调 不是退款成功 都终止下面的退款流程
refundResponse = paymentHandle.refund(request, orderBean); if (refundResponse.getPayRefundStatus().getCode().compareTo(PayRefundStatus.SUCCESS.getCode()) != 0) {
} catch (OrderServiceException orderEx) { return ResponseUtil.error(ResponseResult.REFUND_FAIL);
return ResponseUtil.error(orderEx.getResult());
} }
//订单同意退款 //订单同意退款
mallOrderHandle.refundAgree(request, refundResponse, orderBean); mallOrderHandle.refundAgree(request, refundResponse, orderBean);
...@@ -161,15 +165,10 @@ public class MallOrderMangerServiceImpl implements OrderManagerService { ...@@ -161,15 +165,10 @@ public class MallOrderMangerServiceImpl implements OrderManagerService {
@Override @Override
public BaseResponse<OrderManagerResponse> orderReject(OrderManagerRequest request, OrderBeanV1 orderBean) { public BaseResponse<OrderManagerResponse> orderReject(OrderManagerRequest request, OrderBeanV1 orderBean) {
//支付退款 //支付退款
PayRefundResponse refundResponse = new PayRefundResponse(); PayRefundResponse refundResponse = this.payRefundCommon(request, orderBean);
try { //fisherman --> 退款中的状态 阻止后续流程 等待支付回调 不是退款成功 都终止下面的退款流程
if(null != orderBean.getOrderPayItem() && orderBean.getOrderPayItem().size()>0){ if (refundResponse.getPayRefundStatus().getCode().compareTo(PayRefundStatus.SUCCESS.getCode()) != 0) {
refundResponse = paymentHandle.multiRefund(orderBean); return ResponseUtil.error(ResponseResult.REFUND_FAIL);
}else{
refundResponse = paymentHandle.refund(request, orderBean);
}
} catch (OrderServiceException orderEx){ // 爱马哥兼容，不抛错
return ResponseUtil.error(orderEx.getResult());
} }
//订单拒单 //订单拒单
mallOrderHandle.mallOrderReject(request, refundResponse, orderBean); mallOrderHandle.mallOrderReject(request, refundResponse, orderBean);
...@@ -181,4 +180,28 @@ public class MallOrderMangerServiceImpl implements OrderManagerService { ...@@ -181,4 +180,28 @@ public class MallOrderMangerServiceImpl implements OrderManagerService {
return ResponseUtil.success(); return ResponseUtil.success();
} }
/**
* 提取 退款公共代码
*
* @param request
* @param orderBean
* @return
*/
private PayRefundResponse payRefundCommon(OrderManagerRequest request, OrderBeanV1 orderBean) {
PayRefundResponse refundResponse = paymentHandle.getCommonPayRefundResponse(request, orderBean);
//同意退款失败记录到订单售后单
if (orderBean.getAfterSalesOrderResp() != null && refundResponse.getPayRefundStatus().getCode().compareTo(PayRefundStatus.SUCCESS.getCode()) != 0) {
AfterSalesRefundFailReq refundFailReq = new AfterSalesRefundFailReq();
refundFailReq.setOrderCode(orderBean.getOid());
refundFailReq.setPartnerId(orderBean.getCompanyId());
refundFailReq.setRefundFailReason("退款失败或退款中，" + refundResponse.getMessage());
refundFailReq.setAfterSalesCode(orderBean.getAfterSalesOrderResp().getAfterSalesCode());
refundFailReq.setOperationClient(request.getAfterSalesApplyClient());
refundFailReq.setOperator(request.getOperator());
orderSdkService.refundFail(refundFailReq, LogThreadLocal.getTrackingNo());
}
return refundResponse;
}
} }
order-management/src/main/java/cn/freemud/management/service/impl/NewMallOrderMangerServiceImpl.java
...@@ -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.entities.dto.response.pay.PayRefundResponse; import cn.freemud.management.entities.dto.response.pay.PayRefundResponse;
import cn.freemud.management.enums.ResponseResult;
import cn.freemud.management.service.OrderManagerService; import cn.freemud.management.service.OrderManagerService;
import cn.freemud.management.service.handle.ActivityHandle; import cn.freemud.management.service.handle.ActivityHandle;
import cn.freemud.management.service.handle.MallOrderHandle; import cn.freemud.management.service.handle.MallOrderHandle;
...@@ -11,12 +12,16 @@ import cn.freemud.management.service.handle.PaymentHandle; ...@@ -11,12 +12,16 @@ import cn.freemud.management.service.handle.PaymentHandle;
import cn.freemud.management.service.handle.StockHandle; import cn.freemud.management.service.handle.StockHandle;
import cn.freemud.management.util.ResponseUtil; import cn.freemud.management.util.ResponseUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.freemud.application.sdk.api.log.LogThreadLocal;
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.enums.AfterSalesStatus; import com.freemud.application.sdk.api.ordercenter.enums.AfterSalesStatus;
import com.freemud.application.sdk.api.ordercenter.enums.PayChannelType; import com.freemud.application.sdk.api.ordercenter.enums.PayChannelType;
import com.freemud.application.sdk.api.ordercenter.enums.RefundModeEnum; import com.freemud.application.sdk.api.ordercenter.enums.RefundModeEnum;
import com.freemud.application.sdk.api.ordercenter.request.AfterOrderExtInfoDto; import com.freemud.application.sdk.api.ordercenter.request.AfterOrderExtInfoDto;
import com.freemud.application.sdk.api.ordercenter.request.AfterSalesRefundFailReq;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderPayItemResp; import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderPayItemResp;
import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
import com.freemud.sdk.api.assortment.order.enums.PayRefundStatus;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -45,6 +50,8 @@ public class NewMallOrderMangerServiceImpl implements OrderManagerService { ...@@ -45,6 +50,8 @@ public class NewMallOrderMangerServiceImpl implements OrderManagerService {
private StockHandle stockHandle; private StockHandle stockHandle;
@Autowired @Autowired
private ActivityHandle activityHandle; private ActivityHandle activityHandle;
@Autowired
private OrderSdkService orderSdkService;
/** /**
* 同意退款 * 同意退款
...@@ -67,34 +74,37 @@ public class NewMallOrderMangerServiceImpl implements OrderManagerService { ...@@ -67,34 +74,37 @@ public class NewMallOrderMangerServiceImpl implements OrderManagerService {
// 修改售后单状态为退货中 // 修改售后单状态为退货中
mallOrderHandle.mallOrderAgreeApply(request, orderBean); mallOrderHandle.mallOrderAgreeApply(request, orderBean);
} else { } else {
//支付退款 //支付退款
PayRefundResponse refundResponse; PayRefundResponse refundResponse = this.payRefundCommon(request, orderBean);
boolean cashPay = false; // 退款异常
boolean svcPay = false; if (refundResponse.getPayRefundStatus().getCode().compareTo(PayRefundStatus.COMPATIBILITY_STATUS.getCode()) == 0) {
if(CollectionUtils.isNotEmpty(orderBean.getOrderPayItem())){ return ResponseUtil.error(refundResponse.getResult());
for (OrderPayItemResp payItemResp : orderBean.getOrderPayItem()){
if(Objects.equals(payItemResp.getPayChannelType(),(int)PayChannelType.SVC.getIndex())){
svcPay = true;
}
if(Objects.equals(payItemResp.getPayChannelType(),(int)PayChannelType.WECHAT.getIndex())){
cashPay = true;
}
if(Objects.equals(payItemResp.getPayChannelType(),(int)PayChannelType.ALIPAY.getIndex())){
cashPay = true;
}
}
} }
if (cashPay && svcPay) { // fisherman --> 退款中的状态 阻止后续流程 等待支付回调 不是退款成功 都终止下面的退款流程
refundResponse = paymentHandle.multiRefund(orderBean); if (refundResponse.getPayRefundStatus().getCode().compareTo(PayRefundStatus.SUCCESS.getCode()) != 0) {
} else { return ResponseUtil.error(ResponseResult.REFUND_FAIL_WAIT_CALLBACK);
// OrderExtendedReq ext = orderBean.getOrderExtended();
// if (StringUtils.isNotBlank(ext.getAgentPayerId()) && !Objects.equals(ext.getAgentPayerId(), orderBean.getUserId())) {
// //代付人信息不为空 并且和订单创建人不一样，表示代付单
// refundResponse = paymentHandle.agentPayRefund(orderBean);
// }
refundResponse = paymentHandle.refund(request, orderBean);
} }
// PayRefundResponse refundResponse;
// boolean cashPay = false;
// boolean svcPay = false;
// if(CollectionUtils.isNotEmpty(orderBean.getOrderPayItem())){
// for (OrderPayItemResp payItemResp : orderBean.getOrderPayItem()){
// if(Objects.equals(payItemResp.getPayChannelType(),(int)PayChannelType.SVC.getIndex())){
// svcPay = true;
// }
// if(Objects.equals(payItemResp.getPayChannelType(),(int)PayChannelType.WECHAT.getIndex())){
// cashPay = true;
// }
// if(Objects.equals(payItemResp.getPayChannelType(),(int)PayChannelType.ALIPAY.getIndex())){
// cashPay = true;
// }
// }
// }
// if (cashPay && svcPay) {
// refundResponse = paymentHandle.multiRefund(orderBean);
// } else {
// refundResponse = paymentHandle.getCommonPayRefundResponse(request, orderBean);
// }
//订单同意退款 //订单同意退款
mallOrderHandle.refundAgree(request, refundResponse, orderBean); mallOrderHandle.refundAgree(request, refundResponse, orderBean);
//冲正库存 //冲正库存
...@@ -129,4 +139,28 @@ public class NewMallOrderMangerServiceImpl implements OrderManagerService { ...@@ -129,4 +139,28 @@ public class NewMallOrderMangerServiceImpl implements OrderManagerService {
return ResponseUtil.error("501","暂无"); return ResponseUtil.error("501","暂无");
} }
/**
* 提取 退款公共代码
*
* @param request
* @param orderBean
* @return
*/
private PayRefundResponse payRefundCommon(OrderManagerRequest request, OrderBeanV1 orderBean) {
PayRefundResponse refundResponse = paymentHandle.getCommonPayRefundResponse(request, orderBean);
//同意退款失败记录到订单售后单
if (orderBean.getAfterSalesOrderResp() != null && refundResponse.getPayRefundStatus().getCode().compareTo(PayRefundStatus.SUCCESS.getCode()) != 0) {
AfterSalesRefundFailReq refundFailReq = new AfterSalesRefundFailReq();
refundFailReq.setOrderCode(orderBean.getOid());
refundFailReq.setPartnerId(orderBean.getCompanyId());
refundFailReq.setRefundFailReason("退款失败或退款中，" + refundResponse.getMessage());
refundFailReq.setAfterSalesCode(orderBean.getAfterSalesOrderResp().getAfterSalesCode());
refundFailReq.setOperationClient(request.getAfterSalesApplyClient());
refundFailReq.setOperator(request.getOperator());
orderSdkService.refundFail(refundFailReq, LogThreadLocal.getTrackingNo());
}
return refundResponse;
}
} }
order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java
...@@ -26,10 +26,7 @@ import com.freemud.application.sdk.api.ordercenter.entities.vo.OrderCallBackRequ ...@@ -26,10 +26,7 @@ import com.freemud.application.sdk.api.ordercenter.entities.vo.OrderCallBackRequ
import com.freemud.application.sdk.api.ordercenter.enums.*; import com.freemud.application.sdk.api.ordercenter.enums.*;
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.request.OrderCancelReq; import com.freemud.application.sdk.api.ordercenter.request.*;
import com.freemud.application.sdk.api.ordercenter.request.OrderExpressReq;
import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
import com.freemud.application.sdk.api.ordercenter.request.OrderExtendedReq;
import com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp; import com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.AfterSalesOrderResp; import com.freemud.application.sdk.api.ordercenter.response.orderInfo.AfterSalesOrderResp;
import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService; import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
...@@ -210,15 +207,14 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService { ...@@ -210,15 +207,14 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
@Override @Override
public BaseResponse<OrderManagerResponse> orderReject(OrderManagerRequest request, OrderBeanV1 orderBean) { public BaseResponse<OrderManagerResponse> orderReject(OrderManagerRequest request, OrderBeanV1 orderBean) {
//支付退款 //支付退款
PayRefundResponse refundResponse; PayRefundResponse refundResponse = this.payRefundCommon(request,orderBean);
try { // 退款异常
if (null != orderBean.getOrderPayItem() && orderBean.getOrderPayItem().size() > 0) { if (refundResponse.getPayRefundStatus().getCode().compareTo(PayRefundStatus.COMPATIBILITY_STATUS.getCode()) == 0) {
refundResponse = paymentHandle.multiRefund(orderBean); return ResponseUtil.error(refundResponse.getResult());
} else { }
refundResponse = paymentHandle.refund(request, orderBean); // fisherman --> 退款中的状态 阻止后续流程 等待支付回调 不是退款成功 都终止下面的退款流程
} if (refundResponse.getPayRefundStatus().getCode().compareTo(PayRefundStatus.SUCCESS.getCode()) != 0) {
} catch (OrderServiceException orderEx) { // 爱马哥兼容，不抛错 return ResponseUtil.error(ResponseResult.REFUND_FAIL_WAIT_CALLBACK);
return ResponseUtil.error(orderEx.getResult());
} }
//订单拒单 //订单拒单
saasOrderHandle.orderReject(request, refundResponse, orderBean); saasOrderHandle.orderReject(request, refundResponse, orderBean);
...@@ -243,7 +239,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService { ...@@ -243,7 +239,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
//取消配送单 //取消配送单
deliveryHandle.cancelDelivery(orderBean, request); deliveryHandle.cancelDelivery(orderBean, request);
//支付退款 //支付退款
PayRefundResponse refundResponse = this.getPayRefundResponse(request, orderBean); PayRefundResponse refundResponse = this.payRefundCommon(request, orderBean);
// 退款异常 // 退款异常
if (refundResponse.getPayRefundStatus().getCode().compareTo(PayRefundStatus.COMPATIBILITY_STATUS.getCode()) == 0) { if (refundResponse.getPayRefundStatus().getCode().compareTo(PayRefundStatus.COMPATIBILITY_STATUS.getCode()) == 0) {
return ResponseUtil.error(refundResponse.getResult()); return ResponseUtil.error(refundResponse.getResult());
...@@ -264,14 +260,26 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService { ...@@ -264,14 +260,26 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
} }
/** /**
* 提出 退款公共代码 * 提取 退款公共代码
* *
* @param request * @param request
* @param orderBean * @param orderBean
* @return * @return
*/ */
private PayRefundResponse getPayRefundResponse(OrderManagerRequest request, OrderBeanV1 orderBean) { private PayRefundResponse payRefundCommon(OrderManagerRequest request, OrderBeanV1 orderBean) {
return paymentHandle.getCommonPayRefundResponse(request, orderBean); PayRefundResponse refundResponse = paymentHandle.getCommonPayRefundResponse(request, orderBean);
//同意退款失败记录到订单售后单
if (orderBean.getAfterSalesOrderResp() != null && refundResponse.getPayRefundStatus().getCode().compareTo(PayRefundStatus.SUCCESS.getCode()) != 0) {
AfterSalesRefundFailReq refundFailReq = new AfterSalesRefundFailReq();
refundFailReq.setOrderCode(orderBean.getOid());
refundFailReq.setPartnerId(orderBean.getCompanyId());
refundFailReq.setRefundFailReason("退款失败或退款中，" + refundResponse.getMessage());
refundFailReq.setAfterSalesCode(orderBean.getAfterSalesOrderResp().getAfterSalesCode());
refundFailReq.setOperationClient(request.getAfterSalesApplyClient());
refundFailReq.setOperator(request.getOperator());
orderSdkService.refundFail(refundFailReq,LogThreadLocal.getTrackingNo());
}
return refundResponse;
} }
/** /**
...@@ -313,7 +321,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService { ...@@ -313,7 +321,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
} else if (OrderSourceV1.POS.getCode().equals(orderBean.getSource())) { } else if (OrderSourceV1.POS.getCode().equals(orderBean.getSource())) {
return posCancel(orderBean); return posCancel(orderBean);
} }
return ResponseUtil.success(); return ResponseUtil.error("501","暂不支持");
} }
/** /**
......
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/adapter/OrderCenterSdkAdapter.java
...@@ -74,6 +74,7 @@ public class OrderCenterSdkAdapter { ...@@ -74,6 +74,7 @@ public class OrderCenterSdkAdapter {
} }
if (orderInfoReqs.getAfterSalesOrderList() != null && orderInfoReqs.getAfterSalesOrderList().size() >= 1) { if (orderInfoReqs.getAfterSalesOrderList() != null && orderInfoReqs.getAfterSalesOrderList().size() >= 1) {
orderInfoReqs.getAfterSalesOrderList().sort(Comparator.comparing(AfterSalesOrderResp :: getCreateTime));
data.setAfterSalesOrderResp(orderInfoReqs.getAfterSalesOrderList().get(0)); data.setAfterSalesOrderResp(orderInfoReqs.getAfterSalesOrderList().get(0));
} }
......
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/constant/InterfaceAddressConstant.java
...@@ -291,4 +291,10 @@ public class InterfaceAddressConstant { ...@@ -291,4 +291,10 @@ public class InterfaceAddressConstant {
*/ */
public static final String QUERY_EVALUATION = "evaluation/getEvaluationsByOrderId"; public static final String QUERY_EVALUATION = "evaluation/getEvaluationsByOrderId";
/**
* 支付退款失败，更新售后单退款失败
*/
public static final String AFTERSALES_REFUND_FAIL= "/afterSales/v2/refundFail";
} }
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/AfterSalesType.java
...@@ -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;
......
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/AfterSalesRefundFailReq.java 0 → 100644
package com.freemud.application.sdk.api.ordercenter.request;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* All rights Reserved, Designed By www.freemud.cn
*
* @version V1.0
* @Title: AfterSalesRefundFailReq
* @Package com.freemud.application.sdk.api.ordercenter.request
* @Description:
* @author: ping.wu
* @date: 22-6-22 下午6:19
* @Copyright: 2022 www.freemud.cn Inc. All rights reserved.
*/
@Data
public class AfterSalesRefundFailReq {
private String partnerId;
private String orderCode;
/**
* 售后单编号
*/
private String afterSalesCode;
/**
* 退款失败原因
*/
private String refundFailReason;
/**
* 操作来源客户端
*/
private Integer operationClient;
/**
* 操作人
*/
private String operator;
}
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/AfterSalesOrderResp.java
...@@ -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;
/** /**
......
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderSdkService.java
...@@ -1029,4 +1029,14 @@ public class OrderSdkService { ...@@ -1029,4 +1029,14 @@ public class OrderSdkService {
}); });
return responseHandle(responseDTO); return responseHandle(responseDTO);
} }
/**
* 退款失败记录到订单售后单
*/
public OrderBaseResp refundFail(AfterSalesRefundFailReq request, String trackingNo) {
OrderBaseResp responseDTO = RequestThirdPartyUtils.httpJsonReqComplexNew(restTemplate, AFTERSALES_REFUND_FAIL,
createBaseRequest(request, trackingNo), new ParameterizedTypeReference<OrderBaseResp>() {
});
return responseHandle(responseDTO);
}
} }
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