diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/OrderRabbitmqConfig.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/BaseOrderRabbitmqConfig.java similarity index 96% rename from order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/OrderRabbitmqConfig.java rename to order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/BaseOrderRabbitmqConfig.java index d1fc4b8c..bd51b7fd 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/OrderRabbitmqConfig.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/BaseOrderRabbitmqConfig.java @@ -17,7 +17,7 @@ import org.springframework.context.annotation.Configuration; @Configuration @ConfigurationProperties(prefix = "order.rabbitmq") @RefreshScope -public class OrderRabbitmqConfig { +public class BaseOrderRabbitmqConfig { /** * rabbitMq自动创建队列方式 diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/BaseSwaggerConfig.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/BaseSwaggerConfig.java new file mode 100644 index 00000000..b7fa9368 --- /dev/null +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/BaseSwaggerConfig.java @@ -0,0 +1,55 @@ +//package com.dxhy.order.baseservice.config; +// +//import org.springframework.context.annotation.Bean; +//import org.springframework.context.annotation.Configuration; +//import org.springframework.web.context.request.async.DeferredResult; +//import springfox.documentation.builders.ApiInfoBuilder; +//import springfox.documentation.service.ApiInfo; +//import springfox.documentation.spi.DocumentationType; +//import springfox.documentation.spring.web.plugins.Docket; +//import springfox.documentation.swagger2.annotations.EnableSwagger2; +// +//import static springfox.documentation.builders.PathSelectors.regex; +// +///** +// * swagger配置 +// * 1.全局配置,所有订单相关的,大而全的东西 +// * 2.订单相关配置 +// * 3.发票相关配置 +// * 4.税控底层相关配置 +// * +// * @author ZSC-DXHY +// */ +//@Configuration +//@EnableSwagger2 +//public class BaseSwaggerConfig { +// +// +// @Bean +// public Docket simsOrderSwagger() { +// return new Docket(DocumentationType.SWAGGER_2) +// .groupName("base-service-swagger") +// .genericModelSubstitutes(DeferredResult.class) +// .useDefaultResponseMessages(false) +// .forCodeGeneration(true) +// // base，最终调用接口后会和paths拼接在一起 +// .pathMapping("/") +// .select() +// .paths(regex("/.*")) +// .build() +// .apiInfo(apiInfo()); +// } +// +// private ApiInfo apiInfo() { +// // 大标题 +// return new ApiInfoBuilder().title("销项基础服务") +// // 详细描述 +// .description("基础服务系统") +// // 版本 +// .version("1.0") +// // 作者 +//// .contact(new Contact("chengyafu", "", "chengyafu@ele-cloud.com")) +// .build(); +// } +// +//} diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/XxlJobConfig.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/BaseXxlJobConfig.java similarity index 98% rename from order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/XxlJobConfig.java rename to order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/BaseXxlJobConfig.java index e2fc8029..6ad99acb 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/XxlJobConfig.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/BaseXxlJobConfig.java @@ -17,7 +17,7 @@ import org.springframework.context.annotation.Configuration; @ComponentScan(basePackages = "com.dxhy.order.baseservice.job") @Slf4j @RefreshScope -public class XxlJobConfig { +public class BaseXxlJobConfig { @Value("${xxl.job.admin.addresses}") private String adminAddresses; diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/SwaggerConfig.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/SwaggerConfig.java deleted file mode 100644 index 35144709..00000000 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/SwaggerConfig.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.dxhy.order.baseservice.config; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.context.request.async.DeferredResult; -import springfox.documentation.builders.ApiInfoBuilder; -import springfox.documentation.service.ApiInfo; -import springfox.documentation.spi.DocumentationType; -import springfox.documentation.spring.web.plugins.Docket; -import springfox.documentation.swagger2.annotations.EnableSwagger2; - -import static springfox.documentation.builders.PathSelectors.regex; - -/** - * swagger配置 - * 1.全局配置,所有订单相关的,大而全的东西 - * 2.订单相关配置 - * 3.发票相关配置 - * 4.税控底层相关配置 - * - * @author ZSC-DXHY - */ -@Configuration -@EnableSwagger2 -public class SwaggerConfig { - - - @Bean - public Docket simsOrderSwagger() { - return new Docket(DocumentationType.SWAGGER_2) - .groupName("base-service-swagger") - .genericModelSubstitutes(DeferredResult.class) - .useDefaultResponseMessages(false) - .forCodeGeneration(true) - // base，最终调用接口后会和paths拼接在一起 - .pathMapping("/") - .select() - .paths(regex("/.*")) - .build() - .apiInfo(apiInfo()); - } - - private ApiInfo apiInfo() { - // 大标题 - return new ApiInfoBuilder().title("销项基础服务") - // 详细描述 - .description("基础服务系统") - // 版本 - .version("1.0") - // 作者 -// .contact(new Contact("chengyafu", "", "chengyafu@ele-cloud.com")) - .build(); - } - -} diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/job/YpyjTask.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/job/YpyjTask.java index b8d9457b..47352458 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/job/YpyjTask.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/job/YpyjTask.java @@ -14,7 +14,7 @@ import com.dxhy.order.utils.NsrsbhUtils; import com.dxhy.order.baseservice.config.BaseServiceConfig; import com.dxhy.order.baseservice.module.base.model.InvoiceWarningInfo; import com.dxhy.order.baseservice.module.base.service.YpWarningService; -import com.dxhy.order.baseservice.module.thirdservice.email.service.EmailService; +import com.dxhy.order.baseservice.module.thirdservice.email.service.BaseEmailService; import com.dxhy.order.baseservice.module.thirdservice.itaxmsg.service.ItaxMsgService; import com.dxhy.order.baseservice.module.thirdservice.simsback.service.SimsBackService; import com.dxhy.order.baseservice.utils.HttpInvoiceRequestUtil; @@ -51,7 +51,7 @@ public class YpyjTask extends IJobHandler { @Resource private ItaxMsgService itaxMsgService; @Resource - private EmailService emailService; + private BaseEmailService emailService; @Resource private SimsBackService simsBackService; @Resource diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/dao/InvoiceWarningInfoMapper.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/dao/BaseInvoiceWarningInfoMapper.java similarity index 95% rename from order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/dao/InvoiceWarningInfoMapper.java rename to order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/dao/BaseInvoiceWarningInfoMapper.java index 35e26a9a..71d9856b 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/dao/InvoiceWarningInfoMapper.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/dao/BaseInvoiceWarningInfoMapper.java @@ -11,7 +11,7 @@ import java.util.List; * @author ZSC-DXHY * @date 创建时间: 2020-08-14 11:32 */ -public interface InvoiceWarningInfoMapper { +public interface BaseInvoiceWarningInfoMapper { /** * 新增发票预警数据 diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/dao/PushInfoMapper.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/dao/BasePushInfoMapper.java similarity index 97% rename from order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/dao/PushInfoMapper.java rename to order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/dao/BasePushInfoMapper.java index b40904a4..bc9a3371 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/dao/PushInfoMapper.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/dao/BasePushInfoMapper.java @@ -12,7 +12,7 @@ import java.util.Map; * @author ZSC-DXHY * @date 创建时间: 2020-08-14 11:53 */ -public interface PushInfoMapper { +public interface BasePushInfoMapper { /** * 根据条件查询 diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/service/PushInfoService.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/service/BasePushInfoService.java similarity index 95% rename from order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/service/PushInfoService.java rename to order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/service/BasePushInfoService.java index e615524f..5c853317 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/service/PushInfoService.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/service/BasePushInfoService.java @@ -10,7 +10,7 @@ import java.util.List; * @Description ：推送业务api类 * @date ：2018年10月17日 下午6:01:48 */ -public interface PushInfoService { +public interface BasePushInfoService { /** * 推送地址配置列表 diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/service/impl/AuthenticationServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/service/impl/AuthenticationServiceImpl.java index bdb7ec85..3058b48e 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/service/impl/AuthenticationServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/service/impl/AuthenticationServiceImpl.java @@ -3,7 +3,7 @@ package com.dxhy.order.baseservice.module.base.service.impl; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.RandomUtil; import com.dxhy.order.baseservice.module.base.dao.AuthenticationInfoMapper; -import com.dxhy.order.baseservice.module.base.dao.PushInfoMapper; +import com.dxhy.order.baseservice.module.base.dao.BasePushInfoMapper; import com.dxhy.order.baseservice.module.base.model.AuthenticationInfo; import com.dxhy.order.baseservice.module.base.model.InterfaceConfigDetail; import com.dxhy.order.baseservice.module.base.model.PushInfo; @@ -43,7 +43,7 @@ public class AuthenticationServiceImpl implements AuthenticationService { AuthenticationInfoMapper authenticationInfoMapper; @Resource - PushInfoMapper pushInfoMapper; + BasePushInfoMapper basePushInfoMapper; @Resource private BaseService baseService; @@ -119,7 +119,7 @@ public class AuthenticationServiceImpl implements AuthenticationService { interfaceType.add(OrderInfoEnum.INTERFACE_TYPE_INVOICE_PUSH_STATUS_9.getKey()); queryMap.put("interfaceType", interfaceType); queryMap.put("status", "0"); - pushInfos = pushInfoMapper.queryPushInfoListByMap(queryMap, shList); + pushInfos = basePushInfoMapper.queryPushInfoListByMap(queryMap, shList); } @@ -139,7 +139,7 @@ public class AuthenticationServiceImpl implements AuthenticationService { Map> pushInfoMap = new HashMap<>(100); PushInfo pushInfo = new PushInfo(); pushInfo.setStatus(ConfigureConstant.STRING_0); - List pushInfoList = pushInfoMapper.queryPushInfoList(pushInfo, shList); + List pushInfoList = basePushInfoMapper.queryPushInfoList(pushInfo, shList); if (ObjectUtil.isNotEmpty(pushInfoList)) { for (PushInfo info : pushInfoList) { List resultList = pushInfoMap.get(info.getNsrsbh()); @@ -407,10 +407,10 @@ public class AuthenticationServiceImpl implements AuthenticationService { //批量删除税号推送数据,然后批量插入税号数据添加事物 if (ObjectUtil.isNotEmpty(resultShList)) { - pushInfoMapper.deletePushInfoByShList(resultShList); + basePushInfoMapper.deletePushInfoByShList(resultShList); } if (ObjectUtil.isNotEmpty(pushInfoList)) { - pushInfoMapper.insertPushInfoByList(pushInfoList); + basePushInfoMapper.insertPushInfoByList(pushInfoList); } } diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/service/impl/PushInfoServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/service/impl/BaseBasePushInfoServiceImpl.java similarity index 62% rename from order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/service/impl/PushInfoServiceImpl.java rename to order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/service/impl/BaseBasePushInfoServiceImpl.java index 32081e05..7dd07a1c 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/service/impl/PushInfoServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/service/impl/BaseBasePushInfoServiceImpl.java @@ -1,8 +1,8 @@ package com.dxhy.order.baseservice.module.base.service.impl; -import com.dxhy.order.baseservice.module.base.dao.PushInfoMapper; +import com.dxhy.order.baseservice.module.base.dao.BasePushInfoMapper; import com.dxhy.order.baseservice.module.base.model.PushInfo; -import com.dxhy.order.baseservice.module.base.service.PushInfoService; +import com.dxhy.order.baseservice.module.base.service.BasePushInfoService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -20,32 +20,32 @@ import java.util.List; @SuppressWarnings("AlibabaMethodTooLong") @Service @Slf4j -public class PushInfoServiceImpl implements PushInfoService { +public class BaseBasePushInfoServiceImpl implements BasePushInfoService { private static final String LOGGER_MSG = "(推送实现类)"; @Resource - private PushInfoMapper pushInfoMapper; + private BasePushInfoMapper basePushInfoMapper; @Override public List queryPushInfoList(PushInfo pushInfo, List shList) { - return pushInfoMapper.queryPushInfoList(pushInfo, shList); + return basePushInfoMapper.queryPushInfoList(pushInfo, shList); } @Override public PushInfo queryPushInfo(PushInfo pushInfo) { - return pushInfoMapper.selectByPushInfo(pushInfo); + return basePushInfoMapper.selectByPushInfo(pushInfo); } @Override public int updatePushInfo(PushInfo pushInfo) { - return pushInfoMapper.updateByPrimaryKeySelective(pushInfo); + return basePushInfoMapper.updateByPrimaryKeySelective(pushInfo); } @Override public int addPushInfo(PushInfo insertPushInfo) { - return pushInfoMapper.insertSelective(insertPushInfo); + return basePushInfoMapper.insertSelective(insertPushInfo); } } diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/service/impl/EnterpriseConfigServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/service/impl/EnterpriseConfigServiceImpl.java index ec6708ef..0d24d75f 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/service/impl/EnterpriseConfigServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/service/impl/EnterpriseConfigServiceImpl.java @@ -14,7 +14,7 @@ import com.dxhy.order.baseservice.module.base.model.InterfaceConfigDetail; import com.dxhy.order.baseservice.module.base.model.PushInfo; import com.dxhy.order.baseservice.module.base.service.AuthenticationService; import com.dxhy.order.baseservice.module.base.service.EnterpriseConfigService; -import com.dxhy.order.baseservice.module.base.service.PushInfoService; +import com.dxhy.order.baseservice.module.base.service.BasePushInfoService; import com.dxhy.order.baseservice.module.thirdservice.simsback.service.SimsBackService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -44,7 +44,7 @@ public class EnterpriseConfigServiceImpl implements EnterpriseConfigService { private AuthenticationService authenticationService; @Resource - private PushInfoService pushInfoService; + private BasePushInfoService pushInfoService; @Resource private BaseServiceConfig baseServiceConfig; diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/service/impl/YpWarningServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/service/impl/YpWarningServiceImpl.java index 62295f31..eb3a69ee 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/service/impl/YpWarningServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/service/impl/YpWarningServiceImpl.java @@ -5,7 +5,7 @@ import com.dxhy.order.model.PageUtils; import com.dxhy.order.model.R; import com.dxhy.order.utils.JsonUtils; import com.dxhy.order.utils.NsrsbhUtils; -import com.dxhy.order.baseservice.module.base.dao.InvoiceWarningInfoMapper; +import com.dxhy.order.baseservice.module.base.dao.BaseInvoiceWarningInfoMapper; import com.dxhy.order.baseservice.module.base.model.Fpzldm; import com.dxhy.order.baseservice.module.base.model.InvoiceWarningInfo; import com.dxhy.order.baseservice.module.base.model.YpYjFront; @@ -33,7 +33,7 @@ public class YpWarningServiceImpl implements YpWarningService { private final static String LOGGER_MSG = "(余票预警实现类)"; @Resource - private InvoiceWarningInfoMapper invoiceWarningInfoMapper; + private BaseInvoiceWarningInfoMapper baseInvoiceWarningInfoMapper; @Resource private BaseService baseService; @@ -48,7 +48,7 @@ public class YpWarningServiceImpl implements YpWarningService { @Override public List selectYpWarning(InvoiceWarningInfo invoiceWarningInfo, List shList, List entList) { log.info("{}余票预警列表查询 参数 {}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(invoiceWarningInfo)); - return invoiceWarningInfoMapper.selectYpWarning(invoiceWarningInfo, shList, entList); + return baseInvoiceWarningInfoMapper.selectYpWarning(invoiceWarningInfo, shList, entList); } @Override @@ -56,7 +56,7 @@ public class YpWarningServiceImpl implements YpWarningService { log.info("查询纸电票传入参数为{}", JsonUtils.getInstance().toJsonString(invoiceWarningInfo)); //这里前端从1开始需要进行-1操作 PageHelper.startPage(currPage, pageSize); - List list = invoiceWarningInfoMapper.selectYpWarning(invoiceWarningInfo, shList, entList); + List list = baseInvoiceWarningInfoMapper.selectYpWarning(invoiceWarningInfo, shList, entList); PageInfo pageInfo = new PageInfo<>(list); return new PageUtils(pageInfo.getList(), (int) pageInfo.getTotal(), pageInfo.getPageSize(), pageInfo.getPageNum()); } @@ -79,7 +79,7 @@ public class YpWarningServiceImpl implements YpWarningService { invoiceWarningInfo.setFpzlDm(fpzldm.getFpzldm()); invoiceWarningInfo.setXhfNsrsbh(ypYjFront.getXhfNsrsbh()); - List invoiceWarningInfos = invoiceWarningInfoMapper.selectYpWarning(invoiceWarningInfo, shList, entList1); + List invoiceWarningInfos = baseInvoiceWarningInfoMapper.selectYpWarning(invoiceWarningInfo, shList, entList1); invoiceWarningInfo.setXhfMc(ypYjFront.getXhfMc()); invoiceWarningInfo.setSbMc(fpzldm.getSbMc()); invoiceWarningInfo.setYjfs(fpzldm.getYjfs()); @@ -94,12 +94,12 @@ public class YpWarningServiceImpl implements YpWarningService { invoiceWarningInfo.setEntId(ypYjFront.getEntId()); if (invoiceWarningInfos != null && invoiceWarningInfos.size() > 0) { invoiceWarningInfo.setId(invoiceWarningInfos.get(0).getId()); - int i = invoiceWarningInfoMapper.updateYpWarnInfo(invoiceWarningInfo, shList); + int i = baseInvoiceWarningInfoMapper.updateYpWarnInfo(invoiceWarningInfo, shList); log.info("{}保存余票预警信息 更新结果 {}", LOGGER_MSG, i); } else { invoiceWarningInfo.setId(baseService.getGenerateShotKey()); invoiceWarningInfo.setDeleteStatus(ConfigureConstant.STRING_0); - int i = invoiceWarningInfoMapper.insertInvoiceWarning(invoiceWarningInfo); + int i = baseInvoiceWarningInfoMapper.insertInvoiceWarning(invoiceWarningInfo); log.info("{}保存余票预警信息 更新结果 {}", LOGGER_MSG, i); } @@ -111,7 +111,7 @@ public class YpWarningServiceImpl implements YpWarningService { @Override public int updateYpWarnInfo(InvoiceWarningInfo invoiceWarningInfo, List shList) { - return invoiceWarningInfoMapper.updateYpWarnInfo(invoiceWarningInfo, shList); + return baseInvoiceWarningInfoMapper.updateYpWarnInfo(invoiceWarningInfo, shList); } } diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/email/service/EmailService.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/email/service/BaseEmailService.java similarity index 93% rename from order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/email/service/EmailService.java rename to order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/email/service/BaseEmailService.java index fbc9b658..d492cfb5 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/email/service/EmailService.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/email/service/BaseEmailService.java @@ -7,7 +7,7 @@ package com.dxhy.order.baseservice.module.thirdservice.email.service; * @date ：2019年3月7日 下午2:59:31 */ -public interface EmailService { +public interface BaseEmailService { /** * 余票预警 diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/email/service/impl/EmailServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/email/service/impl/BaseBaseEmailServiceImpl.java similarity index 98% rename from order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/email/service/impl/EmailServiceImpl.java rename to order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/email/service/impl/BaseBaseEmailServiceImpl.java index 99ea9661..5d17f386 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/email/service/impl/EmailServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/email/service/impl/BaseBaseEmailServiceImpl.java @@ -11,7 +11,7 @@ import com.dxhy.order.utils.JsonUtils; import com.dxhy.order.baseservice.config.BaseServiceConfig; import com.dxhy.order.baseservice.module.thirdservice.email.model.Attachments; import com.dxhy.order.baseservice.module.thirdservice.email.model.EmailContent; -import com.dxhy.order.baseservice.module.thirdservice.email.service.EmailService; +import com.dxhy.order.baseservice.module.thirdservice.email.service.BaseEmailService; import com.dxhy.order.baseservice.module.thirdservice.openapi.service.OpenApiService; import com.dxhy.base.sms.utils.MessageSenderUtil; import com.dxhy.base.sms.vo.AttachmentVo; @@ -33,7 +33,7 @@ import java.util.*; */ @Service @Slf4j -public class EmailServiceImpl implements EmailService { +public class BaseBaseEmailServiceImpl implements BaseEmailService { private static final String LOGGER_MSG = "(发送邮件业务)"; /** diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/rabbitmq/service/impl/RabbitMqSendMessageServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/rabbitmq/service/impl/RabbitMqSendMessageServiceImpl.java index 113fd5c5..cf720eef 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/rabbitmq/service/impl/RabbitMqSendMessageServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/rabbitmq/service/impl/RabbitMqSendMessageServiceImpl.java @@ -6,7 +6,7 @@ import cn.hutool.core.util.RandomUtil; import com.dxhy.base.rabbitmq.rabbit.config.RabbitConfig; import com.dxhy.base.rabbitmq.rabbitplugin.core.QueueDeclare; import com.dxhy.order.baseservice.config.BaseServiceConfig; -import com.dxhy.order.baseservice.config.OrderRabbitmqConfig; +import com.dxhy.order.baseservice.config.BaseOrderRabbitmqConfig; import com.dxhy.order.baseservice.module.base.dao.SysNsrQueueMapper; import com.dxhy.order.baseservice.module.base.model.PageRabbitQueue; import com.dxhy.order.baseservice.module.base.model.SysQdQueueConfig; @@ -62,7 +62,7 @@ public class RabbitMqSendMessageServiceImpl implements RabbitMqSendMessageServic private BaseService baseService; @Resource - private OrderRabbitmqConfig orderRabbitmqConfig; + private BaseOrderRabbitmqConfig baseOrderRabbitmqConfig; @Resource private SimsBackService simsBackService; @@ -311,7 +311,7 @@ public class RabbitMqSendMessageServiceImpl implements RabbitMqSendMessageServic */ private String getQueueName(String nsrsbh, String entId) { String queueName = nsrsbh; - if (ConfigureConstant.STRING_1.equals(orderRabbitmqConfig.getRabbitMqQueueType())) { + if (ConfigureConstant.STRING_1.equals(baseOrderRabbitmqConfig.getRabbitMqQueueType())) { /** * 读取数据库缓存,判断税号是否配置过指定队列,如果配置需要使用指定配置 * 如果税号未配置,使用渠道去查询,是否按照渠道配置队列,如果按照渠道队列,使用渠道队列数据 @@ -369,7 +369,7 @@ public class RabbitMqSendMessageServiceImpl implements RabbitMqSendMessageServic */ int random = ConfigureConstant.INT_10; try { - random = RandomUtil.randomInt(Integer.parseInt(orderRabbitmqConfig.getMaxRabbitMqQueue())); + random = RandomUtil.randomInt(Integer.parseInt(baseOrderRabbitmqConfig.getMaxRabbitMqQueue())); } catch (NumberFormatException e) { log.error("{}消息数据存入队列,获取随机数异常,使用默认值", LOGGER_MSG); } diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/openapi/api/BaseServiceApiForKfpt.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/openapi/api/BaseServiceApiForKfpt.java index 89648b20..0a960cef 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/openapi/api/BaseServiceApiForKfpt.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/openapi/api/BaseServiceApiForKfpt.java @@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletRequest; * @author ZSC-DXHY * @date 创建时间: 2023-01-10 10:04 */ -@RestController +//@RestController @Slf4j @Api(value = "基础服务对接开放平台", tags = {"基础服务接口模块"}) public class BaseServiceApiForKfpt { diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/openapi/service/CommonDisposeService.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/openapi/service/BaseCommonDisposeService.java similarity index 87% rename from order-management-base-service/src/main/java/com/dxhy/order/baseservice/openapi/service/CommonDisposeService.java rename to order-management-base-service/src/main/java/com/dxhy/order/baseservice/openapi/service/BaseCommonDisposeService.java index d306ef31..1b601938 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/openapi/service/CommonDisposeService.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/openapi/service/BaseCommonDisposeService.java @@ -5,7 +5,7 @@ package com.dxhy.order.baseservice.openapi.service; * * @author ZSC-DXHY */ -public interface CommonDisposeService { +public interface BaseCommonDisposeService { /** diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/openapi/service/impl/CommonDisposeServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/openapi/service/impl/BaseBaseCommonDisposeServiceImpl.java similarity index 93% rename from order-management-base-service/src/main/java/com/dxhy/order/baseservice/openapi/service/impl/CommonDisposeServiceImpl.java rename to order-management-base-service/src/main/java/com/dxhy/order/baseservice/openapi/service/impl/BaseBaseCommonDisposeServiceImpl.java index 3945f3d3..51f045c0 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/openapi/service/impl/CommonDisposeServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/openapi/service/impl/BaseBaseCommonDisposeServiceImpl.java @@ -4,7 +4,7 @@ import com.dxhy.order.constant.RedisConstant; import com.dxhy.order.baseservice.module.base.model.AuthenticationInfo; import com.dxhy.order.baseservice.module.base.service.AuthenticationService; import com.dxhy.order.baseservice.module.thirdservice.redis.service.RedisService; -import com.dxhy.order.baseservice.openapi.service.CommonDisposeService; +import com.dxhy.order.baseservice.openapi.service.BaseCommonDisposeService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -19,7 +19,7 @@ import java.util.List; */ @Service @Slf4j -public class CommonDisposeServiceImpl implements CommonDisposeService { +public class BaseBaseCommonDisposeServiceImpl implements BaseCommonDisposeService { private static final String LOGGER_MSG = "(加解密接口)"; diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/openapi/service/impl/InterfaceServiceForKfptImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/openapi/service/impl/InterfaceServiceForKfptImpl.java index 7f09526a..dab24edb 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/openapi/service/impl/InterfaceServiceForKfptImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/openapi/service/impl/InterfaceServiceForKfptImpl.java @@ -29,7 +29,7 @@ import com.dxhy.order.baseservice.openapi.protocol.spxx.SpxxBO; import com.dxhy.order.baseservice.openapi.protocol.spxx.SpxxcxRspBO; import com.dxhy.order.baseservice.openapi.protocol.spxx.SpxxtbReqBO; import com.dxhy.order.baseservice.openapi.protocol.spxx.SpxxtbRspBO; -import com.dxhy.order.baseservice.openapi.service.CommonDisposeService; +import com.dxhy.order.baseservice.openapi.service.BaseCommonDisposeService; import com.dxhy.order.baseservice.openapi.service.InterfaceServiceForKfpt; import com.dxhy.order.baseservice.utils.BaseServiceBeanTransitionUtils; import lombok.extern.slf4j.Slf4j; @@ -70,7 +70,7 @@ public class InterfaceServiceForKfptImpl implements InterfaceServiceForKfpt { private VerifyBuyerManageInfoService verifyBuyerManageInfoService; @Resource - private CommonDisposeService commonDisposeService; + private BaseCommonDisposeService baseCommonDisposeService; @Resource private EnterpriseConfigService enterpriseConfigService; @@ -154,7 +154,7 @@ public class InterfaceServiceForKfptImpl implements InterfaceServiceForKfpt { * 1.校验当前税号secretId和数据库维护的数据是否一致 */ if (StringUtils.isNotBlank(secretId)) { - String dbSecretId = commonDisposeService.getAuthMap(spxxcxReq.getXHFSBH()); + String dbSecretId = baseCommonDisposeService.getAuthMap(spxxcxReq.getXHFSBH()); if (!secretId.equals(dbSecretId)) { log.error("{}请求税号与企业维护secretId不一致!", LOGGER_MSG); spxxcxRsp.setZTDM(OrderInfoContentEnum.COMMODITY_MESSAGE_QUERY_NULL.getKey()); @@ -245,7 +245,7 @@ public class InterfaceServiceForKfptImpl implements InterfaceServiceForKfpt { * 1.校验当前税号secretId和数据库维护的数据是否一致 */ if (StringUtils.isNotBlank(secretId)) { - String dbSecretId = commonDisposeService.getAuthMap(spxxtbRsp.getXHFSBH()); + String dbSecretId = baseCommonDisposeService.getAuthMap(spxxtbRsp.getXHFSBH()); if (!secretId.equals(dbSecretId)) { log.error("{}请求税号与企业维护secretId不一致!", LOGGER_MSG); spxxtbRsp.setZTDM(OrderInfoContentEnum.COMMODITY_MESSAGE_SYNC_NULL2.getKey()); @@ -294,7 +294,7 @@ public class InterfaceServiceForKfptImpl implements InterfaceServiceForKfpt { * 1.校验当前税号secretId和数据库维护的数据是否一致 */ if (StringUtils.isNotBlank(secretId)) { - String dbSecretId = commonDisposeService.getAuthMap(gmfxxcxReq.getXHFSBH()); + String dbSecretId = baseCommonDisposeService.getAuthMap(gmfxxcxReq.getXHFSBH()); if (!secretId.equals(dbSecretId)) { log.error("{}请求税号与企业维护secretId不一致!", LOGGER_MSG); gmfxxcxRsp.setZTDM(OrderInfoContentEnum.BUYER_MESSAGE_QUERY_NULL.getKey()); @@ -380,7 +380,7 @@ public class InterfaceServiceForKfptImpl implements InterfaceServiceForKfpt { * 1.校验当前税号secretId和数据库维护的数据是否一致 */ if (StringUtils.isNotBlank(secretId)) { - String dbSecretId = commonDisposeService.getAuthMap(gmfxxtbReq.getXHFSBH()); + String dbSecretId = baseCommonDisposeService.getAuthMap(gmfxxtbReq.getXHFSBH()); if (!secretId.equals(dbSecretId)) { log.error("{}请求税号与企业维护secretId不一致!", LOGGER_MSG); gmfxxtbRsp.setZTDM(OrderInfoContentEnum.BUYER_MESSAGE_SYNC_NULL.getKey()); @@ -439,7 +439,7 @@ public class InterfaceServiceForKfptImpl implements InterfaceServiceForKfpt { * 1.校验当前税号secretId和数据库维护的数据是否一致 */ if (StringUtils.isNotBlank(secretId)) { - String dbSecretId = commonDisposeService.getAuthMap(sksbxxtbReq.getXHFSBH()); + String dbSecretId = baseCommonDisposeService.getAuthMap(sksbxxtbReq.getXHFSBH()); if (!secretId.equals(dbSecretId)) { log.error("{}请求税号与企业维护secretId不一致!", LOGGER_MSG); sksbxxtbRsp.setZTDM(OrderInfoContentEnum.TAX_EQUIPMENT_INFO_193001.getKey()); diff --git a/order-management-base-service/src/main/resources/mybatis/mapper/InvoiceWarningInfoMapper.xml b/order-management-base-service/src/main/resources/mybatis/mapper/BaseInvoiceWarningInfoMapper.xml similarity index 99% rename from order-management-base-service/src/main/resources/mybatis/mapper/InvoiceWarningInfoMapper.xml rename to order-management-base-service/src/main/resources/mybatis/mapper/BaseInvoiceWarningInfoMapper.xml index a7c8e95b..32b07427 100644 --- a/order-management-base-service/src/main/resources/mybatis/mapper/InvoiceWarningInfoMapper.xml +++ b/order-management-base-service/src/main/resources/mybatis/mapper/BaseInvoiceWarningInfoMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/order-management-base-service/src/main/resources/mybatis/mapper/PushInfoMapper.xml b/order-management-base-service/src/main/resources/mybatis/mapper/BasePushInfoMapper.xml similarity index 99% rename from order-management-base-service/src/main/resources/mybatis/mapper/PushInfoMapper.xml rename to order-management-base-service/src/main/resources/mybatis/mapper/BasePushInfoMapper.xml index 9926e653..d312799f 100644 --- a/order-management-base-service/src/main/resources/mybatis/mapper/PushInfoMapper.xml +++ b/order-management-base-service/src/main/resources/mybatis/mapper/BasePushInfoMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/PollInvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/PollInvoiceServiceImpl.java index 847d2186..ee14eec0 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/PollInvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/PollInvoiceServiceImpl.java @@ -24,7 +24,7 @@ import com.dxhy.order.utils.DecimalCalculateUtil; import com.dxhy.order.utils.JsonUtils; import com.dxhy.order.utils.NsrsbhUtils; import com.dxhy.order.baseservice.config.BaseServiceConfig; -import com.dxhy.order.baseservice.config.OrderRabbitmqConfig; +import com.dxhy.order.baseservice.config.BaseOrderRabbitmqConfig; import com.dxhy.order.baseservice.module.base.service.BaseService; import com.dxhy.order.baseservice.module.thirdservice.rabbitmq.service.RabbitMqSendMessageService; import com.dxhy.order.baseservice.module.thirdservice.redis.service.RedisService; @@ -108,7 +108,7 @@ public class PollInvoiceServiceImpl implements PollInvoiceService { private OpenApiConfig openApiConfig; @Resource - private OrderRabbitmqConfig orderRabbitmqConfig; + private BaseOrderRabbitmqConfig baseOrderRabbitmqConfig; @Resource private SimsBackService simsBackService; @@ -620,7 +620,7 @@ public class PollInvoiceServiceImpl implements PollInvoiceService { if (ConfigureConstant.INT_0 == lxsc) { //离线票创建队列调整,如果所在渠道在配置文件中,队列名称重新定义 boolean useQd = false; - String configLxpQdList = orderRabbitmqConfig.getConfigLxpQdList(); + String configLxpQdList = baseOrderRabbitmqConfig.getConfigLxpQdList(); if (StringUtils.isNotBlank(configLxpQdList)) { String simsBackQd = simsBackService.getSimsBackQd(fpkjMqData.getNsrsbh(), fpkjMqData.getEntId()); String[] configLxpQdList1 = configLxpQdList.split(ConfigureConstant.STRING_POINT2); @@ -642,8 +642,8 @@ public class PollInvoiceServiceImpl implements PollInvoiceService { if(useQd){ int random = ConfigureConstant.INT_10; try { - if(StringUtils.isNotBlank(orderRabbitmqConfig.getConfigLxpMaxLxpSize())){ - random = RandomUtil.randomInt(Integer.parseInt(orderRabbitmqConfig.getConfigLxpMaxLxpSize())); + if(StringUtils.isNotBlank(baseOrderRabbitmqConfig.getConfigLxpMaxLxpSize())){ + random = RandomUtil.randomInt(Integer.parseInt(baseOrderRabbitmqConfig.getConfigLxpMaxLxpSize())); } } catch (NumberFormatException e) { log.error("{}消息数据存入离线票队列,获取随机数异常,使用默认值", LOGGER_MSG); diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/rabbitmq/service/impl/RabbitMqStartListenerServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/rabbitmq/service/impl/RabbitMqStartListenerServiceImpl.java index 2954b801..d9bc0098 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/rabbitmq/service/impl/RabbitMqStartListenerServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/rabbitmq/service/impl/RabbitMqStartListenerServiceImpl.java @@ -6,7 +6,7 @@ import com.dxhy.base.rabbitmq.rabbitplugin.core.ConnectionForFactory; import com.dxhy.base.rabbitmq.rabbitplugin.core.ListenerDeclare; import com.dxhy.base.rabbitmq.rabbitplugin.core.ListenerFactory; import com.dxhy.base.rabbitmq.rabbitplugin.core.QueueDeclare; -import com.dxhy.order.baseservice.config.OrderRabbitmqConfig; +import com.dxhy.order.baseservice.config.BaseOrderRabbitmqConfig; import com.dxhy.order.baseservice.module.base.dao.SysNsrQueueMapper; import com.dxhy.order.baseservice.module.thirdservice.rabbitmq.service.RabbitMqSendMessageService; import com.dxhy.order.constant.ConfigureConstant; @@ -79,7 +79,7 @@ public class RabbitMqStartListenerServiceImpl implements RabbitMqStartListenerSe private OrderReceiveInvoiceHandler orderReceiveInvoiceHandler; @Resource - private OrderRabbitmqConfig orderRabbitmqConfig; + private BaseOrderRabbitmqConfig baseOrderRabbitmqConfig; /** * 启动rabbitmq监听 @@ -95,7 +95,7 @@ public class RabbitMqStartListenerServiceImpl implements RabbitMqStartListenerSe Set queueSetList = new HashSet<>(); List queueList = new ArrayList<>(); //通过配置文件获取需要初始化的队列 - String businessRabbitMqQueue = orderRabbitmqConfig.getBusinessRabbitMqQueue(); + String businessRabbitMqQueue = baseOrderRabbitmqConfig.getBusinessRabbitMqQueue(); String[] rabbitMqList = businessRabbitMqQueue.split(ConfigureConstant.STRING_POINT2); List configList = Arrays.asList(rabbitMqList); diff --git a/order-management-consumer/src/main/resources/generator.properties b/order-management-consumer/src/main/resources/generator.properties index b9f5e27d..801eb0c6 100644 --- a/order-management-consumer/src/main/resources/generator.properties +++ b/order-management-consumer/src/main/resources/generator.properties @@ -1,18 +1,18 @@ #Mybatis Generator configuration #\u751F\u6210\u6570\u636E\u7684\u4E3B\u76EE\u5F55 -projectPath=src/main/java +projectPath=src/main/java/sn #\u751F\u6210\u6570\u636E\u7684\u8D44\u6E90\u76EE\u5F55 -mapLocation=src/main/resources +mapLocation=src/main/resources/sn #\u6570\u636E\u5E93\u9A71\u52A8\u5305\u8DEF\u5F84 -mysqlConJarPath=E:/maven/repository/mysql/mysql-connector-java/5.1.23/mysql-connector-java-5.1.23.jar +mysqlConJarPath=C:/Users/liufeilong/.m2/repository/mysql/mysql-connector-java/5.1.35/mysql-connector-java-5.1.35.jar #\u6570\u636E\u5E93\u9A71\u52A8\u8DEF\u5F84 jdbc_driver=com.mysql.jdbc.Driver #\u6570\u636E\u5E93\u5730\u5740 -jdbc_url=jdbc:mysql://10.1.1.224:3306/sales_order?useUnicode=true&characterEncoding=utf8&useSSL=false +jdbc_url=jdbc:mysql://10.1.1.76:3306/sales_order_sdenergy?useUnicode=true&characterEncoding=utf8&useSSL=false #\u6570\u636E\u5E93\u7528\u6237 -jdbc_user=dxhy +jdbc_user=root #\u6570\u636E\u5E93\u5BC6\u7801 -jdbc_password=Dxhy@123 +jdbc_password=dxhydever #\u5B9E\u4F53\u5BF9\u8C61\u751F\u6210\u8DEF\u5F84 javaModelTargetPath=com.dxhy.order.model #xml\u751F\u6210\u8DEF\u5F84 @@ -20,6 +20,6 @@ xmlTargetPath=mybatis.mapper #\u6570\u636E\u5E93dao\u5C42 daoTargetPath=com.dxhy.order.dao #\u9700\u8981\u751F\u6210\u6570\u636E\u7684\u8868\u540D -tableName=sys_queue_config +tableName=invoice_remark_set #\u9700\u8981\u751F\u6210\u6570\u636E\u7684\u5B9E\u4F53\u5BF9\u8C61\u540D\u79F0 -domainObjectName=SysQueueConfig +domainObjectName=InvoiceRemarkSet diff --git a/order-management-consumer/src/main/resources/mybatis/mapper/InvoiceWarningInfoMapper.xml b/order-management-consumer/src/main/resources/mybatis/mapper/InvoiceWarningInfoMapper.xml deleted file mode 100644 index a7c8e95b..00000000 --- a/order-management-consumer/src/main/resources/mybatis/mapper/InvoiceWarningInfoMapper.xml +++ /dev/null @@ -1,257 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - id - , xhf_nsrsbh, xhf_mc, sbbh, sb_mc, fpzl_dm, yjfs, phone, e_mail, user_id, yjcs, - sfyj, ent_id,delete_status, create_time, update_time - - - - - - - insert into invoice_warning_info - - - id, - - - xhf_nsrsbh, - - - xhf_mc, - - - sbbh, - - - sb_mc, - - - fpzl_dm, - - - yjfs, - - - phone, - - - e_mail, - - - user_id, - - - yjcs, - - - sfyj, - - - ent_id, - - - delete_status, - - - create_time, - - - update_time, - - - - - #{id,jdbcType=VARCHAR}, - - - #{xhfNsrsbh,jdbcType=VARCHAR}, - - - #{xhfMc,jdbcType=VARCHAR}, - - - #{sbbh,jdbcType=VARCHAR}, - - - #{sbMc,jdbcType=VARCHAR}, - - - #{fpzlDm,jdbcType=VARCHAR}, - - - #{yjfs,jdbcType=VARCHAR}, - - - #{phone,jdbcType=VARCHAR}, - - - #{eMail,jdbcType=VARCHAR}, - - - #{userId,jdbcType=VARCHAR}, - - - #{yjcs,jdbcType=VARCHAR}, - - - #{sfyj,jdbcType=VARCHAR}, - - - #{entId,jdbcType=VARCHAR}, - - - #{deleteStatus,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - - - update invoice_warning_info - - - xhf_nsrsbh = #{invoiceWarning.xhfNsrsbh,jdbcType=VARCHAR}, - - - xhf_mc = #{invoiceWarning.xhfMc,jdbcType=VARCHAR}, - - - sbbh = #{invoiceWarning.sbbh,jdbcType=VARCHAR}, - - - sb_mc = #{invoiceWarning.sbMc,jdbcType=VARCHAR}, - - - fpzl_dm = #{invoiceWarning.fpzlDm,jdbcType=VARCHAR}, - - - yjfs = #{invoiceWarning.yjfs,jdbcType=VARCHAR}, - - - phone = #{invoiceWarning.phone,jdbcType=VARCHAR}, - - - e_mail = #{invoiceWarning.eMail,jdbcType=VARCHAR}, - - - user_id = #{invoiceWarning.userId,jdbcType=VARCHAR}, - - - yjcs = #{invoiceWarning.yjcs,jdbcType=VARCHAR}, - - - sfyj = #{invoiceWarning.sfyj,jdbcType=VARCHAR}, - - - ent_id = #{invoiceWarning.entId,jdbcType=VARCHAR}, - - - delete_status = #{invoiceWarning.deleteStatus,jdbcType=VARCHAR}, - - - create_time = #{invoiceWarning.createTime,jdbcType=TIMESTAMP}, - - - update_time = #{invoiceWarning.updateTime,jdbcType=TIMESTAMP}, - - - where id = #{invoiceWarning.id,jdbcType=VARCHAR} - - and xhf_nsrsbh = '' - - - and xhf_nsrsbh = - - #{item} - - - - and xhf_nsrsbh in - - #{item} - - - -