1.修改升单和退款处理逻辑

fhx

2023-12-18 b18c22d3f1e8dc31489585196f87010c1904d30a

 phi_platform_user/src/main/java/com/hx/phip/service/order/impl/OrderRefundServiceImpl.java

@@ -1370,6 +1370,10 @@
            }
        }

        if(orderRefundDto.getIsThirdPartyRefund() != null){
            cancelOrder.setIsThirdPartyRefund(orderRefundDto.getIsThirdPartyRefund());
        }

        cancelOrder.setIsApproval(orderRefundDto.getIsApproval());
        cancelOrder.setIsRefund(orderRefundDto.getIsRefund());
        cancelOrder.setPlatformSource(orderRefundDto.getPlatformSource());
@@ -1790,7 +1794,7 @@
        if(CancelOrderDto.HIS_ASSISTANT.equals(cancelOrder.getPlatformSource())){
            //如果是his自动处理退款单原路退回
            //CRM的操作也在这里
            hisAssistantNoteList(ordersTotal,refundRecord,operationId,orderNodeBuilder);
            hisAssistantNoteList(ordersTotal,refundRecord,operationId,orderNodeBuilder, cancelOrder.getIsThirdPartyRefund());
        }

        //撤销【保妥适会员】标签
@@ -1801,7 +1805,8 @@
    /**
     * his助手原路退回退款单
     */
    public void hisAssistantNoteList(OrdersTotal ordersTotal,RefundRecord refundRecord,String operationId,StringBuilder orderNodeBuilder){
    public void hisAssistantNoteList(OrdersTotal ordersTotal,RefundRecord refundRecord,String operationId
            ,StringBuilder orderNodeBuilder, Integer isThirdPartyRefund){
        OrderRefundNoteListDto orderRefundNoteListDto=new OrderRefundNoteListDto();
        orderRefundNoteListDto.setOperationId(operationId);
        orderRefundNoteListDto.setOrderId(ordersTotal.getId());
@@ -1840,8 +1845,8 @@
            orderRefundNoteDto.setRefundName(refundRecordMethod.getRefundName());

            orderRefundModelList.add(orderRefundNoteDto);
            //是现金
            if(refundRecordMethod.getIsMoneyPay().equals(BaseEntity.YES)){
            //是现金 && 是第三方退款
            if(refundRecordMethod.getIsMoneyPay().equals(BaseEntity.YES) && isThirdPartyRefund == BaseEntity.YES){
                orderRefundNoteDtos.add(orderRefundNoteDto);
            }