Skip to content

O
order-group
Commit ed597807 by ping.wu
Options

支付退款代码整理

parent 622d5753
Showing with 643 additions and 572 deletions
order-application-service/src/main/java/cn/freemud/controller/delivery/DeliveryController.java
......@@ -55,7 +55,8 @@ public class DeliveryController {
@ApiOperation(value = "麦咖啡配送回调", notes = "麦咖啡配送回调", produces = "application/json")
@PostMapping("/delivery/macCafeCallback")
public BaseResponse macCafeCallback(@Valid @LogParams @RequestBody MacCafeCallbackUrlRequestDto request) {
return deliveryService.macCafeCallbackUrl(request);
// return deliveryService.macCafeCallbackUrl(request);
return new BaseResponse("1","101");
}
@ApiAnnotation(logMessage = "商城配送回调")
@ApiOperation(value = "商城配送回调", notes = "商城配送回调", produces = "application/json")
......
order-application-service/src/main/java/cn/freemud/service/ThirdDeliveryService.java
......@@ -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 {
*
* @param request
*/
@Override
public BaseResponse macCafeCallbackUrl(MacCafeCallbackUrlRequestDto request) {
OrderManagerRequest orderManagerRequest = new OrderManagerRequest();
orderManagerRequest.setPartnerId(request.getPartnerId());
orderManagerRequest.setOrderId(request.getOrderId());
if ("1".equals(request.getCancelApplicant())) {
orderManagerRequest.setReason(StringUtils.isNotBlank(request.getCancelReason()) ? request.getCancelReason() : "餐道主动取消");
} else {
orderManagerRequest.setReason(null);
}
orderManagerRequest.setOperator("配送回调");
Integer reviewStatus = request.getReviewStatus();
int deliveryStatus = request.getDeliveryStatus();
if (reviewStatus != null && reviewStatus.equals(DeliveryReviewStatus.AGREE.getCode())) {
orderManagerRequest.setOperateType(OperateType.ORDER_AGREE_REFUND.getOpType());
orderManagerRequest.setReason("配送回调-同意退款");
return orderManagerAdapter.orderPayRefund(orderManagerRequest);
}
if (reviewStatus != null && reviewStatus.equals(DeliveryReviewStatus.REJECT.getCode())) {
orderManagerRequest.setOperateType(OperateType.ORDER_REJECT_REFUND.getOpType());
orderManagerRequest.setReason("配送回调-拒绝退款");
return orderManagerAdapter.mcCafeOrderRejectRefund(orderManagerRequest);
}
if (deliveryStatus == DeliveryStatus.RIDERGETMEAL.getCode() || deliveryStatus == DeliveryStatus.RIDERSTARTDELIVERY.getCode()) {
orderManagerRequest.setOperateType(OperateType.ORDER_SEND.getOpType());
BaseResponse<OrderManagerResponse> baseResponse = orderManagerAdapter.orderDelivery(orderManagerRequest);
if (ResponseConstant.SUCCESS_RESPONSE_CODE_STR.equals(baseResponse.getCode())) {
updateDeliveryStatus(request);
}
sendMcCafeMicroMessage(request.getPartnerId(), request.getOrderId(), request.getDeliveryStatus());
return baseResponse;
} else if (deliveryStatus == DeliveryStatus.DELIVERYARRIVED.getCode()) {
orderManagerRequest.setOperateType(OperateType.ORDER_AFFIRM.getOpType());
BaseResponse<OrderManagerResponse> baseResponse = orderManagerAdapter.orderAffirm(orderManagerRequest, null);
if (ResponseConstant.SUCCESS_RESPONSE_CODE_STR.equals(baseResponse.getCode())) {
updateDeliveryStatus(request);
}
sendMcCafeMicroMessage(request.getPartnerId(), request.getOrderId(), request.getDeliveryStatus());
return baseResponse;
} else if (deliveryStatus == DeliveryStatus.WATINGORDER.getCode() || deliveryStatus == DeliveryStatus.SYSTEMGETORDER.getCode()
|| deliveryStatus == DeliveryStatus.ALLOTRIDER.getCode() || deliveryStatus == DeliveryStatus.RIDERARRIVESTORE.getCode()) {
updateDeliveryStatus(request);
return ResponseUtil.success();
} else if (deliveryStatus == DeliveryStatus.COLLECTING.getCode()) {
//推送订单到拉单队列
OrderCollectReq orderCollectReq = new OrderCollectReq();
orderCollectReq.setOrderCode(request.getOrderId());
orderCollectReq.setPartnerId(request.getPartnerId());
OrderBaseResp baseResponse = orderSdkService.collectOrder(orderCollectReq, LogThreadLocal.getTrackingNo());
if (ResponseConstant.SUCCESS_RESPONSE_CODE_STR.equals(baseResponse.getCode())) {
ResponseUtil.error(ResponseResult.ORDER_COLLECT_FAILED);
}
//回调成功，记录汇集状态
updateDeliveryStatus(request);
return ResponseUtil.success();
} else if (deliveryStatus == DeliveryStatus.DELIVERYERROR.getCode()) {
AssortmentUpdateDeliveryAbnormalRequest assortmentUpdateDeliveryAbnormalRequest = AssortmentUpdateDeliveryAbnormalRequest.builder()
.abnormalDesc(request.getRemark())
.deliveryId(request.getDeliveryId())
.orderCode(request.getOrderId())
.partnerId(request.getPartnerId())
.operator("餐道")
.build();
orderCenterSdkService.updateDeliveryAbnormal(assortmentUpdateDeliveryAbnormalRequest);
return ResponseUtil.success();
}
return ResponseUtil.error(ResponseResult.ORDER_DELIVERY_CALL_BACK_FAILED);
}
// @Override
// public BaseResponse macCafeCallbackUrl(MacCafeCallbackUrlRequestDto request) {
// OrderManagerRequest orderManagerRequest = new OrderManagerRequest();
// orderManagerRequest.setPartnerId(request.getPartnerId());
// orderManagerRequest.setOrderId(request.getOrderId());
// if ("1".equals(request.getCancelApplicant())) {
// orderManagerRequest.setReason(StringUtils.isNotBlank(request.getCancelReason()) ? request.getCancelReason() : "餐道主动取消");
// } else {
// orderManagerRequest.setReason(null);
// }
// orderManagerRequest.setOperator("配送回调");
//
//
// Integer reviewStatus = request.getReviewStatus();
// int deliveryStatus = request.getDeliveryStatus();
// if (reviewStatus != null && reviewStatus.equals(DeliveryReviewStatus.AGREE.getCode())) {
// orderManagerRequest.setOperateType(OperateType.ORDER_AGREE_REFUND.getOpType());
// orderManagerRequest.setReason("配送回调-同意退款");
// return orderManagerAdapter.orderPayRefund(orderManagerRequest);
// }
// if (reviewStatus != null && reviewStatus.equals(DeliveryReviewStatus.REJECT.getCode())) {
// orderManagerRequest.setOperateType(OperateType.ORDER_REJECT_REFUND.getOpType());
// orderManagerRequest.setReason("配送回调-拒绝退款");
// return orderManagerAdapter.mcCafeOrderRejectRefund(orderManagerRequest);
// }
// if (deliveryStatus == DeliveryStatus.RIDERGETMEAL.getCode() || deliveryStatus == DeliveryStatus.RIDERSTARTDELIVERY.getCode()) {
// orderManagerRequest.setOperateType(OperateType.ORDER_SEND.getOpType());
// BaseResponse<OrderManagerResponse> baseResponse = orderManagerAdapter.orderDelivery(orderManagerRequest);
// if (ResponseConstant.SUCCESS_RESPONSE_CODE_STR.equals(baseResponse.getCode())) {
// updateDeliveryStatus(request);
// }
// sendMcCafeMicroMessage(request.getPartnerId(), request.getOrderId(), request.getDeliveryStatus());
// return baseResponse;
// } else if (deliveryStatus == DeliveryStatus.DELIVERYARRIVED.getCode()) {
// orderManagerRequest.setOperateType(OperateType.ORDER_AFFIRM.getOpType());
// BaseResponse<OrderManagerResponse> baseResponse = orderManagerAdapter.orderAffirm(orderManagerRequest, null);
// if (ResponseConstant.SUCCESS_RESPONSE_CODE_STR.equals(baseResponse.getCode())) {
// updateDeliveryStatus(request);
// }
// sendMcCafeMicroMessage(request.getPartnerId(), request.getOrderId(), request.getDeliveryStatus());
// return baseResponse;
// } else if (deliveryStatus == DeliveryStatus.WATINGORDER.getCode() || deliveryStatus == DeliveryStatus.SYSTEMGETORDER.getCode()
// || deliveryStatus == DeliveryStatus.ALLOTRIDER.getCode() || deliveryStatus == DeliveryStatus.RIDERARRIVESTORE.getCode()) {
// updateDeliveryStatus(request);
// return ResponseUtil.success();
// } else if (deliveryStatus == DeliveryStatus.COLLECTING.getCode()) {
// //推送订单到拉单队列
// OrderCollectReq orderCollectReq = new OrderCollectReq();
// orderCollectReq.setOrderCode(request.getOrderId());
// orderCollectReq.setPartnerId(request.getPartnerId());
// OrderBaseResp baseResponse = orderSdkService.collectOrder(orderCollectReq, LogThreadLocal.getTrackingNo());
// if (ResponseConstant.SUCCESS_RESPONSE_CODE_STR.equals(baseResponse.getCode())) {
// ResponseUtil.error(ResponseResult.ORDER_COLLECT_FAILED);
// }
// //回调成功，记录汇集状态
// updateDeliveryStatus(request);
// return ResponseUtil.success();
// } else if (deliveryStatus == DeliveryStatus.DELIVERYERROR.getCode()) {
// AssortmentUpdateDeliveryAbnormalRequest assortmentUpdateDeliveryAbnormalRequest = AssortmentUpdateDeliveryAbnormalRequest.builder()
// .abnormalDesc(request.getRemark())
// .deliveryId(request.getDeliveryId())
// .orderCode(request.getOrderId())
// .partnerId(request.getPartnerId())
// .operator("餐道")
// .build();
// orderCenterSdkService.updateDeliveryAbnormal(assortmentUpdateDeliveryAbnormalRequest);
// return ResponseUtil.success();
// }
// return ResponseUtil.error(ResponseResult.ORDER_DELIVERY_CALL_BACK_FAILED);
// }
private OrderBaseResponse updateDeliveryStatus(MacCafeCallbackUrlRequestDto request) {
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 {
extendParams.put("mealType", "pickup");
}
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())) {
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.*;
import cn.freemud.enums.*;
import cn.freemud.handler.MemberBlacklistHandler;
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.response.pay.OrderRefundResponse;
import cn.freemud.management.entities.dto.response.pay.PayRefundResponse;
import cn.freemud.manager.SpellGroupOrderDataManager;
import cn.freemud.redis.RedisCache;
import cn.freemud.service.BuriedPointService;
......@@ -683,19 +685,24 @@ public class MallOrderServiceImpl implements MallOrderService {
* @param orderBean
*/
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();
String partnerId = orderBean.getCompanyId();
int state = PayRefundStatus.SUCCESS.getCode();
if (orderBean.getAmount() != 0) {
//调用支付退款
PayRefundRequestDto orderPayRefundRequest = orderAdapter.getOrderPayRefundRequest(orderBean, refundId, fatherOrderId);
response = payServiceImpl.orderRefund(orderPayRefundRequest);
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");
}
// PayRefundRequestDto orderPayRefundRequest = orderAdapter.getOrderPayRefundRequest(orderBean, refundId, fatherOrderId);
// response = payServiceImpl.orderRefund(orderPayRefundRequest);
// 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");
// }
//获取支付返回退款状态
// 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(),
partnerId, AfterSalesType.USER_CANCEL, orderRefundVo.getReason(), LogThreadLocal.getTrackingNo(), refundId.toString());
......
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
......@@ -2081,7 +2081,7 @@ public class OrderServiceImpl implements Orderservice {
if (orderBean.getAmount() != 0) {
OrderManagerRequest orderManagerRequest = new OrderManagerRequest();
orderManagerRequest.setReason(orderRefundVo.getReason());
PayRefundResponse refundResponse = paymentHandle.getCommonPayRefundResponse(orderManagerRequest, orderBean);
PayRefundResponse refundResponse = payServiceImpl.payRefundCommon(orderManagerRequest, orderBean);
state = refundResponse.getPayRefundStatus().getCode();
}
......@@ -2824,7 +2824,11 @@ public class OrderServiceImpl implements Orderservice {
String desc = "支付未及时回调";
PayRefundRequestDto orderPayRefundRequest = orderAdapter.getOrderPayRefundRequest(orderBean, refundId, orderBean.getOid());
// TODO: 22-6-23 待联调修改
response = payServiceImpl.orderRefund(orderPayRefundRequest);
// OrderManagerRequest request = new OrderManagerRequest();
// request.setReason(desc);
// PayRefundResponse response = payServiceImpl.payRefundCommon(request, orderBean);
if (response != null && noPay.equals(response.getCode())) {
return;
}
......@@ -3517,6 +3521,7 @@ public class OrderServiceImpl implements Orderservice {
if (Integer.valueOf(1).equals(queryRefundFailuresListDto.getLastFailureType()) || Integer.valueOf(2).equals(queryRefundFailuresListDto.getLastFailureType())) {
Long refundId = System.currentTimeMillis();
// TODO: 22-6-23 退款逻辑待合并
if (orderBean.getAmount() != 0) {
if (null != orderBean.getOrderPayItem() && orderBean.getOrderPayItem().size() > 0) {
//调用支付退款
......@@ -3778,8 +3783,9 @@ public class OrderServiceImpl implements Orderservice {
PayRefundResponse refundResponse;
try {
if (null != orderBean.getOrderPayItem() && orderBean.getOrderPayItem().size() > 0) {
refundResponse = paymentHandle.multiRefund(orderBean);
refundResponse = payServiceImpl.payRefundCommon(null,orderBean);
} else {
// TODO: 22-6-23 待考虑合并到上面一起
refundResponse = paymentHandle.refund("用户买券订单-申请退款", orderBean);
}
if (refundResponse.getPayRefundStatus().getCode().compareTo(PayRefundStatus.SUCCESS.getCode()) != 0) {
......@@ -3936,5 +3942,4 @@ public class OrderServiceImpl implements Orderservice {
this.sendPaySuccessMessage(orderBean);
}
}
order-application-service/src/main/java/cn/freemud/service/impl/PayServiceImpl.java
......@@ -28,13 +28,13 @@ import cn.freemud.enums.ResponseResult;
import cn.freemud.enums.TradeState;
import cn.freemud.interceptor.ServiceException;
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.PaymentQueryOrderRequestDto;
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.PayRefundData;
import cn.freemud.management.entities.dto.response.pay.*;
import cn.freemud.management.entities.dto.response.pay.PaymentQueryOrderResponseDto;
import cn.freemud.management.enums.PaymentRefundStatus;
import cn.freemud.management.service.handle.PaymentHandle;
import cn.freemud.management.thirdparty.MulitiPaymentClient;
import cn.freemud.management.thirdparty.OMSPaymentClient;
import cn.freemud.redis.RedisCache;
......@@ -100,6 +100,8 @@ public class PayServiceImpl {
private PaymentNewClient paymentNewClient;
@Autowired
private OMSPaymentClient omsPaymentClient;
@Autowired
private PaymentHandle paymentHandle;
@Autowired
private AssortmentOpenPlatformWxappManager openPlatformWxappManager;
......@@ -861,20 +863,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) {
......@@ -1644,4 +1632,33 @@ public class PayServiceImpl {
return orderPayResponse;
}
/**
* 支付退款
*/
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 {
/**
* 支付查询
* 关闭预支付使用
*/
@LogIgnoreFeign(logMessage="payQuery")
@PostMapping("paymentcenter/query")
......
order-management/src/main/java/cn/freemud/management/service/adapter/OrderBeanFactory.java
......@@ -34,9 +34,9 @@ public class OrderBeanFactory {
// String source = orderBean.getSource();
String orderClient = orderBean.getOrderClient();
String companyId = orderBean.getCompanyId();
if (macCafePartnerId.equals(companyId)){
return applicationContext.getBean(McCafeMangerServiceImpl.class);
}
// if (macCafePartnerId.equals(companyId)){
// return applicationContext.getBean(McCafeMangerServiceImpl.class);
// }
// if (OrderSource.BDWM.getSource().equals(source) || OrderSource.JDWM.getSource().equals(source)
// || OrderSource.MTWM.getSource().equals(source) || OrderSource.ELEME.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 {
/**
* 同意退款或者取消订单
*/
public BaseResponse orderPayRefund(OrderManagerRequest request) {
//查询订单
OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId());
if (null == orderBean) {
return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
}
if (CollectionUtils.isNotEmpty(orderBean.getRefundList())) {
//订单接单参数校验
BaseResponse verifyResponse = orderVerifyHandle.orderAgreeRefundMCCafe(orderBean, request);
if (ObjectUtils.notEqual(verifyResponse.getCode(), ResponseResult.SUCCESS.getCode())) {
return handleResponse(request, orderBean, verifyResponse);
}
BaseResponse<OrderManagerResponse> orderManagerResponse = orderBeanFactory.getOrderManagerService(orderBean).orderAgreeRefund(request, orderBean);
return handleResponse(request, orderBean, orderManagerResponse);
} else {
BaseResponse<OrderManagerResponse> orderManagerResponse = orderBeanFactory.getOrderManagerService(orderBean).orderCancel(request, orderBean);
return handleResponse(request, orderBean, orderManagerResponse);
}
}
// public BaseResponse orderPayRefund(OrderManagerRequest request) {
// //查询订单
// OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId());
// if (null == orderBean) {
// return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
// }
// if (CollectionUtils.isNotEmpty(orderBean.getRefundList())) {
// //订单接单参数校验
// BaseResponse verifyResponse = orderVerifyHandle.orderAgreeRefundMCCafe(orderBean, request);
// if (ObjectUtils.notEqual(verifyResponse.getCode(), ResponseResult.SUCCESS.getCode())) {
// return handleResponse(request, orderBean, verifyResponse);
// }
// BaseResponse<OrderManagerResponse> orderManagerResponse = orderBeanFactory.getOrderManagerService(orderBean).orderAgreeRefund(request, orderBean);
// return handleResponse(request, orderBean, orderManagerResponse);
// } else {
// BaseResponse<OrderManagerResponse> orderManagerResponse = orderBeanFactory.getOrderManagerService(orderBean).orderCancel(request, orderBean);
// return handleResponse(request, orderBean, orderManagerResponse);
// }
// }
/**
* 拒绝退款
......@@ -264,20 +264,20 @@ public class OrderManagerAdapter {
* @param request
* @return
*/
public BaseResponse mcCafeOrderRejectRefund(OrderManagerRequest request) {
//查询订单
OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId());
if (null == orderBean) {
return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
}
//订单接单参数校验
BaseResponse verifyResponse = orderVerifyHandle.mcCafeOrderRejectRefund(orderBean, request);
if (ObjectUtils.notEqual(verifyResponse.getCode(), ResponseResult.SUCCESS.getCode())) {
return handleResponse(request, orderBean, verifyResponse);
}
BaseResponse<OrderManagerResponse> orderManagerResponse = orderBeanFactory.getOrderManagerService(orderBean).orderRejectRefund(request, orderBean);
return handleResponse(request, orderBean, orderManagerResponse);
}
// public BaseResponse mcCafeOrderRejectRefund(OrderManagerRequest request) {
// //查询订单
// OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId());
// if (null == orderBean) {
// return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
// }
// //订单接单参数校验
// BaseResponse verifyResponse = orderVerifyHandle.mcCafeOrderRejectRefund(orderBean, request);
// if (ObjectUtils.notEqual(verifyResponse.getCode(), ResponseResult.SUCCESS.getCode())) {
// return handleResponse(request, orderBean, verifyResponse);
// }
// BaseResponse<OrderManagerResponse> orderManagerResponse = orderBeanFactory.getOrderManagerService(orderBean).orderRejectRefund(request, orderBean);
// return handleResponse(request, orderBean, orderManagerResponse);
// }
private BaseResponse<OrderManagerResponse> handleResponse(OrderManagerRequest request, OrderBeanV1 orderBean, BaseResponse result) {
......
order-management/src/main/java/cn/freemud/management/service/handle/PaymentHandle.java
......@@ -19,6 +19,7 @@ import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformIapp
import com.freemud.application.sdk.api.base.BaseResponse;
import com.freemud.application.sdk.api.log.ErrorLog;
import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
import com.freemud.application.sdk.api.ordercenter.enums.PayChannelType;
import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderTypeV1;
import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
import com.freemud.application.sdk.api.ordercenter.request.OrderExtendedReq;
......@@ -64,9 +65,6 @@ public class PaymentHandle {
public static final Integer REFUND_RESPONSE_CODE = 8200305;
@Value("${mccafe.partner.id}")
private String macCafePartnerId;
@Autowired
private PaymentSdkAdapter paymentSdkAdapter;
@Autowired
......@@ -75,8 +73,6 @@ public class PaymentHandle {
private MulitiPaymentClient mulitiPaymentClient;
@Autowired
private RedisCache redisCache;
// @Autowired
// private PaymentNewService paymentNewService;
@Autowired
private OMSPaymentClient paymentNewClient;
......@@ -86,6 +82,14 @@ public class PaymentHandle {
@Autowired
private LogUtil logUtil;
/**
* 点餐订单退款入口
* 支付退款，包含纯现金，代付，混合支付
*
* @param request
* @param orderBean
* @return
*/
public PayRefundResponse getCommonPayRefundResponse(OrderManagerRequest request, OrderBeanV1 orderBean) {
PayRefundResponse refundResponse;
try {
......@@ -99,43 +103,118 @@ public class PaymentHandle {
refundResponse = this.agentPayRefund(orderBean);
} else {
//正常订单现金退款 paymentcenter/refund
refundResponse = this.refund(request, orderBean);
refundResponse = this.payRefund(request.getReason(), orderBean);
}
}
} catch (OrderServiceException orderEx) {
ResponseResult result = orderEx.getResult();
refundResponse = new PayRefundResponse();
refundResponse.setPayRefundStatus(PayRefundStatus.COMPATIBILITY_STATUS);
refundResponse.setMessage(result.getMessage());
refundResponse.setResult(result);
return refundResponse;
} catch (Exception e) {
refundResponse = new PayRefundResponse();
refundResponse.setPayRefundStatus(PayRefundStatus.COMPATIBILITY_STATUS);
refundResponse.setMessage("请稍后再试！");
refundResponse.setResult(ResponseResult.SYSTEM_ERROR);
return refundResponse;
}
return refundResponse;
}
/**
* 退款
* 纯现金支付退款，非代付和混合支付退款
*
* @param request
* @param reason 退款原因
* @param orderBean
* @return
*/
public PayRefundResponse refund(OrderManagerRequest request, OrderBeanV1 orderBean) {
private PayRefundResponse payRefund(String reason, OrderBeanV1 orderBean) {
PayRefundStatus refundStatus = PayRefundStatus.SUCCESS;
PayRefundRequestDto orderRefundRequest = paymentSdkAdapter.getOrderRefundRequest(orderBean, getRefundAmount(orderBean));
//抖音支付必传
orderRefundRequest.setRefundDesc(request.getReason() == null ? "商家退款" : request.getReason());
orderRefundRequest.setRefundDesc(reason == null ? "商家退款" : reason);
if (ObjectUtils.equals(orderBean.getAmount(), 0L)) {
return handlePayRefundResponse(refundStatus, orderRefundRequest.getRefundId());
}
BaseResponse<OrderRefundResponse> orderRefundResponse = this.orderPayRefund(orderRefundRequest);
String message = null;
if (orderRefundResponse == null) {
refundStatus = PayRefundStatus.RUNNING;
} else {
refundStatus = this.getFinalRefundStatus(Integer.valueOf(orderRefundResponse.getCode()));
message = orderRefundResponse.getMessage();
}
return handlePayRefundResponse(refundStatus, orderRefundRequest.getRefundId());
PayRefundResponse payRefundResponse = handlePayRefundResponse(refundStatus, orderRefundRequest.getRefundId());
if(message != null){
payRefundResponse.setMessage(message);
}
return payRefundResponse;
}
/**
* 混合支付退款
*/
private PayRefundResponse multiRefund(OrderBeanV1 orderBean) {
PayRefundStatus refundStatus = PayRefundStatus.SUCCESS;
MultiOrderRefundRequest multiOrderRefundRequest = paymentSdkAdapter.getMultiOrderPayRefundRequest(orderBean, getRefundAmount(orderBean));
MultiOrderRefundResponse multiOrderRefundResponse = mulitiPaymentClient.paymentApplicationRefund(multiOrderRefundRequest, orderBean.getCompanyId());
if (multiOrderRefundResponse == null || multiOrderRefundResponse.getData() == null || !com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant.ORDER_PAY_RESPONSE_SUCCESS.equals(multiOrderRefundResponse.getCode())) {
// fisherman 退款异常 也当做 退款中处理
refundStatus = PayRefundStatus.RUNNING;
} else {
List<MultiOrderRefundResponse.RefundPlatformResponse> refundPlatformResponseList = multiOrderRefundResponse.getData().refundPlatformResponseList;
if (null != refundPlatformResponseList && refundPlatformResponseList.size() > 0) {
redisCache.save(RedisUtil.getPaymentTransIdSequenceKey(refundPlatformResponseList.get(0).getTransId()), orderBean.getOid(), 1L, TimeUnit.DAYS);
}
if (CollectionUtils.isNotEmpty(refundPlatformResponseList)) {
long refundError = refundPlatformResponseList.stream()
.filter(s -> s.getResultCode().compareTo(MultiOrderRefundResponse.RefundPlatformResponse.REFUNDED_RESULTCODE) != 0
&& s.getResultCode().compareTo(MultiOrderRefundResponse.RefundPlatformResponse.REFUND_SUCCESS) != 0)
.count();
if (refundError > 0L) {
refundStatus = PayRefundStatus.FAIL;
}
// 退款中
long refunded = refundPlatformResponseList.stream()
.filter(s -> s.getResultCode().compareTo(MultiOrderRefundResponse.RefundPlatformResponse.REFUNDED_RESULTCODE) == 0)
.count();
if (refunded > 0L) {
refundStatus = PayRefundStatus.RUNNING;
}
}
}
return handlePayRefundResponse(refundStatus, multiOrderRefundRequest.getRefundTradeNo());
}
/**
* 代付订单退款
*
* @param orderBean
* @return
*/
private PayRefundResponse agentPayRefund(OrderBeanV1 orderBean) {
PayRefundStatus refundStatus = PayRefundStatus.SUCCESS;
String fmRefundNo = "";
try {
AgentPayRefundReq req = paymentSdkAdapter.getAgentPayefundReq(orderBean, this.getRefundAmount(orderBean));
AgentPayRefundResp resp = mulitiPaymentClient.agentPayRefund(req);
if (!resp.isOk()) {
refundStatus = PayRefundStatus.RUNNING;
}
AgentPayRefundResp.DataDTO data = resp.getData();
if (Objects.nonNull(data)) {
refundStatus = this.getFinalRefundStatus(data.getResultCode());
}
fmRefundNo = resp.getData().getFmRefundNo();
} catch (Throwable e) {
refundStatus = PayRefundStatus.FAIL;
}
return this.handlePayRefundResponse(refundStatus, fmRefundNo);
}
private PayRefundStatus getFinalRefundStatus(Integer resultCode) {
switch (resultCode) {
// 退款中状态码需要单独处理
......@@ -153,6 +232,9 @@ public class PaymentHandle {
}
/**
* 查询退款配置
*/
private PayRefundRequestDto queryWxAppStore(BaseResponse<PaymentQueryOrderResponseDto> payQueryOrderResponse, PayRefundRequestDto refundRequest) {
String payCode = null;
if (Objects.equals(payQueryOrderResponse.getCode(), "100") && payQueryOrderResponse.getData() != null) {
......@@ -208,32 +290,6 @@ public class PaymentHandle {
return payQueryOrderResponse;
}
/**
* 代付订单退款
*
* @param orderBean
* @return
*/
public PayRefundResponse agentPayRefund(OrderBeanV1 orderBean) {
PayRefundStatus refundStatus = PayRefundStatus.SUCCESS;
String fmRefundNo = "";
try {
AgentPayRefundReq req = paymentSdkAdapter.getAgentPayefundReq(orderBean, this.getRefundAmount(orderBean));
AgentPayRefundResp resp = mulitiPaymentClient.agentPayRefund(req);
if (!resp.isOk()) {
refundStatus = PayRefundStatus.RUNNING;
}
AgentPayRefundResp.DataDTO data = resp.getData();
if (Objects.nonNull(data)) {
refundStatus = this.getFinalRefundStatus(data.getResultCode());
}
fmRefundNo = resp.getData().getFmRefundNo();
} catch (Throwable e) {
refundStatus = PayRefundStatus.FAIL;
}
return this.handlePayRefundResponse(refundStatus, fmRefundNo);
}
/**
* 卖券调用退款
......@@ -269,7 +325,7 @@ public class PaymentHandle {
}
/**
* 退款
* 线下pos下单使用储值卡支付，储值卡退款
*
* @param orderBean
* @return
......@@ -280,10 +336,8 @@ public class PaymentHandle {
if (ObjectUtils.equals(orderBean.getAmount(), 0L)) {
return handlePayRefundResponse(refundStatus, refundRequest.getRefundId());
}
// com.freemud.application.sdk.api.base.BaseResponse<RefundNewResponse> orderRefundResponse;
BaseResponse<PayRefundData> orderRefundResponse;
try {
// orderRefundResponse = paymentNewService.newOrderRefund(refundRequest, LogThreadLocal.getTrackingNo());
orderRefundResponse = paymentNewClient.payRefund(refundRequest);
} catch (Exception ex) {
ErrorLog.errorConvertJson(this.getClass(), "paymentNewService.newOrderRefundError", ex);
......@@ -304,45 +358,6 @@ public class PaymentHandle {
}
/**
* 麦咖啡退款
*
* @param request
* @param orderBean
* @return
*/
public PayRefundResponse mcCafeRefund(OrderManagerRequest request, OrderBeanV1 orderBean) {
// PayRefundStatus refundStatus = PayRefundStatus.SUCCESS;
PayRefundRequestDto orderRefundRequest = paymentSdkAdapter.getOrderRefundRequest(orderBean, new BigDecimal(orderBean.getAmount()));
// if (ObjectUtils.equals(orderBean.getAmount(), 0L)) {
// return handlePayRefundResponse(refundStatus, orderRefundRequest.getRefundId());
// }
// if (macCafePartnerId.equals(orderBean.getCompanyId())) {
// Map<String, String> extendParams = new HashMap<>();
// if (OrderTypeV1.TAKE_OUT.getCode().equals(orderBean.getOrderType())) {
// extendParams.put("mealType", "delivery");
// } else {
// extendParams.put("mealType", "pickup");
// }
// orderRefundRequest.setExtendParams(extendParams);
// }
// BaseResponse<OrderRefundResponse> orderRefundResponse = null;
// try {
//// orderRefundResponse = standardPaymentService.orderRefund(orderRefundRequest, "");
//// orderRefundResponse = this.orderPayRefund(orderRefundRequest);
// } catch (Exception ex) {
// ErrorLog.errorConvertJson(this.getClass(), "refundError", ex);
// return handlePayRefundResponse(PayRefundStatus.FAIL, orderRefundRequest.getRefundId());
// }
// if (orderRefundResponse == null || ObjectUtils.notEqual(orderRefundResponse.getCode(), SUCCESS)) {
// return handlePayRefundResponse(PayRefundStatus.FAIL, orderRefundRequest.getRefundId());
// }
// refundStatus = ObjectUtils.equals(PayRefundStatus.SUCCESS.getCode(), orderRefundResponse.getData().getRefundStatus()) ? PayRefundStatus.SUCCESS : PayRefundStatus.FAIL;
// return handlePayRefundResponse(refundStatus, orderRefundRequest.getRefundId());
return handlePayRefundResponse(PayRefundStatus.FAIL, orderRefundRequest.getRefundId());
}
/**
* 获取退款金额
*
* @param data
......@@ -361,48 +376,17 @@ public class PaymentHandle {
PayRefundResponse payRefundResponse = new PayRefundResponse();
payRefundResponse.setPayRefundStatus(refundStatus);
payRefundResponse.setRefundId(refundId);
payRefundResponse.setMessage(refundStatus.getDesc());
return payRefundResponse;
}
public PayRefundResponse multiRefund(OrderBeanV1 orderBean) {
PayRefundStatus refundStatus = PayRefundStatus.SUCCESS;
MultiOrderRefundRequest multiOrderRefundRequest = paymentSdkAdapter.getMultiOrderPayRefundRequest(orderBean, getRefundAmount(orderBean));
MultiOrderRefundResponse multiOrderRefundResponse = mulitiPaymentClient.paymentApplicationRefund(multiOrderRefundRequest, orderBean.getCompanyId());
if (multiOrderRefundResponse == null || multiOrderRefundResponse.getData() == null || !com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant.ORDER_PAY_RESPONSE_SUCCESS.equals(multiOrderRefundResponse.getCode())) {
// fisherman 退款异常 也当做 退款中处理
refundStatus = PayRefundStatus.RUNNING;
}else {
List<MultiOrderRefundResponse.RefundPlatformResponse> refundPlatformResponseList = multiOrderRefundResponse.getData().refundPlatformResponseList;
if (null != refundPlatformResponseList && refundPlatformResponseList.size() > 0) {
redisCache.save(RedisUtil.getPaymentTransIdSequenceKey(refundPlatformResponseList.get(0).getTransId()), orderBean.getOid(), 1L, TimeUnit.DAYS);
}
if (CollectionUtils.isNotEmpty(refundPlatformResponseList)) {
long refundError = refundPlatformResponseList.stream()
.filter(s -> s.getResultCode().compareTo(MultiOrderRefundResponse.RefundPlatformResponse.REFUNDED_RESULTCODE) != 0
&& s.getResultCode().compareTo(MultiOrderRefundResponse.RefundPlatformResponse.REFUND_SUCCESS) != 0)
.count();
if (refundError > 0L) {
refundStatus = PayRefundStatus.FAIL;
}
// 退款中
long refunded = refundPlatformResponseList.stream()
.filter(s -> s.getResultCode().compareTo(MultiOrderRefundResponse.RefundPlatformResponse.REFUNDED_RESULTCODE) == 0)
.count();
if (refunded > 0L) {
refundStatus = PayRefundStatus.RUNNING;
}
}
}
return handlePayRefundResponse(refundStatus, multiOrderRefundRequest.getRefundTradeNo());
}
/**
* 支付退款
* 纯现金支付退款，非代付和混合支付退款
*/
public BaseResponse<OrderRefundResponse> orderPayRefund(PayRefundRequestDto refundRequest) {
private BaseResponse<OrderRefundResponse> orderPayRefund(PayRefundRequestDto refundRequest) {
// step1 查询支付
// step1 查询支付结果
BaseResponse<PaymentQueryOrderResponseDto> paymentQueryOrderResponseDtoBaseResponse = this.queryPayOrder(refundRequest);
if (Objects.isNull(paymentQueryOrderResponseDtoBaseResponse)) {
throw new OrderServiceException(ResponseResult.REFUND_EXCEPTION);
......@@ -451,7 +435,7 @@ public class PaymentHandle {
}
public com.freemud.application.sdk.api.base.BaseResponse<OrderRefundResponse> checkParam(String partnerId, String storeId, Long amount, AssortmentOpenPlatformIappWxappStore wxAppStore) {
private com.freemud.application.sdk.api.base.BaseResponse<OrderRefundResponse> checkParam(String partnerId, String storeId, Long amount, AssortmentOpenPlatformIappWxappStore wxAppStore) {
if (StringUtils.isBlank(partnerId)) {
return ResponseUtils.error("501", "商户号不能为空");
} else if (StringUtils.isBlank(storeId)) {
......@@ -464,7 +448,7 @@ public class PaymentHandle {
}
public Integer getRefundStatus(Integer resultCode) {
private Integer getRefundStatus(Integer resultCode) {
if (Objects.equals(resultCode, SUCCESS_RESPONSE_CODE_INT)) {
return PaymentRefundStatus.PAYMENT_REFUND_STATUS_1.getCode();
} else if (Objects.equals(resultCode, SUCCESS_RESPONSE_101_CODE_INT)) {
......
order-management/src/main/java/cn/freemud/management/service/impl/MallOrderMangerServiceImpl.java
......@@ -14,12 +14,16 @@ import cn.freemud.management.service.handle.*;
import cn.freemud.management.util.ResponseUtil;
import com.alibaba.fastjson.JSONObject;
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.enums.AfterSalesStatus;
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.RefundModeEnum;
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.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -52,6 +56,8 @@ public class MallOrderMangerServiceImpl implements OrderManagerService {
private StockHandle stockHandle;
@Autowired
private ActivityHandle activityHandle;
@Autowired
private OrderSdkService orderSdkService;
/**
* 同意退款
......@@ -89,11 +95,10 @@ public class MallOrderMangerServiceImpl implements OrderManagerService {
}
//支付退款
PayRefundResponse refundResponse = new PayRefundResponse();
try {
refundResponse = paymentHandle.refund(request, orderBean);
} catch (OrderServiceException orderEx) {
return ResponseUtil.error(orderEx.getResult());
PayRefundResponse refundResponse = this.payRefundCommon(request, orderBean);
//fisherman --> 退款中的状态 阻止后续流程 等待支付回调 不是退款成功 都终止下面的退款流程
if (refundResponse.getPayRefundStatus().getCode().compareTo(PayRefundStatus.SUCCESS.getCode()) != 0) {
return ResponseUtil.error(ResponseResult.REFUND_FAIL);
}
//订单同意退款
mallOrderHandle.refundAgree(request, refundResponse, orderBean);
......@@ -117,11 +122,10 @@ public class MallOrderMangerServiceImpl implements OrderManagerService {
}
//支付退款
PayRefundResponse refundResponse = new PayRefundResponse();
try {
refundResponse = paymentHandle.refund(request, orderBean);
} catch (OrderServiceException orderEx) {
return ResponseUtil.error(orderEx.getResult());
PayRefundResponse refundResponse = this.payRefundCommon(request, orderBean);
//fisherman --> 退款中的状态 阻止后续流程 等待支付回调 不是退款成功 都终止下面的退款流程
if (refundResponse.getPayRefundStatus().getCode().compareTo(PayRefundStatus.SUCCESS.getCode()) != 0) {
return ResponseUtil.error(ResponseResult.REFUND_FAIL);
}
//订单同意退款
mallOrderHandle.refundAgree(request, refundResponse, orderBean);
......@@ -161,15 +165,10 @@ public class MallOrderMangerServiceImpl implements OrderManagerService {
@Override
public BaseResponse<OrderManagerResponse> orderReject(OrderManagerRequest request, OrderBeanV1 orderBean) {
//支付退款
PayRefundResponse refundResponse = new PayRefundResponse();
try {
if(null != orderBean.getOrderPayItem() && orderBean.getOrderPayItem().size()>0){
refundResponse = paymentHandle.multiRefund(orderBean);
}else{
refundResponse = paymentHandle.refund(request, orderBean);
}
} catch (OrderServiceException orderEx){ // 爱马哥兼容，不抛错
return ResponseUtil.error(orderEx.getResult());
PayRefundResponse refundResponse = this.payRefundCommon(request, orderBean);
//fisherman --> 退款中的状态 阻止后续流程 等待支付回调 不是退款成功 都终止下面的退款流程
if (refundResponse.getPayRefundStatus().getCode().compareTo(PayRefundStatus.SUCCESS.getCode()) != 0) {
return ResponseUtil.error(ResponseResult.REFUND_FAIL);
}
//订单拒单
mallOrderHandle.mallOrderReject(request, refundResponse, orderBean);
......@@ -181,4 +180,28 @@ public class MallOrderMangerServiceImpl implements OrderManagerService {
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/McCafeMangerServiceImpl.java
package cn.freemud.management.service.impl;
import cn.freemud.base.entity.BaseResponse;
import cn.freemud.base.util.DateUtil;
import cn.freemud.management.entities.dto.request.delivery.DeliveryOrderAssemblyackRequest;
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.pay.PayRefundResponse;
import cn.freemud.management.enums.ResponseResult;
import cn.freemud.management.service.OrderManagerService;
import cn.freemud.management.service.handle.*;
import cn.freemud.management.thirdparty.DeliveryMCCafeClient;
import cn.freemud.management.util.ResponseUtil;
import com.freemud.application.sdk.api.deliverycenter.response.DeliveryResponseDto;
import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
import com.freemud.application.sdk.api.ordercenter.enums.AbnormalStateEnum;
import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderStatusV1;
import com.freemud.application.sdk.api.ordercenter.request.SdkUpdateAbnormalState;
import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
import com.freemud.sdk.api.assortment.message.enums.OrderType;
import com.freemud.sdk.api.assortment.order.enums.PayRefundStatus;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Objects;
/**
* All rights Reserved, Designed By www.freemud.cn
*
* @version V1.0
* @Title: McoffeMangerServiceImpl
* @Package cn.freemud.management.service.impl
* @Description:
* @author: shuhu.hou
* @date: 2020/8/9 15:26
* @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
* 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
*/
@Service
public class McCafeMangerServiceImpl implements OrderManagerService {
@Resource
private SaasOrderHandle saasOrderHandle;
@Resource
private CouponHandle couponHandle;
@Resource
private DeliveryHandle deliveryHandle;
@Resource
private PaymentHandle paymentHandle;
@Resource
private StockHandle stockHandle;
@Resource
private DeliveryMCCafeClient deliveryMCCafeClient;
@Resource
private OrderSdkService orderSdkService;
@Value("${mccafe.partner.id}")
private String macCafePartnerId;
@Value("${mcCafe.withOrderBuy.cardId}")
private String macCafeCardId;
@Override
public BaseResponse<OrderManagerResponse> orderConfirm(OrderManagerRequest request, OrderBeanV1 orderBean) {
if (orderBean == null) {
return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
}
OrderManagerRequest orderManagerRequest =new OrderManagerRequest();
BeanUtils.copyProperties(request,orderManagerRequest);
if (!OrderStatusV1.TAKE_ORDER.getV2Code().equals(orderBean.getStatusV2()) && !OrderStatusV1.RECEIPT.getV2Code().equals(orderBean.getStatusV2())){
return ResponseUtil.error(ResponseResult.ORDER_STATUS_FAILED);
}
if (StringUtils.isNotEmpty(request.getPickUpGoodsNo())){
//更新取餐码
BaseResponse baseResponse = saasOrderHandle.updatePickUpGoodNo(request, orderBean);
if (!ResponseResult.SUCCESS.getCode().equals(baseResponse.getCode())){
return ResponseUtil.error(ResponseResult.ORDER_UPDATE_PICKUP_FAILED);
}
}
if (OrderStatusV1.TAKE_ORDER.getV2Code().equals(orderBean.getStatusV2())) {
// 订单接单
saasOrderHandle.orderConfirm(orderManagerRequest, orderBean);
}
if (!Objects.equals(orderBean.getOrderType(), OrderType.TAKE_OUT.getCode())) {
// 异步核销券码
couponHandle.asyncVerificationCoupon(orderBean);
}
if (StringUtils.isNotEmpty(request.getPickUpGoodsNo())){
if (Objects.equals(orderBean.getOrderType(), OrderType.TAKE_OUT.getCode())) {
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
DeliveryOrderAssemblyackRequest assemblyAckRequest = new DeliveryOrderAssemblyackRequest();
assemblyAckRequest.setOrderKey(request.getOrderId());
assemblyAckRequest.setDisplayOrderNumber(request.getPickUpGoodsNo());
assemblyAckRequest.setAssemblyTimeUTC(dateFormat.format(DateUtil.addHours(new Date(), -8)));
assemblyAckRequest.setStoreId(orderBean.getShopId());
//入机成功通知配送
DeliveryResponseDto deliveryResponse = deliveryMCCafeClient.assemblyAck(assemblyAckRequest);
if (deliveryResponse == null || !StringUtils.equals(ResponseResult.SUCCESS.getCode(), deliveryResponse.getCode() + "")) {
return ResponseUtil.error(ResponseResult.DELIVERY_ASSEMBLY_ACK_ERROR);
}
}
}
return ResponseUtil.success();
}
@Override
public BaseResponse<OrderManagerResponse> orderReject(OrderManagerRequest request, OrderBeanV1 orderBean) {
OrderManagerRequest orderManagerRequest =new OrderManagerRequest();
BeanUtils.copyProperties(request,orderManagerRequest);
//根据是否是外卖单来判断
if (Objects.equals(orderBean.getOrderType(), OrderType.TAKE_OUT.getCode())) {
// 订单接单
BaseResponse<OrderManagerResponse> orderManagerResponseBaseResponse = orderConfirm(request, orderBean);
if (ResponseResult.SUCCESS.getCode().equals(orderManagerResponseBaseResponse.getCode())){
//通知配送服务停单
deliveryHandle.haltedDelivery(orderBean);
}
}else {
//支付退款
PayRefundResponse refundResponse = paymentHandle.mcCafeRefund(orderManagerRequest, orderBean);
if(refundResponse.getPayRefundStatus().getCode().equals(PayRefundStatus.SUCCESS.getCode())) {
//订单拒单
saasOrderHandle.mcCafeOrderReject(orderManagerRequest, refundResponse, orderBean);
//冲正库存
stockHandle.revert(orderManagerRequest, orderBean);
} else {
SdkUpdateAbnormalState sdkUpdateAbnormalState = new SdkUpdateAbnormalState();
sdkUpdateAbnormalState.setOrderCode(request.getOrderId());
sdkUpdateAbnormalState.setPartnerId(request.getPartnerId());
sdkUpdateAbnormalState.setAbnormalState(AbnormalStateEnum.ABNORMAL.getCode());
sdkUpdateAbnormalState.setAbnormalDesc("支付退款失败，订单入机失败回调异常");
sdkUpdateAbnormalState.setOrderClient(OrderClientType.SAAS.getIndex());
sdkUpdateAbnormalState.setOperator(request.getOperator());
orderSdkService.updateAbnormalState(sdkUpdateAbnormalState);
}
}
return ResponseUtil.success();
}
/**
* 制作完成
*
* @param request
* @param orderBean
* @return
*/
@Override
public BaseResponse<OrderManagerResponse> orderDone(OrderManagerRequest request, OrderBeanV1 orderBean) {
// 订单制作完成
saasOrderHandle.orderDone(request, orderBean);
return ResponseUtil.success();
}
/**
* 订单配送
*
* @param request
* @param orderBean
* @return
*/
@Override
public BaseResponse<OrderManagerResponse> orderDelivery(OrderManagerRequest request, OrderBeanV1 orderBean) {
// 订单配送
saasOrderHandle.orderDelivery(request, orderBean);
return ResponseUtil.success();
}
/**
* 订单完成
*
* @param request
* @param orderBean
* @return
*/
@Override
public BaseResponse<OrderManagerResponse> orderAffirm(OrderManagerRequest request, OrderBeanV1 orderBean) {
// 订单完成
saasOrderHandle.orderAffirm(request, orderBean);
return ResponseUtil.success();
}
/**
* 同意退款
*
* @param request
* @param orderBean
* @return
*/
@Override
public BaseResponse<OrderManagerResponse> orderAgreeRefund(OrderManagerRequest request, OrderBeanV1 orderBean) {
//支付退款
PayRefundResponse refundResponse = paymentHandle.mcCafeRefund(request, orderBean);
if(refundResponse.getPayRefundStatus().getCode().equals(PayRefundStatus.SUCCESS.getCode())) {
//订单拒单
saasOrderHandle.mcCafeRefundAgree(request, refundResponse, orderBean);
//冲正库存
stockHandle.revert(request, orderBean);
} else {
SdkUpdateAbnormalState sdkUpdateAbnormalState = new SdkUpdateAbnormalState();
sdkUpdateAbnormalState.setOrderCode(request.getOrderId());
sdkUpdateAbnormalState.setPartnerId(request.getPartnerId());
sdkUpdateAbnormalState.setAbnormalState(AbnormalStateEnum.ABNORMAL.getCode());
sdkUpdateAbnormalState.setAbnormalDesc("支付退款失败，订单入机失败回调异常");
sdkUpdateAbnormalState.setOrderClient(OrderClientType.SAAS.getIndex());
sdkUpdateAbnormalState.setOperator(request.getOperator());
orderSdkService.updateAbnormalState(sdkUpdateAbnormalState);
}
return ResponseUtil.success();
}
/**
* 拒绝退款
*
* @param request
* @param orderBean
* @return
*/
@Override
public BaseResponse<OrderManagerResponse> orderRejectRefund(OrderManagerRequest request, OrderBeanV1 orderBean) {
//拒绝退款
saasOrderHandle.mcCafeRefundReject(request,orderBean);
return ResponseUtil.success();
}
/**
* 商家取消
*/
@Override
public BaseResponse<OrderManagerResponse> orderCancel(OrderManagerRequest request, OrderBeanV1 orderBean) {
//支付退款
PayRefundResponse refundResponse = paymentHandle.mcCafeRefund(request, orderBean);
if(refundResponse.getPayRefundStatus().getCode().equals(PayRefundStatus.SUCCESS.getCode())) {
//订单拒单
saasOrderHandle.orderCancel(request, refundResponse, orderBean);
//冲正库存
stockHandle.revert(request, orderBean);
} else {
SdkUpdateAbnormalState sdkUpdateAbnormalState = new SdkUpdateAbnormalState();
sdkUpdateAbnormalState.setOrderCode(request.getOrderId());
sdkUpdateAbnormalState.setPartnerId(request.getPartnerId());
sdkUpdateAbnormalState.setAbnormalState(AbnormalStateEnum.ABNORMAL.getCode());
sdkUpdateAbnormalState.setAbnormalDesc("支付退款失败，订单入机失败回调异常");
sdkUpdateAbnormalState.setOrderClient(OrderClientType.SAAS.getIndex());
sdkUpdateAbnormalState.setOperator(request.getOperator());
orderSdkService.updateAbnormalState(sdkUpdateAbnormalState);
}
return ResponseUtil.success();
}
}
//package cn.freemud.management.service.impl;
//
//import cn.freemud.base.entity.BaseResponse;
//import cn.freemud.base.util.DateUtil;
//import cn.freemud.management.entities.dto.request.delivery.DeliveryOrderAssemblyackRequest;
//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.pay.PayRefundResponse;
//import cn.freemud.management.enums.ResponseResult;
//import cn.freemud.management.service.OrderManagerService;
//import cn.freemud.management.service.handle.*;
//import cn.freemud.management.thirdparty.DeliveryMCCafeClient;
//import cn.freemud.management.util.ResponseUtil;
//import com.freemud.application.sdk.api.deliverycenter.response.DeliveryResponseDto;
//import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
//import com.freemud.application.sdk.api.ordercenter.enums.AbnormalStateEnum;
//import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
//import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderStatusV1;
//import com.freemud.application.sdk.api.ordercenter.request.SdkUpdateAbnormalState;
//import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
//import com.freemud.sdk.api.assortment.message.enums.OrderType;
//import com.freemud.sdk.api.assortment.order.enums.PayRefundStatus;
//import org.apache.commons.lang.StringUtils;
//import org.springframework.beans.BeanUtils;
//import org.springframework.beans.factory.annotation.Value;
//import org.springframework.stereotype.Service;
//
//import javax.annotation.Resource;
//import java.text.SimpleDateFormat;
//import java.util.Date;
//import java.util.Objects;
//
///**
// * All rights Reserved, Designed By www.freemud.cn
// *
// * @version V1.0
// * @Title: McoffeMangerServiceImpl
// * @Package cn.freemud.management.service.impl
// * @Description:
// * @author: shuhu.hou
// * @date: 2020/8/9 15:26
// * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
// * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
// */
//@Service
//public class McCafeMangerServiceImpl implements OrderManagerService {
// @Resource
// private SaasOrderHandle saasOrderHandle;
// @Resource
// private CouponHandle couponHandle;
// @Resource
// private DeliveryHandle deliveryHandle;
// @Resource
// private PaymentHandle paymentHandle;
// @Resource
// private StockHandle stockHandle;
// @Resource
// private DeliveryMCCafeClient deliveryMCCafeClient;
// @Resource
// private OrderSdkService orderSdkService;
//
// @Value("${mccafe.partner.id}")
// private String macCafePartnerId;
// @Value("${mcCafe.withOrderBuy.cardId}")
// private String macCafeCardId;
//
// @Override
// public BaseResponse<OrderManagerResponse> orderConfirm(OrderManagerRequest request, OrderBeanV1 orderBean) {
// if (orderBean == null) {
// return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
// }
// OrderManagerRequest orderManagerRequest =new OrderManagerRequest();
// BeanUtils.copyProperties(request,orderManagerRequest);
// if (!OrderStatusV1.TAKE_ORDER.getV2Code().equals(orderBean.getStatusV2()) && !OrderStatusV1.RECEIPT.getV2Code().equals(orderBean.getStatusV2())){
// return ResponseUtil.error(ResponseResult.ORDER_STATUS_FAILED);
// }
// if (StringUtils.isNotEmpty(request.getPickUpGoodsNo())){
// //更新取餐码
// BaseResponse baseResponse = saasOrderHandle.updatePickUpGoodNo(request, orderBean);
// if (!ResponseResult.SUCCESS.getCode().equals(baseResponse.getCode())){
// return ResponseUtil.error(ResponseResult.ORDER_UPDATE_PICKUP_FAILED);
// }
// }
// if (OrderStatusV1.TAKE_ORDER.getV2Code().equals(orderBean.getStatusV2())) {
// // 订单接单
// saasOrderHandle.orderConfirm(orderManagerRequest, orderBean);
// }
// if (!Objects.equals(orderBean.getOrderType(), OrderType.TAKE_OUT.getCode())) {
// // 异步核销券码
// couponHandle.asyncVerificationCoupon(orderBean);
// }
// if (StringUtils.isNotEmpty(request.getPickUpGoodsNo())){
//
// if (Objects.equals(orderBean.getOrderType(), OrderType.TAKE_OUT.getCode())) {
// SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
// DeliveryOrderAssemblyackRequest assemblyAckRequest = new DeliveryOrderAssemblyackRequest();
// assemblyAckRequest.setOrderKey(request.getOrderId());
// assemblyAckRequest.setDisplayOrderNumber(request.getPickUpGoodsNo());
// assemblyAckRequest.setAssemblyTimeUTC(dateFormat.format(DateUtil.addHours(new Date(), -8)));
// assemblyAckRequest.setStoreId(orderBean.getShopId());
// //入机成功通知配送
// DeliveryResponseDto deliveryResponse = deliveryMCCafeClient.assemblyAck(assemblyAckRequest);
// if (deliveryResponse == null || !StringUtils.equals(ResponseResult.SUCCESS.getCode(), deliveryResponse.getCode() + "")) {
// return ResponseUtil.error(ResponseResult.DELIVERY_ASSEMBLY_ACK_ERROR);
// }
// }
// }
//
// return ResponseUtil.success();
// }
//
// @Override
// public BaseResponse<OrderManagerResponse> orderReject(OrderManagerRequest request, OrderBeanV1 orderBean) {
// OrderManagerRequest orderManagerRequest =new OrderManagerRequest();
// BeanUtils.copyProperties(request,orderManagerRequest);
// //根据是否是外卖单来判断
// if (Objects.equals(orderBean.getOrderType(), OrderType.TAKE_OUT.getCode())) {
// // 订单接单
// BaseResponse<OrderManagerResponse> orderManagerResponseBaseResponse = orderConfirm(request, orderBean);
// if (ResponseResult.SUCCESS.getCode().equals(orderManagerResponseBaseResponse.getCode())){
// //通知配送服务停单
// deliveryHandle.haltedDelivery(orderBean);
// }
//
// }else {
// //支付退款
// PayRefundResponse refundResponse = paymentHandle.mcCafeRefund(orderManagerRequest, orderBean);
// if(refundResponse.getPayRefundStatus().getCode().equals(PayRefundStatus.SUCCESS.getCode())) {
// //订单拒单
// saasOrderHandle.mcCafeOrderReject(orderManagerRequest, refundResponse, orderBean);
// //冲正库存
// stockHandle.revert(orderManagerRequest, orderBean);
// } else {
// SdkUpdateAbnormalState sdkUpdateAbnormalState = new SdkUpdateAbnormalState();
// sdkUpdateAbnormalState.setOrderCode(request.getOrderId());
// sdkUpdateAbnormalState.setPartnerId(request.getPartnerId());
// sdkUpdateAbnormalState.setAbnormalState(AbnormalStateEnum.ABNORMAL.getCode());
// sdkUpdateAbnormalState.setAbnormalDesc("支付退款失败，订单入机失败回调异常");
// sdkUpdateAbnormalState.setOrderClient(OrderClientType.SAAS.getIndex());
// sdkUpdateAbnormalState.setOperator(request.getOperator());
// orderSdkService.updateAbnormalState(sdkUpdateAbnormalState);
// }
// }
// return ResponseUtil.success();
// }
//
// /**
// * 制作完成
// *
// * @param request
// * @param orderBean
// * @return
// */
// @Override
// public BaseResponse<OrderManagerResponse> orderDone(OrderManagerRequest request, OrderBeanV1 orderBean) {
// // 订单制作完成
// saasOrderHandle.orderDone(request, orderBean);
// return ResponseUtil.success();
// }
//
// /**
// * 订单配送
// *
// * @param request
// * @param orderBean
// * @return
// */
// @Override
// public BaseResponse<OrderManagerResponse> orderDelivery(OrderManagerRequest request, OrderBeanV1 orderBean) {
// // 订单配送
// saasOrderHandle.orderDelivery(request, orderBean);
// return ResponseUtil.success();
// }
//
// /**
// * 订单完成
// *
// * @param request
// * @param orderBean
// * @return
// */
// @Override
// public BaseResponse<OrderManagerResponse> orderAffirm(OrderManagerRequest request, OrderBeanV1 orderBean) {
// // 订单完成
// saasOrderHandle.orderAffirm(request, orderBean);
// return ResponseUtil.success();
// }
//
//
//
// /**
// * 同意退款
// *
// * @param request
// * @param orderBean
// * @return
// */
// @Override
// public BaseResponse<OrderManagerResponse> orderAgreeRefund(OrderManagerRequest request, OrderBeanV1 orderBean) {
// //支付退款
// PayRefundResponse refundResponse = paymentHandle.mcCafeRefund(request, orderBean);
// if(refundResponse.getPayRefundStatus().getCode().equals(PayRefundStatus.SUCCESS.getCode())) {
// //订单拒单
// saasOrderHandle.mcCafeRefundAgree(request, refundResponse, orderBean);
// //冲正库存
// stockHandle.revert(request, orderBean);
// } else {
// SdkUpdateAbnormalState sdkUpdateAbnormalState = new SdkUpdateAbnormalState();
// sdkUpdateAbnormalState.setOrderCode(request.getOrderId());
// sdkUpdateAbnormalState.setPartnerId(request.getPartnerId());
// sdkUpdateAbnormalState.setAbnormalState(AbnormalStateEnum.ABNORMAL.getCode());
// sdkUpdateAbnormalState.setAbnormalDesc("支付退款失败，订单入机失败回调异常");
// sdkUpdateAbnormalState.setOrderClient(OrderClientType.SAAS.getIndex());
// sdkUpdateAbnormalState.setOperator(request.getOperator());
// orderSdkService.updateAbnormalState(sdkUpdateAbnormalState);
// }
// return ResponseUtil.success();
// }
//
// /**
// * 拒绝退款
// *
// * @param request
// * @param orderBean
// * @return
// */
// @Override
// public BaseResponse<OrderManagerResponse> orderRejectRefund(OrderManagerRequest request, OrderBeanV1 orderBean) {
// //拒绝退款
// saasOrderHandle.mcCafeRefundReject(request,orderBean);
// return ResponseUtil.success();
// }
//
//
// /**
// * 商家取消
// */
// @Override
// public BaseResponse<OrderManagerResponse> orderCancel(OrderManagerRequest request, OrderBeanV1 orderBean) {
// //支付退款
// PayRefundResponse refundResponse = paymentHandle.mcCafeRefund(request, orderBean);
// if(refundResponse.getPayRefundStatus().getCode().equals(PayRefundStatus.SUCCESS.getCode())) {
// //订单拒单
// saasOrderHandle.orderCancel(request, refundResponse, orderBean);
// //冲正库存
// stockHandle.revert(request, orderBean);
// } else {
// SdkUpdateAbnormalState sdkUpdateAbnormalState = new SdkUpdateAbnormalState();
// sdkUpdateAbnormalState.setOrderCode(request.getOrderId());
// sdkUpdateAbnormalState.setPartnerId(request.getPartnerId());
// sdkUpdateAbnormalState.setAbnormalState(AbnormalStateEnum.ABNORMAL.getCode());
// sdkUpdateAbnormalState.setAbnormalDesc("支付退款失败，订单入机失败回调异常");
// sdkUpdateAbnormalState.setOrderClient(OrderClientType.SAAS.getIndex());
// sdkUpdateAbnormalState.setOperator(request.getOperator());
// orderSdkService.updateAbnormalState(sdkUpdateAbnormalState);
// }
// return ResponseUtil.success();
// }
//
//}
order-management/src/main/java/cn/freemud/management/service/impl/NewMallOrderMangerServiceImpl.java
......@@ -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.response.order.OrderManagerResponse;
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.handle.ActivityHandle;
import cn.freemud.management.service.handle.MallOrderHandle;
......@@ -11,12 +12,16 @@ import cn.freemud.management.service.handle.PaymentHandle;
import cn.freemud.management.service.handle.StockHandle;
import cn.freemud.management.util.ResponseUtil;
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.enums.AfterSalesStatus;
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.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.service.OrderSdkService;
import com.freemud.sdk.api.assortment.order.enums.PayRefundStatus;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -45,6 +50,8 @@ public class NewMallOrderMangerServiceImpl implements OrderManagerService {
private StockHandle stockHandle;
@Autowired
private ActivityHandle activityHandle;
@Autowired
private OrderSdkService orderSdkService;
/**
* 同意退款
......@@ -67,34 +74,37 @@ public class NewMallOrderMangerServiceImpl implements OrderManagerService {
// 修改售后单状态为退货中
mallOrderHandle.mallOrderAgreeApply(request, orderBean);
} else {
//支付退款
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;
}
}
PayRefundResponse refundResponse = this.payRefundCommon(request, orderBean);
// 退款异常
if (refundResponse.getPayRefundStatus().getCode().compareTo(PayRefundStatus.COMPATIBILITY_STATUS.getCode()) == 0) {
return ResponseUtil.error(refundResponse.getResult());
}
if (cashPay && svcPay) {
refundResponse = paymentHandle.multiRefund(orderBean);
} else {
// OrderExtendedReq ext = orderBean.getOrderExtended();
// if (StringUtils.isNotBlank(ext.getAgentPayerId()) && !Objects.equals(ext.getAgentPayerId(), orderBean.getUserId())) {
// //代付人信息不为空 并且和订单创建人不一样，表示代付单
// refundResponse = paymentHandle.agentPayRefund(orderBean);
// }
refundResponse = paymentHandle.refund(request, orderBean);
// fisherman --> 退款中的状态 阻止后续流程 等待支付回调 不是退款成功 都终止下面的退款流程
if (refundResponse.getPayRefundStatus().getCode().compareTo(PayRefundStatus.SUCCESS.getCode()) != 0) {
return ResponseUtil.error(ResponseResult.REFUND_FAIL_WAIT_CALLBACK);
}
// 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);
//冲正库存
......@@ -129,4 +139,28 @@ public class NewMallOrderMangerServiceImpl implements OrderManagerService {
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
......@@ -207,15 +207,14 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
@Override
public BaseResponse<OrderManagerResponse> orderReject(OrderManagerRequest request, OrderBeanV1 orderBean) {
//支付退款
PayRefundResponse refundResponse;
try {
if (null != orderBean.getOrderPayItem() && orderBean.getOrderPayItem().size() > 0) {
refundResponse = paymentHandle.multiRefund(orderBean);
} else {
refundResponse = paymentHandle.refund(request, orderBean);
}
} catch (OrderServiceException orderEx) { // 爱马哥兼容，不抛错
return ResponseUtil.error(orderEx.getResult());
PayRefundResponse refundResponse = this.payRefundCommon(request,orderBean);
// 退款异常
if (refundResponse.getPayRefundStatus().getCode().compareTo(PayRefundStatus.COMPATIBILITY_STATUS.getCode()) == 0) {
return ResponseUtil.error(refundResponse.getResult());
}
// fisherman --> 退款中的状态 阻止后续流程 等待支付回调 不是退款成功 都终止下面的退款流程
if (refundResponse.getPayRefundStatus().getCode().compareTo(PayRefundStatus.SUCCESS.getCode()) != 0) {
return ResponseUtil.error(ResponseResult.REFUND_FAIL_WAIT_CALLBACK);
}
//订单拒单
saasOrderHandle.orderReject(request, refundResponse, orderBean);
......@@ -240,7 +239,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
//取消配送单
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) {
return ResponseUtil.error(refundResponse.getResult());
......@@ -261,20 +260,20 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
}
/**
* 提出 退款公共代码
* 提取 退款公共代码
*
* @param request
* @param orderBean
* @return
*/
private PayRefundResponse getPayRefundResponse(OrderManagerRequest request, OrderBeanV1 orderBean) {
private PayRefundResponse payRefundCommon(OrderManagerRequest request, OrderBeanV1 orderBean) {
PayRefundResponse refundResponse = paymentHandle.getCommonPayRefundResponse(request, orderBean);
//退款失败记录到订单售后单
if (refundResponse.getPayRefundStatus().getCode().compareTo(PayRefundStatus.SUCCESS.getCode()) != 0) {
//同意退款失败记录到订单售后单
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("退款失败");
refundFailReq.setRefundFailReason("退款失败或退款中，" + refundResponse.getMessage());
refundFailReq.setAfterSalesCode(orderBean.getAfterSalesOrderResp().getAfterSalesCode());
refundFailReq.setOperationClient(request.getAfterSalesApplyClient());
refundFailReq.setOperator(request.getOperator());
......@@ -322,7 +321,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
} else if (OrderSourceV1.POS.getCode().equals(orderBean.getSource())) {
return posCancel(orderBean);
}
return ResponseUtil.success();
return ResponseUtil.error("501","暂不支持");
}
/**
......
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