diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/VerifyBuyerManageInfoServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/VerifyBuyerManageInfoServiceImpl.java index 23c31060..843b006f 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/VerifyBuyerManageInfoServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/VerifyBuyerManageInfoServiceImpl.java @@ -259,7 +259,8 @@ public class VerifyBuyerManageInfoServiceImpl implements VerifyBuyerManageInfoSe } else { if (!StringUtils.equals(ConfigureConstant.STRING_0, gmfxxtbReq.getCZLX()) && !StringUtils.equals(ConfigureConstant.STRING_1, gmfxxtbReq.getCZLX()) - && !StringUtils.equals(ConfigureConstant.STRING_2, gmfxxtbReq.getCZLX())) { + && !StringUtils.equals(ConfigureConstant.STRING_2, gmfxxtbReq.getCZLX()) + && !StringUtils.equals(ConfigureConstant.STRING_3, gmfxxtbReq.getCZLX())) { Map checkResultMap3 = new HashMap<>(2); checkResultMap3.put(OrderManagementConstant.ERRORCODE, OrderInfoContentEnum.BUYER_MESSAGE_SYNC_CZLX_ERROR_183019.getKey()); checkResultMap3.put(OrderManagementConstant.ERRORMESSAGE, preStr + OrderInfoContentEnum.BUYER_MESSAGE_SYNC_CZLX_ERROR_183019.getMessage()); diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/service/impl/TaxClassCodeServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/service/impl/TaxClassCodeServiceImpl.java index e35a9902..19b7d4da 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/service/impl/TaxClassCodeServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/service/impl/TaxClassCodeServiceImpl.java @@ -78,9 +78,6 @@ public class TaxClassCodeServiceImpl implements TaxClassCodeService { if (StringUtils.isBlank(spmc)) { return null; } - if (StringUtils.isBlank(spmc)) { - return null; - } return taxClassCodeMapper.queryTaxClassCodeEntityBySpmcOrMs(spmc); } diff --git a/order-management-base-service/src/main/resources/mybatis/mapper/TaxClassCodeMapper.xml b/order-management-base-service/src/main/resources/mybatis/mapper/TaxClassCodeMapper.xml index cbf2ae81..c7490f3f 100644 --- a/order-management-base-service/src/main/resources/mybatis/mapper/TaxClassCodeMapper.xml +++ b/order-management-base-service/src/main/resources/mybatis/mapper/TaxClassCodeMapper.xml @@ -122,15 +122,15 @@