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

rk

4 天以前 8c4dfb07d551ceb372887ff8f22bd1f574d0347b

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncParkServiceImpl.java

@@ -1,6 +1,5 @@
package com.doumee.service.business.impl.hksync;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.doumee.config.DataSyncConfig;
import com.doumee.core.constants.ResponseStatus;
@@ -9,12 +8,10 @@
import com.doumee.core.haikang.model.param.BaseListPageResponse;
import com.doumee.core.haikang.model.param.BaseResponse;
import com.doumee.core.haikang.model.param.request.*;
import com.doumee.core.haikang.model.param.respose.AppointmentInfoResponse;
import com.doumee.core.haikang.model.param.respose.ParkCrossRecordInfoResponse;
import com.doumee.core.haikang.model.param.respose.ParkListResponse;
import com.doumee.core.haikang.service.HKService;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DESUtil;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.CarEventMapper;
@@ -70,12 +67,11 @@
        }finally {
            Constants.DEALING_HK_PARKBOOK =false;
        }

    }

    private void dealParkBookBiz(ParkBook c,Date date) {
        try {
            if(Constants.equalsObject(c.getIsdeleted(),Constants.ONE)) {
            if(Constants.equalsInteger(c.getIsdeleted(),Constants.ONE)) {
                //如果取消预约，则进行取消包期
                if(StringUtils.isNotBlank(c.getParkHkId())
                        && StringUtils.isNotBlank(c.getCarCode())){
@@ -104,12 +100,11 @@
        }catch (Exception e){

        }

    }

    @Override
    public  void syncParkBookBySingleModel(ParkBook c) {
                if(Constants.equalsObject(c.getIsdeleted(),Constants.ONE)){
                if(Constants.equalsInteger(c.getIsdeleted(),Constants.ONE)){
                    //如果取消预约，则进行取消包期
                    if(StringUtils.isNotBlank(c.getParkHkId())
                            && StringUtils.isNotBlank(c.getCarCode())){
@@ -138,6 +133,7 @@
                    parkBookMapper.updateById(c);
                }
    }

    private boolean addParkBookHk(ParkBook c) {
        CarChargeAddRequest param = new CarChargeAddRequest();
        param.setPlateNo(c.getCarCode());
@@ -152,13 +148,20 @@
            return  false;
        }
    }
    private boolean cancelParkBookHk(ParkBook c) {







    public static boolean cancelParkBookHk(ParkBook c) {
        CarChargeDelRequest param = new CarChargeDelRequest();
        param.setPlateNo(c.getCarCode());
        param.setParkSyscode(c.getParkHkId());
        BaseResponse response = HKService.carChargeDeletion(param);
        if(response!=null
                && StringUtils.equals(response.getCode(),HKConstants.RESPONSE_SUCCEE)){
                && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
            return true;
        }else{
            return  false;
@@ -228,7 +231,7 @@
                }
            }
            if(addList.size()>0){
                parksMapper.insertBatchSomeColumn(addList);
                parksMapper.insert(addList);
            }
            if(editList.size()>0){
                for(Parks d : editList){
@@ -367,7 +370,7 @@

                    List<CarEvent> sublist = allHkList.subList(startIndex, endIndex);
                    if(sublist.size()>0){
                        carEventMapper.insertBatchSomeColumn(sublist);//插入新数据
                        carEventMapper.insert(sublist);//插入新数据
                    }
                    startIndex = endIndex;
                    endIndex += sublistSize;