jk-GitHub-coder 4 gadi atpakaļ
vecāks
revīzija
fef03516b0

+ 5 - 1
YijiaRestful/src/main/java/com/platform/yijia/controller/PosMachineController.java

@@ -353,7 +353,11 @@ public class PosMachineController {
                 payOrder.setStationId(stationId);
                 PayOrder payOrderInfoMin = payOrderService.getPayOrderInfoMin(payOrder);
                 //没有班结过:第一次班结
-                beginTime =dateFormat.format(payOrderInfoMin.getPayDate());
+                if(payOrderInfoMin !=null && payOrderInfoMin.getPayDate() !=null){
+                    beginTime =dateFormat.format(payOrderInfoMin.getPayDate());
+                }else {
+                    beginTime =dateFormat.format(new Date());
+                }
             }
             //获取上次班结时间
             PayOrder order=new PayOrder();