Merge remote-tracking branch 'origin/master'

zhsw-wechat-common/pom.xml

@@ -24,7 +24,7 @@
         </dependency>
         <dependency>
             <groupId>com.rongwei</groupId>
-            <artifactId>zhsw-entity</artifactId>
+            <artifactId>zhsw-wechat-entity</artifactId>
             <version>1.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/config/ContextHolder.java

@@ -1,4 +1,4 @@
-package com.rongwei.zhsw.system.config;
+package com.rongwei.wechat.system.config;
 
 import com.alibaba.ttl.TransmittableThreadLocal;
 

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/config/MySqlInjector.java

@@ -1,4 +1,4 @@
-package com.rongwei.zhsw.system.config;
+package com.rongwei.wechat.system.config;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.core.injector.AbstractMethod;

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/config/MybatisConfig.java

@@ -1,4 +1,4 @@
-package com.rongwei.zhsw.system.config;
+package com.rongwei.wechat.system.config;
 
 import com.baomidou.mybatisplus.core.parser.ISqlParser;
 import com.baomidou.mybatisplus.core.parser.ISqlParserFilter;

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/config/MybatisPlusConfig.java

@@ -1,4 +1,4 @@
-package com.rongwei.zhsw.system.config;
+package com.rongwei.wechat.system.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/config/TtlThreadPoolConfig.java

@@ -1,4 +1,4 @@
-package com.rongwei.zhsw.system.config;
+package com.rongwei.wechat.system.config;
 
 import com.alibaba.ttl.TtlRunnable;
 import com.alibaba.ttl.threadpool.TtlExecutors;

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/config/WeChatAboutApiPara.java

@@ -1,4 +1,4 @@
-package com.rongwei.zhsw.system.config;
+package com.rongwei.wechat.system.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/config/ZHSWQuerySqlAdaptationInterceptor.java

@@ -1,4 +1,4 @@
-package com.rongwei.zhsw.system.config;
+package com.rongwei.wechat.system.config;
 
 import com.alibaba.druid.pool.DruidDataSource;
 import com.rongwei.commonservice.service.RedisService;

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/config/ZHSWWebConfig.java

@@ -1,5 +1,5 @@
-package com.rongwei.zhsw.system.config;
-import com.rongwei.zhsw.system.interceptor.WeChatTokenInterceptor;
+package com.rongwei.wechat.system.config;
+import com.rongwei.wechat.system.interceptor.WeChatTokenInterceptor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/dao/CommonBusinessDao.java

@@ -1,7 +1,7 @@
-package com.rongwei.zhsw.system.dao;
+package com.rongwei.wechat.system.dao;
 
-import com.rongwe.zhsw.system.domain.SwEnterpriseConfigInfoDo;
-import com.rongwe.zhsw.system.vo.OwnerVo;
+import com.rongwe.wechat.system.domain.SwEnterpriseConfigInfoDo;
+import com.rongwe.wechat.system.vo.OwnerVo;
 import com.rongwei.rwadmincommon.system.domain.SysUserDo;
 import com.rongwei.rwadmincommon.system.vo.SysUserVo;
 import com.rongwei.rwcommonentity.commonservers.domain.TenantDo;

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/dao/CommonMapper.java

@@ -1,4 +1,4 @@
-package com.rongwei.zhsw.system.dao;
+package com.rongwei.wechat.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/dao/SwBillManagementPaidDao.java

@@ -1,9 +1,9 @@
-package com.rongwei.zhsw.system.dao;
+package com.rongwei.wechat.system.dao;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.rongwe.zhsw.system.domain.SwBillManagementPaidDo;
-import com.rongwe.zhsw.system.domain.SwBillingRecordDo;
+import com.rongwe.wechat.system.domain.SwBillManagementPaidDo;
+import com.rongwe.wechat.system.domain.SwBillingRecordDo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/dao/SwBillManagementUnpaidDao.java

@@ -1,9 +1,9 @@
-package com.rongwei.zhsw.system.dao;
+package com.rongwei.wechat.system.dao;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.rongwe.zhsw.system.domain.SwBillManagementUnpaidDo;
-import com.rongwe.zhsw.system.dto.TransferAccountDo;
+import com.rongwe.wechat.system.domain.SwBillManagementUnpaidDo;
+import com.rongwe.wechat.system.dto.TransferAccountDo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.MapKey;

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/dao/SwBillingRecordDao.java

@@ -1,8 +1,8 @@
-package com.rongwei.zhsw.system.dao;
+package com.rongwei.wechat.system.dao;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.rongwe.zhsw.system.domain.SwBillingRecordDo;
+import com.rongwe.wechat.system.domain.SwBillingRecordDo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/dao/SwBusinesshallDao.java

@@ -1,8 +1,8 @@
-package com.rongwei.zhsw.system.dao;
+package com.rongwei.wechat.system.dao;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.rongwe.zhsw.system.domain.SwBusinesshallDo;
+import com.rongwe.wechat.system.domain.SwBusinesshallDo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/dao/SwEnterpriseConfigInfoDao.java

@@ -1,9 +1,9 @@
-package com.rongwei.zhsw.system.dao;
+package com.rongwei.wechat.system.dao;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.rongwe.zhsw.system.domain.SwBusinesshallDo;
-import com.rongwe.zhsw.system.domain.SwEnterpriseConfigInfoDo;
+import com.rongwe.wechat.system.domain.SwBusinesshallDo;
+import com.rongwe.wechat.system.domain.SwEnterpriseConfigInfoDo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/dao/SwFeedBackOpinionDao.java

