Merge branch 'dev' of yeshijie/wlyy2.0 into dev

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/doorCoach/PatientDoorCoachOrderService.java

@@ -185,7 +185,7 @@ public class PatientDoorCoachOrderService extends BaseJpaService<BaseDoorCoachOr
        result.put("orderId",orderDO.getId());
        result.put(ResponseContant.resultFlag, ResponseContant.success);
        result.put(ResponseContant.resultMsg, orderDO);
        orderDO.setTotalFee(new BigDecimal(0));
        //新增工单与服务项费用关联关系
        if (orderWithPackageItemFeeAdd(result, jsonObjectParam, orderDO,null)) {return result;}
@@ -278,6 +278,7 @@ public class PatientDoorCoachOrderService extends BaseJpaService<BaseDoorCoachOr
        orderDO.setDispatcherResponseTime(new Date());
        this.save(orderDO);
        result.put("orderId",orderDO.getId());
        orderDO.setTotalFee(new BigDecimal(0));
        //新增工单与服务项费用关联关系
        if (orderWithPackageItemFeeAdd(result, jsonObjectParam, orderDO,doctorCode)) {return result;}
@@ -1071,6 +1072,7 @@ public class PatientDoorCoachOrderService extends BaseJpaService<BaseDoorCoachOr
        if(null == totalFee){
            totalFee = new BigDecimal(0);
        }
        //新增服务项
        int addNum = 0;
        //服务项费用

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/lifeCare/LifeCareOrderService.java

@@ -452,7 +452,7 @@ public class LifeCareOrderService extends BaseJpaService<LifeCareOrderDO, LifeCa
    @Transactional(rollbackFor = Exception.class)
    public JSONObject create(String jsonData,String proxyPatient) {
        logger.info("申请生活照料jsonData参数：" + jsonData);
        proxyPatient = "808080eb78d3ce030178edeb4346002b";
        JSONObject result = new JSONObject();
        JSONObject jsonObjectParam;
        LifeCareOrderDO orderDO = null;
@@ -510,7 +510,7 @@ public class LifeCareOrderService extends BaseJpaService<LifeCareOrderDO, LifeCa
        orderDO.setStatus(1);
        this.save(orderDO);
        result.put("orderId",orderDO.getId());
        orderDO.setTotalFee(new BigDecimal(0));
        //新增工单与服务项费用关联关系
        if (orderWithPackageItemFeeAdd(result, jsonObjectParam, orderDO,null)) {return result;}

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);
        }