Merge branch 'feature/20201015_麦咖啡允许重复申请退款_xukang' into qa

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/OrderRefundRequest.java

@@ -25,6 +25,12 @@ public class OrderRefundRequest extends BaseConfig {
      */
     private Integer orderStatus;
 
+    //    申请金额，单位分，如果是全部退款，并且传递null,则自动填入 订单用户需支付金额"
+    private Long reqAmount = null;
+
+    //    实际金额，单位分，如果是全部退款，并且传递null,则自动填入 订单用户需支付金额"
+    private Long actualAmount = null;
+
     /**
      * 退款备注
      */

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -506,10 +506,10 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         } else {
             request.setOrderClient(OrderClientType.SAAS.getIndex());
         }
-        //实际金额，单位分，如果是全部退款，并且传递null,则自动填入 订单用户需支付金额
-        request.setActualAmount(null);
+        if(orderRefundRequest.getActualAmount() != null)
+        request.setActualAmount(orderRefundRequest.getActualAmount());
         //申请金额，单位分，如果是全部退款，并且传递null,则自动填入 订单用户需支付金额
-        request.setReqAmount(null);
+        request.setReqAmount(orderRefundRequest.getReqAmount());
         //是否有退货货物
         request.setHasCargo(false);
         //传入的售后单类型为：2：售中用户取消 8：售后申请

order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java

