Merge branch 'feature/20231008_小助手审核线下订单退款问题修复_wuping' of…

Merge branch 'feature/20231008_小助手审核线下订单退款问题修复_wuping' of https://gitlab.freemud.com/order-group-application/order-group into qa

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

@@ -243,17 +243,8 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
     public BaseResponse<OrderManagerResponse> orderAgreeRefund(OrderManagerRequest request, OrderBeanV1 orderBean) {
         //取消配送单
         deliveryHandle.cancelDelivery(orderBean, request);
-        PayRefundResponse refundResponse;
-        if (PayType.ONLINE_PAY.getCode().equals(orderBean.getPayType())) {
-            //支付退款
-            refundResponse = this.payRefundCommon(request, orderBean);
-        } else {
-            // 线下退款，直接默认为退款成功
-            refundResponse = new PayRefundResponse();
-            refundResponse.setRefundId(UUID.randomUUID().toString().replaceAll("-", ""));
-            refundResponse.setPayRefundStatus(PayRefundStatus.SUCCESS);
-            refundResponse.setMessage(PayRefundStatus.SUCCESS.getDesc());
-        }
+        // 支付退款 包括线上小程序付款的订单，订单宝其他支付方式收款（汇来米，收钱吧，现金，其他）老板通发起退款
+        PayRefundResponse refundResponse = this.payRefundCommon(request, orderBean);
         // 退款异常
         if (refundResponse.getPayRefundStatus().getCode().compareTo(PayRefundStatus.COMPATIBILITY_STATUS.getCode()) == 0) {
             return ResponseUtil.error(refundResponse.getResult());
@@ -282,8 +273,17 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
 
     /**
      * 拒单退款、同意退款、取消订单退款
+     * 小程序点餐订单退款，无单收银退款，订单宝扫码付、其他支付方式收款（汇来米，收钱吧，现金，其他）等有支付流水等退款
      */
     private PayRefundResponse payRefundCommon(OrderManagerRequest request, OrderBeanV1 orderBean) {
+        if (orderBean.getAmount() == 0) {
+            // 0元订单
+            PayRefundResponse refundResponse = new PayRefundResponse();
+            refundResponse.setRefundId(UUID.randomUUID().toString().replaceAll("-", ""));
+            refundResponse.setPayRefundStatus(PayRefundStatus.SUCCESS);
+            refundResponse.setMessage(PayRefundStatus.SUCCESS.getDesc());
+            return refundResponse;
+        }
         PayRefundResponse refundResponse = paymentHandle.getCommonPayRefundResponse(request, orderBean);
         // 同意退款退款失败记录到订单售后单
         if (orderBean.getAfterSalesOrderResp() != null && Objects.equals(PayRefundStatus.FAIL.getCode(), refundResponse.getPayRefundStatus().getCode())) {