用户端代码提交

pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java

@@ -670,8 +670,12 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
         if (bo.getIsRefund() == 0) {// 陪诊员订单未完成用户主动退款
             // 主订单必须为付款并且子订单为已接单
             if (totalOrder.getStatus() != 1 && sonOrderSimpleDataByTotalId.getOrderStatus() != 1) {
+                if(totalOrder.getStatus() == 1 && sonOrderSimpleDataByTotalId.getOrderStatus() == 0){
+                    money = totalOrder.getPayMoney();
+                }else {
                     throw new ServiceException("退款出错!");
                 }
+            }
             /**
              *责任归属：用户下单，陪诊人员接单后，客户单方面取消，客户为本次订单负责：
              *
@@ -694,9 +698,9 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
                 money = totalOrder.getPayMoney();
             } else if (totalOrder.getBusinessId() == 0) {// 商城订单
 
-            } else {// 一般陪诊订单
+            } else {
+                // 一般陪诊订单
                 // 一般订单开始服务时间
-
                 String serveTime = orderService.getFinishTime(totalOrder.getBusinessId());
                 if (StringUtils.isNotEmpty(serveTime)) {
                     money = getMoney(serveTime, totalOrder.getPayMoney());// 计算退款金额
@@ -716,6 +720,7 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
             } catch (WxPayException e) {
                 e.printStackTrace();
             }
+
             totalOrder.setRefundAmount(totalOrder.getPayMoney());
         } else if (bo.getIsRefund() == 1) {// 陪诊员订单完成走审批流程
             if (sonOrderSimpleDataByTotalId.getOrderStatus() != 2) {