diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java index 84bad887..f501084d 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java +++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.dxhy.base.entity.BaseReturnData; import com.dxhy.base.entity.BaseReturnEntity; import com.dxhy.base.entity.BaseTDxRecordInvoice; import com.dxhy.base.model.BaseDrgxReqVO; @@ -964,7 +965,8 @@ public class BaseInvoiceController extends AbstractController { pramsMap.put("companyCode",companyCode); } String sgrzzngxcx = baseInvoiceManualCheckService.inTellingCheck(map); - String encode = Base64.decodeStr(sgrzzngxcx); + BaseReturnData baseReturnData = JSON.parseObject(sgrzzngxcx, BaseReturnData.class); + String encode = Base64.decodeStr(baseReturnData.getData()); BaseReturnEntity baseReturnEntity = JSON.parseObject(encode, BaseReturnEntity.class); List dataList = baseReturnEntity.getDataList(); StringBuilder uuids = new StringBuilder(); diff --git a/dxhy-base/src/main/java/com/dxhy/base/entity/BaseReturnData.java b/dxhy-base/src/main/java/com/dxhy/base/entity/BaseReturnData.java new file mode 100644 index 00000000..ba20bb90 --- /dev/null +++ b/dxhy-base/src/main/java/com/dxhy/base/entity/BaseReturnData.java @@ -0,0 +1,16 @@ +package com.dxhy.base.entity; + +import lombok.Data; + +@Data +@SuppressWarnings("AlibabaClassNamingShouldBeCamel") +public class BaseReturnData { + + private static final long serialVersionUID = -2166713217995969349L; + + private String code; + + private String data; + + private String message; +}