Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

Administrator

2024-07-29 84182fbb85e7c11194014a8ca9d25a97f4f088e4

 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_98_Down.java

@@ -7,11 +7,9 @@
import com.dy.common.mw.protocol.p206V1_0_0.CommonV1_0_1;
import com.dy.common.mw.protocol.p206V1_0_0.ParseParamsForDownV1_0_1;
import com.dy.common.mw.protocol.p206V1_0_0.ProtocolConstantV206V1_0_0;
import com.dy.common.mw.protocol.p206V1_0_0.downVos.Com97Vo;
import com.dy.common.mw.protocol.p206V1_0_0.downVos.Com98Vo;
import com.dy.common.mw.protocol.p206V1_0_0.parse.global.GlCreate;
import com.dy.common.util.ByteUtil;
import com.dy.common.util.ByteUtilUnsigned;

/**
 * @Author liurunyu
@@ -88,12 +86,15 @@
            throw new Exception("虚拟IC卡编号不能为空") ;
        }

        String[] icCardNoGrp = CommonV1_0_1.dealIcCardNo(cvo.icCardNo) ;
        if(icCardNoGrp[0] != null){
            midRs.param = icCardNoGrp[0] ;
        }
        byte[] bs = new byte[5] ;
        ByteUtil.string2BCD_LE(bs, icCardNoGrp[1], 0) ;
        //String[] icCardNoGrp = CommonV1_0_1.dealIcCardNo(cvo.icCardNo) ;
        //if(icCardNoGrp[0] != null){
        //    midRs.param = icCardNoGrp[0] ;
        //}
        //byte[] bs = new byte[5] ;
        //ByteUtil.string2BCD_LE(bs, icCardNoGrp[1], 0) ;
        byte[] bs = new byte[8] ;
        GlCreate.createIcCardNo(cvo.icCardNo, bs, 0);


        bytes = ByteUtil.bytesMerge(bsHead, bs) ;