@@ -1127,30 +1127,10 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
                 backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus());
             } else if(OldOrderType.TAKE_OUT.getCode().equals(orderBean.getOrderType()) && CancelDeliveryResponseDto.hasCollectMsg.equals(deliveryBaseResponse.getErrmsg())) {
 
-//                CancelOrderRequest cancelOrderRequest = new CancelOrderRequest();
-//                cancelOrderRequest.setPartnerId(orderBean.getCompanyId());
-//                cancelOrderRequest.setStoreId(orderBean.getShopId());
-//                cancelOrderRequest.setOrderId(orderBean.getOid());
-//                cancelOrderRequest.setOrderClient(orderAdapter.getNewOrderClient(orderBean.getSource()));
-//
-//                //传入的售后单类型为：2：售中用户取消 8：售后申请
-//                cancelOrderRequest.setAfterSalesType(AfterSalesType.USER_CANCEL);
-//                cancelOrderRequest.setReason(orderRefundVo.getReason());
-//                cancelOrderRequest.setReqRemark(orderRefundVo.getRemarks());
-//                cancelOrderRequest.setOperator(orderBean.getUserName());
-//                cancelOrderRequest.setTrackingNo(LogTreadLocal.getTrackingNo());
-//                cancelOrderRequest.setRefundDeliveryAmount(isRefundDeliveryFee);
-//                BaseOrderResponse baseResponseDto = orderCenterSdkService.orderCancel(cancelOrderRequest);
-//
-//                if (!RESPONSE_SUCCESS_CODE.equals(baseResponseDto.getErrcode())) {
-//                    return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), baseResponseDto.getErrmsg());
-//                }
-
                 OrderRefundRequest orderRefundRequest = new OrderRefundRequest();
                 orderRefundRequest.setPartnerId(orderBean.getCompanyId());
                 orderRefundRequest.setStoreId(orderBean.getShopId());
                 orderRefundRequest.setOrderId(orderBean.getOid());
-//                orderRefundRequest.setOrderClient(orderAdapter.getNewOrderClient(orderBean.getSource()));
                 orderRefundRequest.setOrderClient(OrderClientType.SAAS.getIndex());
 
                 orderRefundRequest.setAfterSalesType(AfterSalesType.USER_CANCEL);
@@ -1158,6 +1138,8 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
                 orderRefundRequest.setRemark(orderRefundVo.getRemarks());
                 orderRefundRequest.setOperator(orderBean.getUserName());
                 orderRefundRequest.setOrderStatus(orderBean.getStatus());
+                orderRefundRequest.setActualAmount(orderBean.getAmount());
+                orderRefundRequest.setReqAmount(orderBean.getAmount());
 
                 BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderRefund(orderRefundRequest);
                 if (baseOrderResponse == null || baseOrderResponse.getData() == null || !ObjectUtils.equals(ResponseConstant.SUCCESS_RESPONSE_CODE, baseOrderResponse.getErrcode())) {

order-management/src/main/java/cn/freemud/management/service/handle/PaymentHandle.java

@@ -75,6 +75,34 @@ public class PaymentHandle {
         refundStatus=ObjectUtils.equals( PayRefundStatus.SUCCESS.getCode(), orderRefundResponse.getData().getRefundStatus())?PayRefundStatus.SUCCESS:PayRefundStatus.RUNNING;
         return handlePayRefundResponse(refundStatus,orderRefundRequest.getRefundId());
     }
+    /**
+     * 麦咖啡退款
+     * @param request
+     * @param orderBean
+     * @return
+     */
+    public PayRefundResponse mcCafeRefund(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean){
+        PayRefundStatus refundStatus=PayRefundStatus.SUCCESS;
+        OrderRefundRequest orderRefundRequest = paymentSdkAdapter.getOrderRefundRequest(orderBean, new BigDecimal(orderBean.getAmount()));
+        if (ObjectUtils.equals(orderBean.getAmount(), 0L)) {
+            return handlePayRefundResponse(refundStatus,orderRefundRequest.getRefundId());
+        }
+        BaseResponse<OrderRefundResponse> orderRefundResponse;
+        try {
+            orderRefundResponse = standardPaymentService.orderRefund(orderRefundRequest, "");
+        }catch (Exception ex){
+            ErrorLog.errorConvertJson(this.getClass(), "refundError", ex);
+            throw new OrderServiceException(ResponseResult.REFUND_EXCEPTION);
+        }
+        if (orderRefundResponse==null){
+            throw new OrderServiceException(ResponseResult.REFUND_EXCEPTION);
+        }
+        if (ObjectUtils.notEqual(orderRefundResponse.getCode(),SUCCESS)){
+            throw new OrderServiceException(ResponseResult.REFUND_FAIL,orderRefundResponse.getMessage());
+        }
+        refundStatus=ObjectUtils.equals( PayRefundStatus.SUCCESS.getCode(), orderRefundResponse.getData().getRefundStatus())?PayRefundStatus.SUCCESS:PayRefundStatus.RUNNING;
+        return handlePayRefundResponse(refundStatus,orderRefundRequest.getRefundId());
+    }
 
     /**
      * 获取退款金额

order-management/src/main/java/cn/freemud/management/service/impl/McCafeMangerServiceImpl.java

@@ -123,7 +123,7 @@ public class McCafeMangerServiceImpl implements OrderManagerService {
 
         }else {
             //支付退款
-            PayRefundResponse refundResponse = paymentHandle.refund(orderManagerRequest, orderBean);
+            PayRefundResponse refundResponse = paymentHandle.mcCafeRefund(orderManagerRequest, orderBean);
             //订单拒单
             saasOrderHandle.mcCafeOrderReject(orderManagerRequest, refundResponse, orderBean);
             //冲正库存
@@ -186,7 +186,7 @@ public class McCafeMangerServiceImpl implements OrderManagerService {
     @Override
     public BaseResponse<OrderManagerResponse> orderAgreeRefund(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean) {
         //支付退款
-        PayRefundResponse refund = paymentHandle.refund(request, orderBean);
+        PayRefundResponse refund = paymentHandle.mcCafeRefund(request, orderBean);
         //订单拒单
         saasOrderHandle.mcCafeRefundAgree(request,refund, orderBean);
         //冲正库存
@@ -215,7 +215,7 @@ public class McCafeMangerServiceImpl implements OrderManagerService {
     @Override
     public BaseResponse<OrderManagerResponse> orderCancel(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean) {
         //支付退款
-        PayRefundResponse refund = paymentHandle.refund(request, orderBean);
+        PayRefundResponse refund = paymentHandle.mcCafeRefund(request, orderBean);
         //订单拒单
         saasOrderHandle.orderCancel(request,refund, orderBean);
         //冲正库存