Merge remote-tracking branch 'origin/dev' into dev

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

@@ -800,12 +800,8 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
         if (IsRefund == 0) {// 陪诊员订单未完成用户主动退款直接退到账户
             // 主订单必须为付款并且子订单为已接单
             if (totalOrder.getStatus() != 1 && sonOrderSimpleDataByTotalId.getOrderStatus() != 1) {
-                if (totalOrder.getStatus() == 1 && sonOrderSimpleDataByTotalId.getOrderStatus() == 0) {
-                    money = totalOrder.getPayMoney();
-                } else {
                 throw new ServiceException("退款出错!");
             }
-            }
             /**
              *责任归属：用户下单，陪诊人员接单后，客户单方面取消，客户为本次订单负责：
              *

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

@@ -266,7 +266,7 @@ public class ZyphOrderServiceImpl implements IZyphOrderService, ISonOrderService
         if (suborder.getStatus() != 1) { // 订单已接单
             throw new ServiceException("子订单不符合开始服务要求");
         }
-        String dateTimeStr = suborder.getStartDay() + " " + suborder.getEndTime();
+        String dateTimeStr = suborder.getStartDay() + " " + suborder.getStartTime();
         Date paseDateTime = null;
         try {
             paseDateTime = DATETIME_FORMAT.parse(dateTimeStr);