@@ -1,8 +1,8 @@
-package com.rongwei.zhsw.system.dao;
+package com.rongwei.wechat.system.dao;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.rongwe.zhsw.system.domain.SwFeedBackOpinionDo;
+import com.rongwe.wechat.system.domain.SwFeedBackOpinionDo;
 
 /**
  * @author libai

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/dao/SwInspectionRouteDao.java

@@ -1,6 +1,6 @@
-package com.rongwei.zhsw.system.dao;
+package com.rongwei.wechat.system.dao;
 
-import com.rongwe.zhsw.system.domain.SwInspectionRouteDo;
+import com.rongwe.wechat.system.domain.SwInspectionRouteDo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/dao/SwInspectionRoutePointDao.java

@@ -1,6 +1,6 @@
-package com.rongwei.zhsw.system.dao;
+package com.rongwei.wechat.system.dao;
 
-import com.rongwe.zhsw.system.domain.SwInspectionRoutePointDo;
+import com.rongwe.wechat.system.domain.SwInspectionRoutePointDo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/dao/SwInspectionTaskDao.java

@@ -1,7 +1,7 @@
-package com.rongwei.zhsw.system.dao;
+package com.rongwei.wechat.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.rongwe.zhsw.system.domain.SwInspectionTaskDo;
+import com.rongwe.wechat.system.domain.SwInspectionTaskDo;
 
 /**
 * @author libai

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/dao/SwInspectionTaskPointDao.java

@@ -1,8 +1,8 @@
-package com.rongwei.zhsw.system.dao;
+package com.rongwei.wechat.system.dao;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.rongwe.zhsw.system.domain.SwInspectionTaskPointDo;
+import com.rongwe.wechat.system.domain.SwInspectionTaskPointDo;
 
 /**
 * @author libai

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/dao/SwMeterExchangeRegisterDao.java

@@ -1,7 +1,7 @@
-package com.rongwei.zhsw.system.dao;
+package com.rongwei.wechat.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.rongwe.zhsw.system.domain.SwMeterExchangeRegisterDo;
+import com.rongwe.wechat.system.domain.SwMeterExchangeRegisterDo;
 
 /**
 * @author rongwei

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/dao/SwMeterReadingCorrectionDao.java

@@ -1,8 +1,8 @@
-package com.rongwei.zhsw.system.dao;
+package com.rongwei.wechat.system.dao;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.rongwe.zhsw.system.domain.SwMeterReadingCorrectionDo;
+import com.rongwe.wechat.system.domain.SwMeterReadingCorrectionDo;
 import org.apache.ibatis.annotations.Mapper;
 
 

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/dao/SwNotificationAnnouncementDao.java

@@ -1,6 +1,6 @@
-package com.rongwei.zhsw.system.dao;
+package com.rongwei.wechat.system.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.rongwe.zhsw.system.domain.SwNotificationAnnouncementDo;
+import com.rongwe.wechat.system.domain.SwNotificationAnnouncementDo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/dao/SwPrintRepairConfigDao.java

@@ -1,6 +1,6 @@
-package com.rongwei.zhsw.system.dao;
+package com.rongwei.wechat.system.dao;
 
-import com.rongwe.zhsw.system.domain.SwPrintRepairConfigDo;
+import com.rongwe.wechat.system.domain.SwPrintRepairConfigDo;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/dao/SwRefundRequestRecordDao.java

@@ -1,7 +1,7 @@
-package com.rongwei.zhsw.system.dao;
+package com.rongwei.wechat.system.dao;
  
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.rongwe.zhsw.system.domain.SwRefundRequestRecordDO;
+import com.rongwe.wechat.system.domain.SwRefundRequestRecordDO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/dao/SwUserManagementDao.java

@@ -1,10 +1,10 @@
-package com.rongwei.zhsw.system.dao;
+package com.rongwei.wechat.system.dao;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.rongwe.zhsw.system.domain.SwUserManagementDo;
-import com.rongwe.zhsw.system.dto.TransferAccountDo;
-import com.rongwe.zhsw.system.vo.SwUserManagementVo;
+import com.rongwe.wechat.system.domain.SwUserManagementDo;
+import com.rongwe.wechat.system.dto.TransferAccountDo;
+import com.rongwe.wechat.system.vo.SwUserManagementVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/dao/SwUserRepairDao.java

@@ -1,7 +1,7 @@
-package com.rongwei.zhsw.system.dao;
+package com.rongwei.wechat.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.rongwe.zhsw.system.domain.SwUserRepairDo;
+import com.rongwe.wechat.system.domain.SwUserRepairDo;
 
 /**
 * @author libai

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/dao/SwUserWechatDao.java

@@ -1,7 +1,7 @@
-package com.rongwei.zhsw.system.dao;
+package com.rongwei.wechat.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.rongwe.zhsw.system.domain.SwUserWechatDo;
+import com.rongwe.wechat.system.domain.SwUserWechatDo;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/dao/SwWaterMeterManagementDao.java

@@ -1,7 +1,7 @@
-package com.rongwei.zhsw.system.dao;
+package com.rongwei.wechat.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.rongwe.zhsw.system.domain.SwWaterMeterManagementDo;
+import com.rongwe.wechat.system.domain.SwWaterMeterManagementDo;
 
 /**
 * @author rongwei

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/dao/SwWaterUsageEntryDao.java

@@ -1,8 +1,8 @@
-package com.rongwei.zhsw.system.dao;
+package com.rongwei.wechat.system.dao;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.rongwe.zhsw.system.domain.SwWaterUsageEntryDo;
+import com.rongwe.wechat.system.domain.SwWaterUsageEntryDo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/dao/SysNotifyAnnounceUserDao.java

@@ -1,8 +1,8 @@
-package com.rongwei.zhsw.system.dao;
+package com.rongwei.wechat.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.rongwe.zhsw.system.domain.SwNotificationAnnouncementDo;
-import com.rongwe.zhsw.system.domain.SysNotifyAnnounceUserDo;
+import com.rongwe.wechat.system.domain.SwNotificationAnnouncementDo;
+import com.rongwe.wechat.system.domain.SysNotifyAnnounceUserDo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/fegin/LoginAuth.java

@@ -1,4 +1,4 @@
-package com.rongwei.zhsw.system.fegin;
+package com.rongwei.wechat.system.fegin;
 
 import com.rongwei.rwadmincommon.system.vo.JwtAuthenticationRequest;
 import org.springframework.cloud.openfeign.FeignClient;

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/fegin/LoginAuthImpl.java

@@ -1,4 +1,4 @@
-package com.rongwei.zhsw.system.fegin;
+package com.rongwei.wechat.system.fegin;
 
 import com.rongwei.rwadmincommon.system.vo.JwtAuthenticationRequest;
 import org.springframework.stereotype.Component;

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/fegin/TenantFeginService.java

@@ -1,4 +1,4 @@
-package com.rongwei.zhsw.system.fegin;
+package com.rongwei.wechat.system.fegin;
 
 import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommonentity.commonservers.domain.TenantDo;

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/fegin/TenantFeginServiceImpl.java

@@ -1,4 +1,4 @@
-package com.rongwei.zhsw.system.fegin;
+package com.rongwei.wechat.system.fegin;
 
 import com.codingapi.txlcn.tc.support.DTXUserControls;
 import com.codingapi.txlcn.tracing.TracingContext;

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/interceptor/WeChatTokenInterceptor.java

@@ -1,4 +1,4 @@
-package com.rongwei.zhsw.system.interceptor;
+package com.rongwei.wechat.system.interceptor;
 
 import com.rongwei.rwcommon.utils.Constants;
 import org.apache.commons.lang.StringUtils;

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/SwBillManagementPaidService.java

@@ -1,7 +1,7 @@
-package com.rongwei.zhsw.system.service;
+package com.rongwei.wechat.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.rongwe.zhsw.system.domain.SwBillManagementPaidDo;
+import com.rongwe.wechat.system.domain.SwBillManagementPaidDo;
 
 import java.util.List;
 

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/SwBillManagementUnpaidService.java

@@ -1,9 +1,9 @@
-package com.rongwei.zhsw.system.service;
+package com.rongwei.wechat.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.rongwe.zhsw.system.domain.SwBillManagementUnpaidDo;
-import com.rongwe.zhsw.system.dto.MeterReadingCorrectionDTO;
-import com.rongwe.zhsw.system.dto.TransferAccountDo;
+import com.rongwe.wechat.system.domain.SwBillManagementUnpaidDo;
+import com.rongwe.wechat.system.dto.MeterReadingCorrectionDTO;
+import com.rongwe.wechat.system.dto.TransferAccountDo;
 import com.rongwei.rwcommon.base.R;
 
 import java.math.BigDecimal;

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/SwBillingRecordService.java

@@ -1,11 +1,11 @@
-package com.rongwei.zhsw.system.service;
+package com.rongwei.wechat.system.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.rongwe.zhsw.system.domain.SwBillManagementPaidDo;
-import com.rongwe.zhsw.system.domain.SwBillingRecordDo;
-import com.rongwe.zhsw.system.domain.SwUserManagementDo;
-import com.rongwe.zhsw.system.dto.PaymentRequestDTO;
+import com.rongwe.wechat.system.domain.SwBillManagementPaidDo;
+import com.rongwe.wechat.system.domain.SwBillingRecordDo;
+import com.rongwe.wechat.system.domain.SwUserManagementDo;
+import com.rongwe.wechat.system.dto.PaymentRequestDTO;
 import com.rongwei.rwcommon.base.R;
 
 import java.util.List;

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/SwBusinesshallService.java

@@ -1,8 +1,8 @@
-package com.rongwei.zhsw.system.service;
+package com.rongwei.wechat.system.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.rongwe.zhsw.system.domain.SwBusinesshallDo;
+import com.rongwe.wechat.system.domain.SwBusinesshallDo;
 
 /**
 * @author libai

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/SwCollectionNoticeService.java

@@ -1,4 +1,4 @@
-package com.rongwei.zhsw.system.service;
+package com.rongwei.wechat.system.service;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/SwEnterpriseConfigInfoService.java

@@ -1,6 +1,6 @@
-package com.rongwei.zhsw.system.service;
+package com.rongwei.wechat.system.service;
 
-import com.rongwe.zhsw.system.domain.SwEnterpriseConfigInfoDo;
+import com.rongwe.wechat.system.domain.SwEnterpriseConfigInfoDo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/SwFeedBackOpinionService.java

@@ -1,8 +1,8 @@
-package com.rongwei.zhsw.system.service;
+package com.rongwei.wechat.system.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.rongwe.zhsw.system.domain.SwFeedBackOpinionDo;
+import com.rongwe.wechat.system.domain.SwFeedBackOpinionDo;
 
 /**
 * @author libai

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/SwInspectionRoutePointService.java

@@ -1,8 +1,8 @@
-package com.rongwei.zhsw.system.service;
+package com.rongwei.wechat.system.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.rongwe.zhsw.system.domain.SwInspectionRoutePointDo;
+import com.rongwe.wechat.system.domain.SwInspectionRoutePointDo;
 
 /**
 * @author libai

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/SwInspectionRouteService.java

@@ -1,8 +1,8 @@
-package com.rongwei.zhsw.system.service;
+package com.rongwei.wechat.system.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.rongwe.zhsw.system.domain.SwInspectionRouteDo;
+import com.rongwe.wechat.system.domain.SwInspectionRouteDo;
 
 /**
 * @author libai

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/SwInspectionTaskPointService.java

@@ -1,6 +1,6 @@
-package com.rongwei.zhsw.system.service;
+package com.rongwei.wechat.system.service;
 
-import com.rongwe.zhsw.system.domain.SwInspectionTaskPointDo;
+import com.rongwe.wechat.system.domain.SwInspectionTaskPointDo;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.rongwei.rwcommon.base.R;
 

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/SwInspectionTaskService.java

@@ -1,6 +1,6 @@
-package com.rongwei.zhsw.system.service;
+package com.rongwei.wechat.system.service;
 
-import com.rongwe.zhsw.system.domain.SwInspectionTaskDo;
+import com.rongwe.wechat.system.domain.SwInspectionTaskDo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/SwMeterExchangeRegisterService.java

@@ -1,8 +1,8 @@
-package com.rongwei.zhsw.system.service;
+package com.rongwei.wechat.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.rongwe.zhsw.system.domain.SwMeterExchangeRegisterDo;
-import com.rongwe.zhsw.system.domain.SwWaterUsageEntryDo;
+import com.rongwe.wechat.system.domain.SwMeterExchangeRegisterDo;
+import com.rongwe.wechat.system.domain.SwWaterUsageEntryDo;
 
 import java.util.List;
 

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/SwMeterReadingCorrectionService.java

@@ -1,7 +1,7 @@
-package com.rongwei.zhsw.system.service;
+package com.rongwei.wechat.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.rongwe.zhsw.system.domain.SwMeterReadingCorrectionDo;
+import com.rongwe.wechat.system.domain.SwMeterReadingCorrectionDo;
 /**
  * 抄表修正(SwMeterReadingCorrection)表服务接口
  *

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/SwNotificationAnnouncementService.java

@@ -1,6 +1,6 @@
-package com.rongwei.zhsw.system.service;
+package com.rongwei.wechat.system.service;
 
-import com.rongwe.zhsw.system.domain.SwNotificationAnnouncementDo;
+import com.rongwe.wechat.system.domain.SwNotificationAnnouncementDo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/SwRefundRequestRecordService.java

@@ -1,7 +1,7 @@
-package com.rongwei.zhsw.system.service;
+package com.rongwei.wechat.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.rongwe.zhsw.system.domain.SwRefundRequestRecordDO;
+import com.rongwe.wechat.system.domain.SwRefundRequestRecordDO;
 import com.rongwei.rwcommon.base.R;
 
 

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/SwUserManagementService.java

@@ -1,9 +1,9 @@
-package com.rongwei.zhsw.system.service;
+package com.rongwei.wechat.system.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.rongwe.zhsw.system.domain.SwUserManagementDo;
-import com.rongwe.zhsw.system.dto.TransferAccountDo;
+import com.rongwe.wechat.system.domain.SwUserManagementDo;
+import com.rongwe.wechat.system.dto.TransferAccountDo;
 
 import java.math.BigDecimal;
 import java.util.List;

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/SwUserRepairService.java

@@ -1,6 +1,6 @@
-package com.rongwei.zhsw.system.service;
+package com.rongwei.wechat.system.service;
 
-import com.rongwe.zhsw.system.domain.SwUserRepairDo;
+import com.rongwe.wechat.system.domain.SwUserRepairDo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/SwUserWechatService.java

@@ -1,7 +1,7 @@
-package com.rongwei.zhsw.system.service;
+package com.rongwei.wechat.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.rongwe.zhsw.system.domain.SwUserWechatDo;
+import com.rongwe.wechat.system.domain.SwUserWechatDo;
 
 /**
 * @author libai

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/SwWaterMeterManagementService.java

@@ -1,7 +1,7 @@
-package com.rongwei.zhsw.system.service;
+package com.rongwei.wechat.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.rongwe.zhsw.system.domain.SwWaterMeterManagementDo;
+import com.rongwe.wechat.system.domain.SwWaterMeterManagementDo;
 
 /**
 * @author rongwei

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/SwWaterUsageEntryService.java

@@ -1,8 +1,8 @@
-package com.rongwei.zhsw.system.service;
+package com.rongwei.wechat.system.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.rongwe.zhsw.system.domain.SwWaterUsageEntryDo;
+import com.rongwe.wechat.system.domain.SwWaterUsageEntryDo;
 
 /**
  * 抄表登记(SwWaterUsageEntry)表服务接口

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/SysNotifyAnnounceUserService.java

@@ -1,7 +1,7 @@
-package com.rongwei.zhsw.system.service;
+package com.rongwei.wechat.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.rongwe.zhsw.system.domain.SysNotifyAnnounceUserDo;
+import com.rongwe.wechat.system.domain.SysNotifyAnnounceUserDo;
 
 /**
  * 用户消息Service接口

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/WaterUsageService.java

@@ -1,7 +1,7 @@
-package com.rongwei.zhsw.system.service;
+package com.rongwei.wechat.system.service;
 
-import com.rongwe.zhsw.system.domain.SwWaterUsageEntryDo;
-import com.rongwe.zhsw.system.vo.ManualMeterReadingVo;
+import com.rongwe.wechat.system.domain.SwWaterUsageEntryDo;
+import com.rongwe.wechat.system.vo.ManualMeterReadingVo;
 import com.rongwei.rwcommon.base.R;
 
 /**

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/WaterWorksService.java

@@ -1,4 +1,4 @@
-package com.rongwei.zhsw.system.service;
+package com.rongwei.wechat.system.service;
 
 import com.rongwei.rwcommon.base.R;
 

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/WeChatUnbindService.java

@@ -1,4 +1,4 @@
-package com.rongwei.zhsw.system.service;
+package com.rongwei.wechat.system.service;
 
 import com.rongwei.rwcommon.base.R;
 

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/impl/BillGenerationServiceImpl.java

@@ -1,16 +1,16 @@
-package com.rongwei.zhsw.system.service.impl;
+package com.rongwei.wechat.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.rongwe.zhsw.system.domain.SwBillManagementUnpaidDo;
-import com.rongwe.zhsw.system.domain.SwUserManagementDo;
-import com.rongwe.zhsw.system.domain.SwWaterUsageEntryDo;
+import com.rongwe.wechat.system.domain.SwBillManagementUnpaidDo;
+import com.rongwe.wechat.system.domain.SwUserManagementDo;
+import com.rongwe.wechat.system.domain.SwWaterUsageEntryDo;
 import com.rongwei.commonservice.service.RedisService;
 import com.rongwei.rwadmincommon.system.vo.SysUserVo;
 import com.rongwei.rwcommon.base.BaseDo;
 import com.rongwei.rwcommon.base.exception.CustomException;
 import com.rongwei.rwcommon.utils.SecurityUtil;
-import com.rongwei.zhsw.system.config.ContextHolder;
-import com.rongwei.zhsw.system.utils.ZHSWCommonUtils;
+import com.rongwei.wechat.system.config.ContextHolder;
+import com.rongwei.wechat.system.utils.ZHSWCommonUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/impl/SwBillManagementPaidServiceImpl.java

@@ -1,9 +1,9 @@
-package com.rongwei.zhsw.system.service.impl;
+package com.rongwei.wechat.system.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rongwe.zhsw.system.domain.SwBillManagementPaidDo;
-import com.rongwei.zhsw.system.dao.SwBillManagementPaidDao;
-import com.rongwei.zhsw.system.service.SwBillManagementPaidService;
+import com.rongwe.wechat.system.domain.SwBillManagementPaidDo;
+import com.rongwei.wechat.system.dao.SwBillManagementPaidDao;
+import com.rongwei.wechat.system.service.SwBillManagementPaidService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/impl/SwBillManagementUnpaidServiceImpl.java

@@ -1,20 +1,20 @@
-package com.rongwei.zhsw.system.service.impl;
+package com.rongwei.wechat.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
-import com.rongwe.zhsw.system.domain.*;
-import com.rongwe.zhsw.system.dto.MeterReadingCorrectionDTO;
-import com.rongwe.zhsw.system.dto.TransferAccountDo;
+import com.rongwe.wechat.system.domain.*;
+import com.rongwe.wechat.system.dto.MeterReadingCorrectionDTO;
+import com.rongwe.wechat.system.dto.TransferAccountDo;
 import com.rongwei.rwadmincommon.system.vo.SysUserVo;
 import com.rongwei.rwcommon.base.BaseDo;
 import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.base.exception.CustomException;
 import com.rongwei.rwcommon.utils.SecurityUtil;
-import com.rongwei.zhsw.system.dao.SwBillManagementUnpaidDao;
-import com.rongwei.zhsw.system.service.*;
-import com.rongwei.zhsw.system.utils.ZHSWCommonUtils;
+import com.rongwei.wechat.system.dao.SwBillManagementUnpaidDao;
+import com.rongwei.wechat.system.service.*;
+import com.rongwei.wechat.system.utils.ZHSWCommonUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -26,9 +26,9 @@ import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static com.rongwei.zhsw.system.utils.SaveConstans.billInfo.*;
-import static com.rongwei.zhsw.system.utils.SaveConstans.billReccord.DATASOURCEBALANCEDEDUCTION;
-import static com.rongwei.zhsw.system.utils.SaveConstans.billReccord.HAVEREVISEDSTATUS;
+import static com.rongwei.wechat.system.utils.SaveConstans.billInfo.*;
+import static com.rongwei.wechat.system.utils.SaveConstans.billReccord.DATASOURCEBALANCEDEDUCTION;
+import static com.rongwei.wechat.system.utils.SaveConstans.billReccord.HAVEREVISEDSTATUS;
 
 /**
  * 账单管理(按年分表)(预收，未缴)(SwBillManagementUnpaid)表服务实现类

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/impl/SwBillingRecordServiceImpl.java

@@ -1,24 +1,24 @@
-package com.rongwei.zhsw.system.service.impl;
+package com.rongwei.wechat.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rongwe.zhsw.system.domain.SwBillManagementPaidDo;
-import com.rongwe.zhsw.system.domain.SwBillManagementUnpaidDo;
-import com.rongwe.zhsw.system.domain.SwBillingRecordDo;
-import com.rongwe.zhsw.system.domain.SwUserManagementDo;
-import com.rongwe.zhsw.system.dto.PaymentRequestDTO;
+import com.rongwe.wechat.system.domain.SwBillManagementPaidDo;
+import com.rongwe.wechat.system.domain.SwBillManagementUnpaidDo;
+import com.rongwe.wechat.system.domain.SwBillingRecordDo;
+import com.rongwe.wechat.system.domain.SwUserManagementDo;
+import com.rongwe.wechat.system.dto.PaymentRequestDTO;
 import com.rongwei.commonservice.service.impl.RedisServiceImpl;
 import com.rongwei.rwadmincommon.system.vo.SysUserVo;
 import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.base.exception.CustomException;
 import com.rongwei.rwcommon.utils.SecurityUtil;
-import com.rongwei.zhsw.system.dao.SwBillManagementUnpaidDao;
-import com.rongwei.zhsw.system.dao.SwBillingRecordDao;
-import com.rongwei.zhsw.system.service.SwBillManagementPaidService;
-import com.rongwei.zhsw.system.service.SwBillManagementUnpaidService;
-import com.rongwei.zhsw.system.service.SwBillingRecordService;
-import com.rongwei.zhsw.system.service.SwUserManagementService;
-import com.rongwei.zhsw.system.utils.ZHSWCommonUtils;
+import com.rongwei.wechat.system.dao.SwBillManagementUnpaidDao;
+import com.rongwei.wechat.system.dao.SwBillingRecordDao;
+import com.rongwei.wechat.system.service.SwBillManagementPaidService;
+import com.rongwei.wechat.system.service.SwBillManagementUnpaidService;
+import com.rongwei.wechat.system.service.SwBillingRecordService;
+import com.rongwei.wechat.system.service.SwUserManagementService;
+import com.rongwei.wechat.system.utils.ZHSWCommonUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -33,9 +33,9 @@ import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static com.rongwei.zhsw.system.utils.SaveConstans.billInfo.PAIDINSTATUS;
-import static com.rongwei.zhsw.system.utils.SaveConstans.billInfo.PENDINGSTATUS;
-import static com.rongwei.zhsw.system.utils.SaveConstans.billReccord.PAIDSTATUS;
+import static com.rongwei.wechat.system.utils.SaveConstans.billInfo.PAIDINSTATUS;
+import static com.rongwei.wechat.system.utils.SaveConstans.billInfo.PENDINGSTATUS;
+import static com.rongwei.wechat.system.utils.SaveConstans.billReccord.PAIDSTATUS;
 
 /**
  * 缴费记录(SwBillingRecord)表服务实现类

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/impl/SwBusinesshallServiceImpl.java

@@ -1,9 +1,9 @@
-package com.rongwei.zhsw.system.service.impl;
+package com.rongwei.wechat.system.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rongwe.zhsw.system.domain.SwBusinesshallDo;
-import com.rongwei.zhsw.system.dao.SwBusinesshallDao;
-import com.rongwei.zhsw.system.service.SwBusinesshallService;
+import com.rongwe.wechat.system.domain.SwBusinesshallDo;
+import com.rongwei.wechat.system.dao.SwBusinesshallDao;
+import com.rongwei.wechat.system.service.SwBusinesshallService;
 import org.springframework.stereotype.Service;
 
 /**

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/impl/SwCollectionNoticeServiceImpl.java

@@ -1,18 +1,18 @@
-package com.rongwei.zhsw.system.service.impl;
+package com.rongwei.wechat.system.service.impl;
 
 import com.aspose.words.*;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.google.common.collect.Lists;
-import com.rongwe.zhsw.system.domain.SwBusinesshallDo;
-import com.rongwe.zhsw.system.domain.SwEnterpriseConfigInfoDo;
+import com.rongwe.wechat.system.domain.SwBusinesshallDo;
+import com.rongwe.wechat.system.domain.SwEnterpriseConfigInfoDo;
 import com.rongwei.rwcommon.base.BaseDo;
 import com.rongwei.rwcommon.base.exception.CustomException;
 import com.rongwei.rwcommon.utils.StringUtils;
 import com.rongwei.rwcommoncomponent.file.service.SysFileItemService;
 import com.rongwei.rwcommonentity.commonservers.domain.SysFileItemDo;
-import com.rongwei.zhsw.system.service.SwCollectionNoticeService;
-import com.rongwei.zhsw.system.service.SwEnterpriseConfigInfoService;
-import com.rongwei.zhsw.system.utils.EnvironmentAwareResourceLoader;
+import com.rongwei.wechat.system.service.SwCollectionNoticeService;
+import com.rongwei.wechat.system.service.SwEnterpriseConfigInfoService;
+import com.rongwei.wechat.system.utils.EnvironmentAwareResourceLoader;
 import org.apache.poi.util.IOUtils;
 import org.apache.poi.util.Units;
 import org.apache.poi.xwpf.usermodel.BreakType;

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/impl/SwEnterpriseConfigInfoServiceImpl.java

@@ -1,9 +1,9 @@
-package com.rongwei.zhsw.system.service.impl;
+package com.rongwei.wechat.system.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rongwe.zhsw.system.domain.SwEnterpriseConfigInfoDo;
-import com.rongwei.zhsw.system.dao.SwEnterpriseConfigInfoDao;
-import com.rongwei.zhsw.system.service.SwEnterpriseConfigInfoService;
+import com.rongwe.wechat.system.domain.SwEnterpriseConfigInfoDo;
+import com.rongwei.wechat.system.dao.SwEnterpriseConfigInfoDao;
+import com.rongwei.wechat.system.service.SwEnterpriseConfigInfoService;
 import org.springframework.stereotype.Service;
 
 /**

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/impl/SwFeedBackOpinionServiceImpl.java

@@ -1,9 +1,9 @@
-package com.rongwei.zhsw.system.service.impl;
+package com.rongwei.wechat.system.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rongwe.zhsw.system.domain.SwFeedBackOpinionDo;
-import com.rongwei.zhsw.system.dao.SwFeedBackOpinionDao;
-import com.rongwei.zhsw.system.service.SwFeedBackOpinionService;
+import com.rongwe.wechat.system.domain.SwFeedBackOpinionDo;
+import com.rongwei.wechat.system.dao.SwFeedBackOpinionDao;
+import com.rongwei.wechat.system.service.SwFeedBackOpinionService;
 import org.springframework.stereotype.Service;
 
 /**

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/impl/SwInspectionRoutePointServiceImpl.java

@@ -1,10 +1,10 @@
-package com.rongwei.zhsw.system.service.impl;
+package com.rongwei.wechat.system.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rongwe.zhsw.system.domain.SwInspectionRoutePointDo;
-import com.rongwei.zhsw.system.dao.SwInspectionRoutePointDao;
+import com.rongwe.wechat.system.domain.SwInspectionRoutePointDo;
+import com.rongwei.wechat.system.dao.SwInspectionRoutePointDao;
 
-import com.rongwei.zhsw.system.service.SwInspectionRoutePointService;
+import com.rongwei.wechat.system.service.SwInspectionRoutePointService;
 import org.springframework.stereotype.Service;
 
 /**

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/impl/SwInspectionRouteServiceImpl.java

@@ -1,10 +1,10 @@
-package com.rongwei.zhsw.system.service.impl;
+package com.rongwei.wechat.system.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
-import com.rongwe.zhsw.system.domain.SwInspectionRouteDo;
-import com.rongwei.zhsw.system.dao.SwInspectionRouteDao;
-import com.rongwei.zhsw.system.service.SwInspectionRouteService;
+import com.rongwe.wechat.system.domain.SwInspectionRouteDo;
+import com.rongwei.wechat.system.dao.SwInspectionRouteDao;
+import com.rongwei.wechat.system.service.SwInspectionRouteService;
 import org.springframework.stereotype.Service;
 
 /**

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/impl/SwInspectionTaskPointServiceImpl.java

@@ -1,17 +1,17 @@
-package com.rongwei.zhsw.system.service.impl;
+package com.rongwei.wechat.system.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rongwe.zhsw.system.domain.SwInspectionTaskPointDo;
+import com.rongwe.wechat.system.domain.SwInspectionTaskPointDo;
 import com.rongwei.rwcommon.base.R;
-import com.rongwei.zhsw.system.dao.SwInspectionTaskPointDao;
-import com.rongwei.zhsw.system.service.SwInspectionTaskPointService;
+import com.rongwei.wechat.system.dao.SwInspectionTaskPointDao;
+import com.rongwei.wechat.system.service.SwInspectionTaskPointService;
 import org.springframework.stereotype.Service;
 import org.apache.commons.lang3.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.rongwe.zhsw.system.domain.SwInspectionTaskDo;
-import com.rongwei.zhsw.system.service.SwInspectionTaskService;
+import com.rongwe.wechat.system.domain.SwInspectionTaskDo;
+import com.rongwei.wechat.system.service.SwInspectionTaskService;
 import org.springframework.beans.factory.annotation.Autowired;
-import com.rongwei.zhsw.system.dao.SwInspectionTaskDao;
+import com.rongwei.wechat.system.dao.SwInspectionTaskDao;
 
 import java.util.Date;
 import java.util.List;

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/impl/SwInspectionTaskServiceImpl.java

@@ -1,9 +1,9 @@
-package com.rongwei.zhsw.system.service.impl;
+package com.rongwei.wechat.system.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rongwe.zhsw.system.domain.SwInspectionTaskDo;
-import com.rongwei.zhsw.system.dao.SwInspectionTaskDao;
-import com.rongwei.zhsw.system.service.SwInspectionTaskService;
+import com.rongwe.wechat.system.domain.SwInspectionTaskDo;
+import com.rongwei.wechat.system.dao.SwInspectionTaskDao;
+import com.rongwei.wechat.system.service.SwInspectionTaskService;
 import org.springframework.stereotype.Service;
 
 /**

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/impl/SwMeterExchangeRegisterServiceImpl.java

@@ -1,17 +1,17 @@
-package com.rongwei.zhsw.system.service.impl;
+package com.rongwei.wechat.system.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rongwe.zhsw.system.domain.SwMeterExchangeRegisterDo;
-import com.rongwe.zhsw.system.domain.SwUserManagementDo;
-import com.rongwe.zhsw.system.domain.SwWaterMeterManagementDo;
-import com.rongwe.zhsw.system.domain.SwWaterUsageEntryDo;
+import com.rongwe.wechat.system.domain.SwMeterExchangeRegisterDo;
+import com.rongwe.wechat.system.domain.SwUserManagementDo;
+import com.rongwe.wechat.system.domain.SwWaterMeterManagementDo;
+import com.rongwe.wechat.system.domain.SwWaterUsageEntryDo;
 import com.rongwei.rwcommon.utils.SecurityUtil;
-import com.rongwei.zhsw.system.dao.SwMeterExchangeRegisterDao;
-import com.rongwei.zhsw.system.dao.SwWaterMeterManagementDao;
-import com.rongwei.zhsw.system.dao.SwWaterUsageEntryDao;
-import com.rongwei.zhsw.system.service.SwMeterExchangeRegisterService;
-import com.rongwei.zhsw.system.service.SwUserManagementService;
+import com.rongwei.wechat.system.dao.SwMeterExchangeRegisterDao;
+import com.rongwei.wechat.system.dao.SwWaterMeterManagementDao;
+import com.rongwei.wechat.system.dao.SwWaterUsageEntryDao;
+import com.rongwei.wechat.system.service.SwMeterExchangeRegisterService;
+import com.rongwei.wechat.system.service.SwUserManagementService;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/impl/SwMeterReadingCorrectionServiceImpl.java

@@ -1,10 +1,10 @@
-package com.rongwei.zhsw.system.service.impl;
+package com.rongwei.wechat.system.service.impl;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rongwe.zhsw.system.domain.SwMeterReadingCorrectionDo;
-import com.rongwei.zhsw.system.dao.SwMeterReadingCorrectionDao;
-import com.rongwei.zhsw.system.service.SwMeterReadingCorrectionService;
+import com.rongwe.wechat.system.domain.SwMeterReadingCorrectionDo;
+import com.rongwei.wechat.system.dao.SwMeterReadingCorrectionDao;
+import com.rongwei.wechat.system.service.SwMeterReadingCorrectionService;
 import org.springframework.stereotype.Service;
 
 

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/impl/SwNotificationAnnouncementServiceImpl.java

@@ -1,9 +1,9 @@
-package com.rongwei.zhsw.system.service.impl;
+package com.rongwei.wechat.system.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rongwe.zhsw.system.domain.SwNotificationAnnouncementDo;
-import com.rongwei.zhsw.system.dao.SwNotificationAnnouncementDao;
-import com.rongwei.zhsw.system.service.SwNotificationAnnouncementService;
+import com.rongwe.wechat.system.domain.SwNotificationAnnouncementDo;
+import com.rongwei.wechat.system.dao.SwNotificationAnnouncementDao;
+import com.rongwei.wechat.system.service.SwNotificationAnnouncementService;
 import org.springframework.stereotype.Service;
 
 /**

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/impl/SwRefundRequestRecordServiceImpl.java

@@ -1,14 +1,14 @@
-package com.rongwei.zhsw.system.service.impl;
+package com.rongwei.wechat.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rongwe.zhsw.system.domain.*;
+import com.rongwe.wechat.system.domain.*;
 import com.rongwei.rwadmincommon.system.vo.SysUserVo;
 import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.utils.SecurityUtil;
-import com.rongwei.zhsw.system.dao.SwRefundRequestRecordDao;
-import com.rongwei.zhsw.system.service.*;
+import com.rongwei.wechat.system.dao.SwRefundRequestRecordDao;
+import com.rongwei.wechat.system.service.*;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -21,11 +21,11 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import com.rongwei.zhsw.system.utils.ZHSWCommonUtils;
+import com.rongwei.wechat.system.utils.ZHSWCommonUtils;
 
-import static com.rongwei.zhsw.system.utils.SaveConstans.billInfo.PENDINGSTATUS;
-import static com.rongwei.zhsw.system.utils.SaveConstans.billReccord.*;
-import static com.rongwei.zhsw.system.utils.SaveConstans.refundApply.*;
+import static com.rongwei.wechat.system.utils.SaveConstans.billInfo.PENDINGSTATUS;
+import static com.rongwei.wechat.system.utils.SaveConstans.billReccord.*;
+import static com.rongwei.wechat.system.utils.SaveConstans.refundApply.*;
 
 /**
  * 退款申请记录(SwRefundRequestRecord)表服务实现类

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/impl/SwUserManagementServiceImpl.java

@@ -1,10 +1,10 @@
-package com.rongwei.zhsw.system.service.impl;
+package com.rongwei.wechat.system.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rongwe.zhsw.system.domain.SwUserManagementDo;
-import com.rongwe.zhsw.system.dto.TransferAccountDo;
-import com.rongwei.zhsw.system.dao.SwUserManagementDao;
-import com.rongwei.zhsw.system.service.SwUserManagementService;
+import com.rongwe.wechat.system.domain.SwUserManagementDo;
+import com.rongwe.wechat.system.dto.TransferAccountDo;
+import com.rongwei.wechat.system.dao.SwUserManagementDao;
+import com.rongwei.wechat.system.service.SwUserManagementService;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/impl/SwUserRepairServiceImpl.java

@@ -1,10 +1,10 @@
-package com.rongwei.zhsw.system.service.impl;
+package com.rongwei.wechat.system.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rongwe.zhsw.system.domain.SwUserRepairDo;
-import com.rongwei.zhsw.system.dao.SwUserRepairDao;
+import com.rongwe.wechat.system.domain.SwUserRepairDo;
+import com.rongwei.wechat.system.dao.SwUserRepairDao;
 
-import com.rongwei.zhsw.system.service.SwUserRepairService;
+import com.rongwei.wechat.system.service.SwUserRepairService;
 import org.springframework.stereotype.Service;
 
 /**

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/impl/SwUserWechatServiceImpl.java

@@ -1,9 +1,9 @@
-package com.rongwei.zhsw.system.service.impl;
+package com.rongwei.wechat.system.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rongwe.zhsw.system.domain.SwUserWechatDo;
-import com.rongwei.zhsw.system.dao.SwUserWechatDao;
-import com.rongwei.zhsw.system.service.SwUserWechatService;
+import com.rongwe.wechat.system.domain.SwUserWechatDo;
+import com.rongwei.wechat.system.dao.SwUserWechatDao;
+import com.rongwei.wechat.system.service.SwUserWechatService;
 import org.springframework.stereotype.Service;
 
 /**

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/impl/SwWaterMeterManagementServiceImpl.java

@@ -1,10 +1,10 @@
-package com.rongwei.zhsw.system.service.impl;
+package com.rongwei.wechat.system.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rongwe.zhsw.system.domain.SwWaterMeterManagementDo;
-import com.rongwei.zhsw.system.dao.SwWaterMeterManagementDao;
+import com.rongwe.wechat.system.domain.SwWaterMeterManagementDo;
+import com.rongwei.wechat.system.dao.SwWaterMeterManagementDao;
 
-import com.rongwei.zhsw.system.service.SwWaterMeterManagementService;
+import com.rongwei.wechat.system.service.SwWaterMeterManagementService;
 import org.springframework.stereotype.Service;
 
 /**

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/impl/SwWaterUsageEntryServiceImpl.java

@@ -1,9 +1,9 @@
-package com.rongwei.zhsw.system.service.impl;
+package com.rongwei.wechat.system.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rongwe.zhsw.system.domain.SwWaterUsageEntryDo;
-import com.rongwei.zhsw.system.dao.SwWaterUsageEntryDao;
-import com.rongwei.zhsw.system.service.SwWaterUsageEntryService;
+import com.rongwe.wechat.system.domain.SwWaterUsageEntryDo;
+import com.rongwei.wechat.system.dao.SwWaterUsageEntryDao;
+import com.rongwei.wechat.system.service.SwWaterUsageEntryService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/impl/SysNotifyAnnounceUserServiceImpl.java

@@ -1,9 +1,9 @@
-package com.rongwei.zhsw.system.service.impl;
+package com.rongwei.wechat.system.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rongwei.zhsw.system.dao.SysNotifyAnnounceUserDao;
-import com.rongwe.zhsw.system.domain.SysNotifyAnnounceUserDo;
-import com.rongwei.zhsw.system.service.SysNotifyAnnounceUserService;
+import com.rongwei.wechat.system.dao.SysNotifyAnnounceUserDao;
+import com.rongwe.wechat.system.domain.SysNotifyAnnounceUserDo;
+import com.rongwei.wechat.system.service.SysNotifyAnnounceUserService;
 import org.springframework.stereotype.Service;
 
 /**

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/impl/WaterUsageServiceImpl.java

@@ -1,15 +1,15 @@
-package com.rongwei.zhsw.system.service.impl;
+package com.rongwei.wechat.system.service.impl;
 
-import com.rongwe.zhsw.system.domain.SwUserManagementDo;
-import com.rongwe.zhsw.system.domain.SwWaterUsageEntryDo;
-import com.rongwe.zhsw.system.vo.ManualMeterReadingVo;
+import com.rongwe.wechat.system.domain.SwUserManagementDo;
+import com.rongwe.wechat.system.domain.SwWaterUsageEntryDo;
+import com.rongwe.wechat.system.vo.ManualMeterReadingVo;
 import com.rongwei.rwadmincommon.system.vo.SysUserVo;
 import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.base.exception.CustomException;
 import com.rongwei.rwcommon.utils.SecurityUtil;
-import com.rongwei.zhsw.system.config.ContextHolder;
-import com.rongwei.zhsw.system.service.WaterUsageService;
-import com.rongwei.zhsw.system.utils.ZHSWCommonUtils;
+import com.rongwei.wechat.system.config.ContextHolder;
+import com.rongwei.wechat.system.service.WaterUsageService;
+import com.rongwei.wechat.system.utils.ZHSWCommonUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/impl/WaterWorksServiceImpl.java

@@ -1,13 +1,13 @@
-package com.rongwei.zhsw.system.service.impl;
+package com.rongwei.wechat.system.service.impl;
 
-import com.rongwe.zhsw.system.domain.SwBusinesshallDo;
-import com.rongwe.zhsw.system.domain.SwEnterpriseConfigInfoDo;
-import com.rongwe.zhsw.system.vo.WeChatPickerVo;
+import com.rongwe.wechat.system.domain.SwBusinesshallDo;
+import com.rongwe.wechat.system.domain.SwEnterpriseConfigInfoDo;
+import com.rongwe.wechat.system.vo.WeChatPickerVo;
 import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommonentity.commonservers.domain.TenantDo;
-import com.rongwei.zhsw.system.dao.CommonBusinessDao;
-import com.rongwei.zhsw.system.dao.SwNotificationAnnouncementDao;
-import com.rongwei.zhsw.system.service.WaterWorksService;
+import com.rongwei.wechat.system.dao.CommonBusinessDao;
+import com.rongwei.wechat.system.dao.SwNotificationAnnouncementDao;
+import com.rongwei.wechat.system.service.WaterWorksService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/service/impl/WeChatUnbindServiceImpl.java

@@ -1,15 +1,15 @@
-package com.rongwei.zhsw.system.service.impl;
+package com.rongwei.wechat.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.rongwe.zhsw.system.domain.SwUserManagementDo;
-import com.rongwe.zhsw.system.domain.SwUserWechatDo;
-import com.rongwe.zhsw.system.dto.UnbindWechatRequest;
+import com.rongwe.wechat.system.domain.SwUserManagementDo;
+import com.rongwe.wechat.system.domain.SwUserWechatDo;
+import com.rongwe.wechat.system.dto.UnbindWechatRequest;
 import com.rongwei.rwcommon.base.R;
-import com.rongwei.zhsw.system.service.SwUserManagementService;
-import com.rongwei.zhsw.system.service.SwUserWechatService;
-import com.rongwei.zhsw.system.service.WeChatUnbindService;
-import com.rongwei.zhsw.system.wechat.OwnerService;
+import com.rongwei.wechat.system.service.SwUserManagementService;
+import com.rongwei.wechat.system.service.SwUserWechatService;
+import com.rongwei.wechat.system.service.WeChatUnbindService;
+import com.rongwei.wechat.system.wechat.OwnerService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/utils/EnvironmentAwareResourceLoader.java

@@ -1,4 +1,4 @@
-package com.rongwei.zhsw.system.utils;
+package com.rongwei.wechat.system.utils;
 
 import com.rongwei.rwcommon.base.exception.CustomException;
 import com.rongwei.rwcommon.utils.StringUtils;

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/utils/NumberToChineseUppercaseUtils.java

@@ -1,4 +1,4 @@
-package com.rongwei.zhsw.system.utils;
+package com.rongwei.wechat.system.utils;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/utils/SaveConstans.java

@@ -1,4 +1,4 @@
-package com.rongwei.zhsw.system.utils;
+package com.rongwei.wechat.system.utils;
 
 import java.util.ArrayList;
 import java.util.List;

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/utils/WeChatUtils.java

@@ -1,11 +1,11 @@
-package com.rongwei.zhsw.system.utils;
+package com.rongwei.wechat.system.utils;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.rongwe.zhsw.system.vo.WeChatLoginReturnVo;
+import com.rongwe.wechat.system.vo.WeChatLoginReturnVo;
 import com.rongwei.commonservice.service.RedisService;
 import com.rongwei.rwadmincommon.system.vo.SysUserVo;
 import com.rongwei.rwcommon.base.exception.CustomException;
-import com.rongwei.zhsw.system.config.WeChatAboutApiPara;
+import com.rongwei.wechat.system.config.WeChatAboutApiPara;
 import org.apache.commons.lang.StringUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.config.RequestConfig;
@@ -25,7 +25,7 @@ import javax.annotation.PostConstruct;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 
-import static com.rongwei.zhsw.system.utils.SaveConstans.REDIS_OWNER_KEY;
+import static com.rongwei.wechat.system.utils.SaveConstans.REDIS_OWNER_KEY;
 
 /**
  * WeChatUtils class

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/utils/WxMessageUtils.java

@@ -1,4 +1,4 @@
-package com.rongwei.zhsw.system.utils;
+package com.rongwei.wechat.system.utils;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/utils/WxPayApi.java

@@ -1,6 +1,6 @@
-package com.rongwei.zhsw.system.utils;
+package com.rongwei.wechat.system.utils;
 
-import com.rongwe.zhsw.system.vo.WxPrepayOrderVo;
+import com.rongwe.wechat.system.vo.WxPrepayOrderVo;
 import com.wechat.pay.java.core.Config;
 import com.wechat.pay.java.core.RSAAutoCertificateConfig;
 import com.wechat.pay.java.service.payments.jsapi.JsapiServiceExtension;
@@ -77,7 +77,7 @@ public class WxPayApi {
         request.setDescription(vo.getDescription());
         request.setOutTradeNo(vo.getOutTradeNo());
         // 接收通知的url
-        request.setNotifyUrl(notifyUrl + vo.getDskey());
+        request.setNotifyUrl(notifyUrl + vo.getDskey()+"/"+vo.getTotalAmount()+"/"+vo.getUserNumber());
         Amount amount = new Amount();
         amount.setTotal(vo.getTotalAmount());
         amount.setCurrency("CNY");

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/utils/WxRefundApi.java

@@ -1,4 +1,4 @@
-package com.rongwei.zhsw.system.utils;
+package com.rongwei.wechat.system.utils;
 
 import com.wechat.pay.java.core.Config;
 import com.wechat.pay.java.core.RSAAutoCertificateConfig;

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/utils/ZHSWCommonUtils.java

@@ -1,4 +1,4 @@
-package com.rongwei.zhsw.system.utils;
+package com.rongwei.wechat.system.utils;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/wechat/AccountService.java

@@ -1,8 +1,8 @@
-package com.rongwei.zhsw.system.wechat;
+package com.rongwei.wechat.system.wechat;
 
-import com.rongwe.zhsw.system.vo.AccountBindVo;
-import com.rongwe.zhsw.system.vo.AccountUnbindVo;
-import com.rongwe.zhsw.system.vo.ReadStatusVo;
+import com.rongwe.wechat.system.vo.AccountBindVo;
+import com.rongwe.wechat.system.vo.AccountUnbindVo;
+import com.rongwe.wechat.system.vo.ReadStatusVo;
 import com.rongwei.rwcommon.base.R;
 
 /**

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/wechat/BillService.java

@@ -1,6 +1,6 @@
-package com.rongwei.zhsw.system.wechat;
+package com.rongwei.wechat.system.wechat;
 
-import com.rongwe.zhsw.system.vo.BillListSearchVo;
+import com.rongwe.wechat.system.vo.BillListSearchVo;
 import com.rongwei.rwcommon.base.R;
 
 /**

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/wechat/OwnerService.java

@@ -1,4 +1,4 @@
-package com.rongwei.zhsw.system.wechat;
+package com.rongwei.wechat.system.wechat;
 
 import com.rongwei.rwcommon.base.R;
 

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/wechat/PayMentService.java

@@ -1,11 +1,12 @@
-package com.rongwei.zhsw.system.wechat;
+package com.rongwei.wechat.system.wechat;
 
-import com.rongwe.zhsw.system.vo.PrepayNoticeVo;
-import com.rongwe.zhsw.system.vo.WxPrepayOrderVo;
+import com.rongwe.wechat.system.vo.PrepayNoticeVo;
+import com.rongwe.wechat.system.vo.WxPrepayOrderVo;
 import com.rongwei.rwcommon.base.R;
 import org.springframework.http.ResponseEntity;
 
 import java.io.IOException;
+import java.math.BigDecimal;
 
 /**
  * PayMentService class
@@ -16,5 +17,5 @@ import java.io.IOException;
 public interface PayMentService {
     R paymentInitiation(WxPrepayOrderVo vo);
 
-    ResponseEntity<String> prepayNotice(PrepayNoticeVo prepayNoticeVo, String dskey) throws IOException;
+    ResponseEntity<String> prepayNotice(PrepayNoticeVo prepayNoticeVo, String dskey, BigDecimal amount,String userNum) throws IOException;
 }

zhsw-wechat-common/src/main/java/com/rongwei/zhsw/system/wechat/PaymentRecordService.java

@@ -1,7 +1,7 @@
-package com.rongwei.zhsw.system.wechat;
+package com.rongwei.wechat.system.wechat;
 
-import com.rongwe.zhsw.system.vo.CreatePaymentRecordVo;
-import com.rongwe.zhsw.system.vo.PaymentRocordVo;
+import com.rongwe.wechat.system.vo.CreatePaymentRecordVo;
+import com.rongwe.wechat.system.vo.PaymentRocordVo;
 import com.rongwei.rwcommon.base.R;
 
 public interface PaymentRecordService {