Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/doorCoach/PatientDoorCoachOrderService.java
#	svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/lifeCare/LifeCareOrderService.java

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/pay/PayService.java

@@ -200,7 +200,7 @@ public class PayService {
        resJson.put("payTime", DateUtil.dateToStrLong(businessOrderDO.getPayTime()));
        resJson.put("createTime",DateUtil.dateToStrLong(businessOrderDO.getCreateTime()));
        resJson.put("updateTime",DateUtil.dateToStrLong(businessOrderDO.getUpdateTime()));
        long time = (businessOrderDO.getCreateTime().getTime() - System.currentTimeMillis())/1000;
        long time = (businessOrderDO.getCreateTime().getTime() - System.currentTimeMillis())/1000+60*30;
        if(time<0&&status==0){
            cancleOrder(id);
            status = 2;
@@ -459,8 +459,8 @@ public class PayService {
        if (businessOrderDO.getStatus()!=0) {
            return ObjEnvelop.getError("待支付订单才能支付",-1);
        }
        long time = (businessOrderDO.getCreateTime().getTime() - System.currentTimeMillis())/1000;
        if(time<=0){
        long time = (System.currentTimeMillis() - businessOrderDO.getCreateTime().getTime())/1000;
        if(time>=60*30){
            cancleOrder(businessOrderDO.getId());
            return ObjEnvelop.getError("支付超时，订单已关闭",-1);
        }
@@ -537,8 +537,8 @@ public class PayService {
        if (businessOrderDO.getStatus()!=0) {
            return ObjEnvelop.getError("待支付订单才能支付",-1);
        }
        long time = (businessOrderDO.getCreateTime().getTime() - System.currentTimeMillis())/1000;
        if(time<=0){
        long time = (System.currentTimeMillis() - businessOrderDO.getCreateTime().getTime())/1000;
        if(time>=60*30){
            cancleOrder(businessOrderDO.getId());
            return ObjEnvelop.getError("支付超时，订单已关闭",-1);
        }