优化读卡信息获取

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>thyyxxk</groupId>
     <artifactId>SiMzFeeOprnSystm</artifactId>
-    <version>3.0.3</version>
+    <version>3.0.4</version>
     <name>SiMzFeeOprnSystm</name>
     <description>SiMzFeeOprnSystm</description>
     <properties>

src/main/java/thyyxxk/simzfeeoprnsystm/service/SiMzFeeService.java

@@ -101,15 +101,11 @@ public class SiMzFeeService {
                 regstrtn.setCardSn(out[3]);
             } else if (mdtrtCertType.getCode().equals(MdtrtCertType.ELECTRONIC_VOUCHER.getCode())) {
                 JSONObject qrinfo = JSONObject.parseObject(p.getReadCardResult());
-                String ecToken = qrinfo.getString("ecToken");
-                if (StringUtil.isBlank(ecToken)) {
-                    JSONObject qrdata = qrinfo.getJSONObject("data");
-                    if (null == qrdata) {
-                        return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "获取读卡信息失败！");
-                    }
-                    ecToken = qrdata.getString("ecToken");
+                JSONObject qrdata = qrinfo.getJSONObject("data");
+                if (null != qrdata) {
+                    qrinfo = qrdata;
                 }
-                regstrtn.setMdtrtCertNo(ecToken);
+                regstrtn.setMdtrtCertNo(qrinfo.getString("ecToken"));
             }
         }
 
@@ -700,7 +696,10 @@ public class SiMzFeeService {
             if (mdtrtCertType.getCode().equals(MdtrtCertType.ELECTRONIC_VOUCHER.getCode())) {
                 JSONObject obj = JSONObject.parseObject(param.getReadCardResult());
                 JSONObject qrdata = obj.getJSONObject("data");
-                String admdvs = qrdata.getString("insuOrg");
+                if (null != qrdata) {
+                    obj = qrdata;
+                }
+                String admdvs = obj.getString("insuOrg");
                 if (StringUtil.isBlank(mzptnt.getInsuplcAdmdvs())) {
                     mzptnt.setInsuplcAdmdvs(admdvs);
                 }