diff --git a/service/service-cbs/service-cbs.iml b/service/service-cbs/service-cbs.iml new file mode 100644 index 00000000..bf55dba9 --- /dev/null +++ b/service/service-cbs/service-cbs.iml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/IAgentPaymentDao.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/dao/IAgentPaymentDao.java similarity index 67% rename from service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/IAgentPaymentDao.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/dao/IAgentPaymentDao.java index 5336cd91..345e1d4b 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/IAgentPaymentDao.java +++ b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/dao/IAgentPaymentDao.java @@ -1,7 +1,7 @@ -package com.hzya.frame.seeyon.cbs8.dao; +package com.hzya.frame.cbs8.dao; import com.hzya.frame.basedao.dao.IBaseDao; -import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentEntity; +import com.hzya.frame.cbs8.entity.AgentPaymentEntity; /** * @Description 代发代扣 diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/IAgentPaymentDetailDao.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/dao/IAgentPaymentDetailDao.java similarity index 68% rename from service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/IAgentPaymentDetailDao.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/dao/IAgentPaymentDetailDao.java index 96895bb4..cc27fb6b 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/IAgentPaymentDetailDao.java +++ b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/dao/IAgentPaymentDetailDao.java @@ -1,7 +1,7 @@ -package com.hzya.frame.seeyon.cbs8.dao; +package com.hzya.frame.cbs8.dao; import com.hzya.frame.basedao.dao.IBaseDao; -import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentDetailEntity; +import com.hzya.frame.cbs8.entity.AgentPaymentDetailEntity; /** * @Description 代发代扣明细 diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/ICbsLogDao.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/dao/ICbsLogDao.java similarity index 68% rename from service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/ICbsLogDao.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/dao/ICbsLogDao.java index 032d1a3e..94971f13 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/ICbsLogDao.java +++ b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/dao/ICbsLogDao.java @@ -1,7 +1,7 @@ -package com.hzya.frame.seeyon.cbs8.dao; +package com.hzya.frame.cbs8.dao; import com.hzya.frame.basedao.dao.IBaseDao; -import com.hzya.frame.seeyon.cbs8.entity.CbsLogEntity; +import com.hzya.frame.cbs8.entity.CbsLogEntity; /** * @Description cbs8支付日志 diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/IPaymentDao.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/dao/IPaymentDao.java similarity index 59% rename from service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/IPaymentDao.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/dao/IPaymentDao.java index c8a18848..ea7dba31 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/IPaymentDao.java +++ b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/dao/IPaymentDao.java @@ -1,7 +1,7 @@ -package com.hzya.frame.seeyon.cbs8.dao; +package com.hzya.frame.cbs8.dao; import com.hzya.frame.basedao.dao.IBaseDao; -import com.hzya.frame.seeyon.cbs8.entity.PaymentEntity; +import com.hzya.frame.cbs8.entity.PaymentEntity; /** * oa集成cbs diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/ITransactionDetailDao.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/dao/ITransactionDetailDao.java similarity index 68% rename from service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/ITransactionDetailDao.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/dao/ITransactionDetailDao.java index 37cf015a..088894e9 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/ITransactionDetailDao.java +++ b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/dao/ITransactionDetailDao.java @@ -1,7 +1,7 @@ -package com.hzya.frame.seeyon.cbs8.dao; +package com.hzya.frame.cbs8.dao; import com.hzya.frame.basedao.dao.IBaseDao; -import com.hzya.frame.seeyon.cbs8.entity.TransactionDetailEntity; +import com.hzya.frame.cbs8.entity.TransactionDetailEntity; /** * @Description cbs交易明细 oa底表 diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/impl/AgentPaymentDaoImpl.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/dao/impl/AgentPaymentDaoImpl.java similarity index 67% rename from service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/impl/AgentPaymentDaoImpl.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/dao/impl/AgentPaymentDaoImpl.java index 5b2e3852..3d065f06 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/impl/AgentPaymentDaoImpl.java +++ b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/dao/impl/AgentPaymentDaoImpl.java @@ -1,8 +1,8 @@ -package com.hzya.frame.seeyon.cbs8.dao.impl; +package com.hzya.frame.cbs8.dao.impl; import com.hzya.frame.basedao.dao.MybatisGenericDao; -import com.hzya.frame.seeyon.cbs8.dao.IAgentPaymentDao; -import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentEntity; +import com.hzya.frame.cbs8.dao.IAgentPaymentDao; +import com.hzya.frame.cbs8.entity.AgentPaymentEntity; import org.springframework.stereotype.Repository; /** diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/impl/AgentPaymentDetailDaoImpl.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/dao/impl/AgentPaymentDetailDaoImpl.java similarity index 67% rename from service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/impl/AgentPaymentDetailDaoImpl.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/dao/impl/AgentPaymentDetailDaoImpl.java index 2b873067..5195fa60 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/impl/AgentPaymentDetailDaoImpl.java +++ b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/dao/impl/AgentPaymentDetailDaoImpl.java @@ -1,8 +1,8 @@ -package com.hzya.frame.seeyon.cbs8.dao.impl; +package com.hzya.frame.cbs8.dao.impl; import com.hzya.frame.basedao.dao.MybatisGenericDao; -import com.hzya.frame.seeyon.cbs8.dao.IAgentPaymentDetailDao; -import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentDetailEntity; +import com.hzya.frame.cbs8.dao.IAgentPaymentDetailDao; +import com.hzya.frame.cbs8.entity.AgentPaymentDetailEntity; import org.springframework.stereotype.Repository; /** diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/impl/CbsLogDaoImpl.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/dao/impl/CbsLogDaoImpl.java similarity index 65% rename from service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/impl/CbsLogDaoImpl.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/dao/impl/CbsLogDaoImpl.java index a42437b0..4cd2673d 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/impl/CbsLogDaoImpl.java +++ b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/dao/impl/CbsLogDaoImpl.java @@ -1,8 +1,8 @@ -package com.hzya.frame.seeyon.cbs8.dao.impl; +package com.hzya.frame.cbs8.dao.impl; import com.hzya.frame.basedao.dao.MybatisGenericDao; -import com.hzya.frame.seeyon.cbs8.dao.ICbsLogDao; -import com.hzya.frame.seeyon.cbs8.entity.CbsLogEntity; +import com.hzya.frame.cbs8.dao.ICbsLogDao; +import com.hzya.frame.cbs8.entity.CbsLogEntity; import org.springframework.stereotype.Repository; /** diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/impl/PaymentDaoImpl.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/dao/impl/PaymentDaoImpl.java similarity index 68% rename from service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/impl/PaymentDaoImpl.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/dao/impl/PaymentDaoImpl.java index f2744983..07bbd65f 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/impl/PaymentDaoImpl.java +++ b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/dao/impl/PaymentDaoImpl.java @@ -1,8 +1,8 @@ -package com.hzya.frame.seeyon.cbs8.dao.impl; +package com.hzya.frame.cbs8.dao.impl; import com.hzya.frame.basedao.dao.MybatisGenericDao; -import com.hzya.frame.seeyon.cbs8.dao.IPaymentDao; -import com.hzya.frame.seeyon.cbs8.entity.PaymentEntity; +import com.hzya.frame.cbs8.dao.IPaymentDao; +import com.hzya.frame.cbs8.entity.PaymentEntity; import org.springframework.stereotype.Repository; /** diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/impl/TransactionDetailDaoImpl.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/dao/impl/TransactionDetailDaoImpl.java similarity index 55% rename from service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/impl/TransactionDetailDaoImpl.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/dao/impl/TransactionDetailDaoImpl.java index e4fb1bac..a8f6bf5b 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/impl/TransactionDetailDaoImpl.java +++ b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/dao/impl/TransactionDetailDaoImpl.java @@ -1,10 +1,8 @@ -package com.hzya.frame.seeyon.cbs8.dao.impl; +package com.hzya.frame.cbs8.dao.impl; import com.hzya.frame.basedao.dao.MybatisGenericDao; -import com.hzya.frame.seeyon.cbs8.dao.IPaymentDao; -import com.hzya.frame.seeyon.cbs8.dao.ITransactionDetailDao; -import com.hzya.frame.seeyon.cbs8.entity.PaymentEntity; -import com.hzya.frame.seeyon.cbs8.entity.TransactionDetailEntity; +import com.hzya.frame.cbs8.dao.ITransactionDetailDao; +import com.hzya.frame.cbs8.entity.TransactionDetailEntity; import org.springframework.stereotype.Repository; /** diff --git a/service/src/main/java/com/hzya/frame/cbs8/dto/req/AgentPayRequestDTO.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/dto/req/AgentPayRequestDTO.java similarity index 100% rename from service/src/main/java/com/hzya/frame/cbs8/dto/req/AgentPayRequestDTO.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/dto/req/AgentPayRequestDTO.java diff --git a/service/src/main/java/com/hzya/frame/cbs8/dto/req/AgentPayResultRequestDTO.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/dto/req/AgentPayResultRequestDTO.java similarity index 100% rename from service/src/main/java/com/hzya/frame/cbs8/dto/req/AgentPayResultRequestDTO.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/dto/req/AgentPayResultRequestDTO.java diff --git a/service/src/main/java/com/hzya/frame/cbs8/dto/req/ElecRequestDTO.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/dto/req/ElecRequestDTO.java similarity index 100% rename from service/src/main/java/com/hzya/frame/cbs8/dto/req/ElecRequestDTO.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/dto/req/ElecRequestDTO.java diff --git a/service/src/main/java/com/hzya/frame/cbs8/dto/req/PayRequestDTO.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/dto/req/PayRequestDTO.java similarity index 100% rename from service/src/main/java/com/hzya/frame/cbs8/dto/req/PayRequestDTO.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/dto/req/PayRequestDTO.java diff --git a/service/src/main/java/com/hzya/frame/cbs8/dto/req/PayResultRequestDTO.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/dto/req/PayResultRequestDTO.java similarity index 100% rename from service/src/main/java/com/hzya/frame/cbs8/dto/req/PayResultRequestDTO.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/dto/req/PayResultRequestDTO.java diff --git a/service/src/main/java/com/hzya/frame/cbs8/dto/req/PaymentApplyAgentDTO.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/dto/req/PaymentApplyAgentDTO.java similarity index 100% rename from service/src/main/java/com/hzya/frame/cbs8/dto/req/PaymentApplyAgentDTO.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/dto/req/PaymentApplyAgentDTO.java diff --git a/service/src/main/java/com/hzya/frame/cbs8/dto/req/PaymentApplySubmitReqDTO.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/dto/req/PaymentApplySubmitReqDTO.java similarity index 100% rename from service/src/main/java/com/hzya/frame/cbs8/dto/req/PaymentApplySubmitReqDTO.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/dto/req/PaymentApplySubmitReqDTO.java diff --git a/service/src/main/java/com/hzya/frame/cbs8/dto/req/TransactionDetailReqDTO.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/dto/req/TransactionDetailReqDTO.java similarity index 100% rename from service/src/main/java/com/hzya/frame/cbs8/dto/req/TransactionDetailReqDTO.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/dto/req/TransactionDetailReqDTO.java diff --git a/service/src/main/java/com/hzya/frame/cbs8/dto/res/AgentPayQueryDTO.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/dto/res/AgentPayQueryDTO.java similarity index 100% rename from service/src/main/java/com/hzya/frame/cbs8/dto/res/AgentPayQueryDTO.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/dto/res/AgentPayQueryDTO.java diff --git a/service/src/main/java/com/hzya/frame/cbs8/dto/res/AgentPayResultResDTO.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/dto/res/AgentPayResultResDTO.java similarity index 100% rename from service/src/main/java/com/hzya/frame/cbs8/dto/res/AgentPayResultResDTO.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/dto/res/AgentPayResultResDTO.java diff --git a/service/src/main/java/com/hzya/frame/cbs8/dto/res/CbsResDataDTO.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/dto/res/CbsResDataDTO.java similarity index 100% rename from service/src/main/java/com/hzya/frame/cbs8/dto/res/CbsResDataDTO.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/dto/res/CbsResDataDTO.java diff --git a/service/src/main/java/com/hzya/frame/cbs8/dto/res/CbsResponseDTO.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/dto/res/CbsResponseDTO.java similarity index 100% rename from service/src/main/java/com/hzya/frame/cbs8/dto/res/CbsResponseDTO.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/dto/res/CbsResponseDTO.java diff --git a/service/src/main/java/com/hzya/frame/cbs8/dto/res/ElecResponseDTO.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/dto/res/ElecResponseDTO.java similarity index 100% rename from service/src/main/java/com/hzya/frame/cbs8/dto/res/ElecResponseDTO.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/dto/res/ElecResponseDTO.java diff --git a/service/src/main/java/com/hzya/frame/cbs8/dto/res/PayResponseDTO.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/dto/res/PayResponseDTO.java similarity index 100% rename from service/src/main/java/com/hzya/frame/cbs8/dto/res/PayResponseDTO.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/dto/res/PayResponseDTO.java diff --git a/service/src/main/java/com/hzya/frame/cbs8/dto/res/PayResultResDTO.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/dto/res/PayResultResDTO.java similarity index 100% rename from service/src/main/java/com/hzya/frame/cbs8/dto/res/PayResultResDTO.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/dto/res/PayResultResDTO.java diff --git a/service/src/main/java/com/hzya/frame/cbs8/dto/res/TransactionDetailDTO.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/dto/res/TransactionDetailDTO.java similarity index 100% rename from service/src/main/java/com/hzya/frame/cbs8/dto/res/TransactionDetailDTO.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/dto/res/TransactionDetailDTO.java diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentDetailEntity.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/entity/AgentPaymentDetailEntity.java similarity index 98% rename from service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentDetailEntity.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/entity/AgentPaymentDetailEntity.java index 4776058c..eaca6637 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentDetailEntity.java +++ b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/entity/AgentPaymentDetailEntity.java @@ -1,4 +1,4 @@ -package com.hzya.frame.seeyon.cbs8.entity; +package com.hzya.frame.cbs8.entity; import com.hzya.frame.web.entity.BaseEntity; diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentDetailEntity.xml b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/entity/AgentPaymentDetailEntity.xml similarity index 92% rename from service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentDetailEntity.xml rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/entity/AgentPaymentDetailEntity.xml index 43869fc1..0d809341 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentDetailEntity.xml +++ b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/entity/AgentPaymentDetailEntity.xml @@ -1,7 +1,7 @@ - + @@ -31,7 +31,7 @@ - select from ( @@ -63,7 +63,7 @@ - + update formson_0225 set field0045 =#{payDate}, @@ -73,7 +73,7 @@ - + update formson_0225 set field0045 =#{payDate}, diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentEntity.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/entity/AgentPaymentEntity.java similarity index 98% rename from service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentEntity.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/entity/AgentPaymentEntity.java index b4b2748a..64532548 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentEntity.java +++ b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/entity/AgentPaymentEntity.java @@ -1,4 +1,4 @@ -package com.hzya.frame.seeyon.cbs8.entity; +package com.hzya.frame.cbs8.entity; import com.hzya.frame.web.entity.BaseEntity; diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentEntity.xml b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/entity/AgentPaymentEntity.xml similarity index 95% rename from service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentEntity.xml rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/entity/AgentPaymentEntity.xml index c0b0f6f0..f70d26cc 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentEntity.xml +++ b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/entity/AgentPaymentEntity.xml @@ -1,7 +1,7 @@ - + @@ -35,7 +35,7 @@ - select from ( @@ -74,7 +74,7 @@ - select from ( @@ -115,7 +115,7 @@ - + update formmain_0224 set field0043 =#{applyCode}, diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/CbsLogEntity.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/entity/CbsLogEntity.java similarity index 98% rename from service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/CbsLogEntity.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/entity/CbsLogEntity.java index 21cc1a4f..badb2f7c 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/CbsLogEntity.java +++ b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/entity/CbsLogEntity.java @@ -1,4 +1,4 @@ -package com.hzya.frame.seeyon.cbs8.entity; +package com.hzya.frame.cbs8.entity; import com.hzya.frame.web.entity.BaseEntity; diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/CbsLogEntity.xml b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/entity/CbsLogEntity.xml similarity index 94% rename from service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/CbsLogEntity.xml rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/entity/CbsLogEntity.xml index 3e03a88a..77ffe00b 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/CbsLogEntity.xml +++ b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/entity/CbsLogEntity.xml @@ -1,7 +1,7 @@ - + @@ -35,7 +35,7 @@ - select from @@ -56,7 +56,7 @@ - select from @@ -78,7 +78,7 @@ - select from @@ -100,7 +100,7 @@ - + update formmain_0232 set field0010 =#{pay_state}, diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/PaymentEntity.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/entity/PaymentEntity.java similarity index 99% rename from service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/PaymentEntity.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/entity/PaymentEntity.java index 9f68e3ff..c98cfb5f 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/PaymentEntity.java +++ b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/entity/PaymentEntity.java @@ -1,4 +1,4 @@ -package com.hzya.frame.seeyon.cbs8.entity; +package com.hzya.frame.cbs8.entity; import com.hzya.frame.web.entity.BaseEntity; diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/PaymentEntity.xml b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/entity/PaymentEntity.xml similarity index 97% rename from service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/PaymentEntity.xml rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/entity/PaymentEntity.xml index b8d3deee..31ab1d30 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/PaymentEntity.xml +++ b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/entity/PaymentEntity.xml @@ -1,7 +1,7 @@ - + @@ -143,7 +143,7 @@ left join ORG_UNIT unit on unit.id =formmain_0209.field0002 - select v.* from ( ) v @@ -176,7 +176,7 @@ - - select v.* from ( ) v @@ -284,7 +284,7 @@ - select from @@ -321,7 +321,7 @@ - + update ${tableName} set ${payDateField} =#{payDate}, @@ -332,7 +332,7 @@ - + update ${tableName} set ${receiptFiled}=#{receipt} where id = #{oaId} and ${receiptFiled} is null diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/TransactionDetailEntity.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/entity/TransactionDetailEntity.java similarity index 98% rename from service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/TransactionDetailEntity.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/entity/TransactionDetailEntity.java index e1d66a2d..3af83920 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/TransactionDetailEntity.java +++ b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/entity/TransactionDetailEntity.java @@ -1,4 +1,4 @@ -package com.hzya.frame.seeyon.cbs8.entity; +package com.hzya.frame.cbs8.entity; import com.hzya.frame.web.entity.BaseEntity; diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/TransactionDetailEntity.xml b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/entity/TransactionDetailEntity.xml similarity index 97% rename from service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/TransactionDetailEntity.xml rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/entity/TransactionDetailEntity.xml index 3fa7fc60..0e6af3b5 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/TransactionDetailEntity.xml +++ b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/entity/TransactionDetailEntity.xml @@ -1,7 +1,7 @@ - + @@ -39,7 +39,7 @@ - select from @@ -64,7 +64,7 @@ - select field0005 as transactionSerialNumber from diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/IAgentPaymentDetailService.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/IAgentPaymentDetailService.java similarity index 68% rename from service/src/main/java/com/hzya/frame/seeyon/cbs8/service/IAgentPaymentDetailService.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/IAgentPaymentDetailService.java index f0a4811b..9d44d5a9 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/IAgentPaymentDetailService.java +++ b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/IAgentPaymentDetailService.java @@ -1,8 +1,7 @@ -package com.hzya.frame.seeyon.cbs8.service; +package com.hzya.frame.cbs8.service; import com.hzya.frame.basedao.service.IBaseService; -import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentDetailEntity; -import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentEntity; +import com.hzya.frame.cbs8.entity.AgentPaymentDetailEntity; /** * @Description 代发代扣明细 diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/IAgentPaymentService.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/IAgentPaymentService.java similarity index 85% rename from service/src/main/java/com/hzya/frame/seeyon/cbs8/service/IAgentPaymentService.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/IAgentPaymentService.java index dcb6d78f..04266991 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/IAgentPaymentService.java +++ b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/IAgentPaymentService.java @@ -1,8 +1,8 @@ -package com.hzya.frame.seeyon.cbs8.service; +package com.hzya.frame.cbs8.service; import com.hzya.frame.basedao.service.IBaseService; -import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentDetailEntity; -import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentEntity; +import com.hzya.frame.cbs8.entity.AgentPaymentDetailEntity; +import com.hzya.frame.cbs8.entity.AgentPaymentEntity; import java.util.List; diff --git a/service/src/main/java/com/hzya/frame/cbs8/service/ICbs8ExtService.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/ICbs8ExtService.java similarity index 100% rename from service/src/main/java/com/hzya/frame/cbs8/service/ICbs8ExtService.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/ICbs8ExtService.java diff --git a/service/src/main/java/com/hzya/frame/cbs8/service/ICbs8Service.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/ICbs8Service.java similarity index 97% rename from service/src/main/java/com/hzya/frame/cbs8/service/ICbs8Service.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/ICbs8Service.java index 2b55c362..51b402dc 100644 --- a/service/src/main/java/com/hzya/frame/cbs8/service/ICbs8Service.java +++ b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/ICbs8Service.java @@ -3,7 +3,7 @@ package com.hzya.frame.cbs8.service; import com.alibaba.fastjson.JSONObject; import com.hzya.frame.cbs8.dto.req.*; import com.hzya.frame.cbs8.dto.res.*; -import com.hzya.frame.seeyon.cbs8.entity.PaymentEntity; +import com.hzya.frame.cbs8.entity.PaymentEntity; import java.util.List; diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/ICbsLogService.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/ICbsLogService.java similarity index 92% rename from service/src/main/java/com/hzya/frame/seeyon/cbs8/service/ICbsLogService.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/ICbsLogService.java index 7160c21f..4a707900 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/ICbsLogService.java +++ b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/ICbsLogService.java @@ -1,8 +1,8 @@ -package com.hzya.frame.seeyon.cbs8.service; +package com.hzya.frame.cbs8.service; import com.alibaba.fastjson.JSONObject; import com.hzya.frame.basedao.service.IBaseService; -import com.hzya.frame.seeyon.cbs8.entity.CbsLogEntity; +import com.hzya.frame.cbs8.entity.CbsLogEntity; import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity; import java.util.List; diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/IPaymentService.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/IPaymentService.java similarity index 94% rename from service/src/main/java/com/hzya/frame/seeyon/cbs8/service/IPaymentService.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/IPaymentService.java index 4243084c..03d32360 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/IPaymentService.java +++ b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/IPaymentService.java @@ -1,7 +1,7 @@ -package com.hzya.frame.seeyon.cbs8.service; +package com.hzya.frame.cbs8.service; import com.hzya.frame.basedao.service.IBaseService; -import com.hzya.frame.seeyon.cbs8.entity.PaymentEntity; +import com.hzya.frame.cbs8.entity.PaymentEntity; import java.util.List; diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/ITransactionDetailService.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/ITransactionDetailService.java similarity index 84% rename from service/src/main/java/com/hzya/frame/seeyon/cbs8/service/ITransactionDetailService.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/ITransactionDetailService.java index 61126686..d262a33a 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/ITransactionDetailService.java +++ b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/ITransactionDetailService.java @@ -1,7 +1,7 @@ -package com.hzya.frame.seeyon.cbs8.service; +package com.hzya.frame.cbs8.service; import com.hzya.frame.basedao.service.IBaseService; -import com.hzya.frame.seeyon.cbs8.entity.TransactionDetailEntity; +import com.hzya.frame.cbs8.entity.TransactionDetailEntity; import java.util.List; diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/impl/AgentPaymentDetailServiceImpl.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/impl/AgentPaymentDetailServiceImpl.java similarity index 74% rename from service/src/main/java/com/hzya/frame/seeyon/cbs8/service/impl/AgentPaymentDetailServiceImpl.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/impl/AgentPaymentDetailServiceImpl.java index 8bbbad34..cc3f6ad5 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/impl/AgentPaymentDetailServiceImpl.java +++ b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/impl/AgentPaymentDetailServiceImpl.java @@ -1,12 +1,10 @@ -package com.hzya.frame.seeyon.cbs8.service.impl; +package com.hzya.frame.cbs8.service.impl; import com.baomidou.dynamic.datasource.annotation.DS; import com.hzya.frame.basedao.service.impl.BaseService; -import com.hzya.frame.seeyon.cbs8.dao.IAgentPaymentDetailDao; -import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentDetailEntity; -import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentEntity; -import com.hzya.frame.seeyon.cbs8.service.IAgentPaymentDetailService; -import com.hzya.frame.seeyon.cbs8.service.IAgentPaymentService; +import com.hzya.frame.cbs8.dao.IAgentPaymentDetailDao; +import com.hzya.frame.cbs8.entity.AgentPaymentDetailEntity; +import com.hzya.frame.cbs8.service.IAgentPaymentDetailService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/impl/AgentPaymentServiceImpl.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/impl/AgentPaymentServiceImpl.java similarity index 86% rename from service/src/main/java/com/hzya/frame/seeyon/cbs8/service/impl/AgentPaymentServiceImpl.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/impl/AgentPaymentServiceImpl.java index ab3ab4b9..c86eecdc 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/impl/AgentPaymentServiceImpl.java +++ b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/impl/AgentPaymentServiceImpl.java @@ -1,14 +1,13 @@ -package com.hzya.frame.seeyon.cbs8.service.impl; +package com.hzya.frame.cbs8.service.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.dynamic.datasource.annotation.DS; import com.hzya.frame.basedao.service.impl.BaseService; -import com.hzya.frame.seeyon.cbs8.dao.IAgentPaymentDao; -import com.hzya.frame.seeyon.cbs8.dao.IAgentPaymentDetailDao; -import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentDetailEntity; -import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentEntity; -import com.hzya.frame.seeyon.cbs8.service.IAgentPaymentDetailService; -import com.hzya.frame.seeyon.cbs8.service.IAgentPaymentService; +import com.hzya.frame.cbs8.dao.IAgentPaymentDao; +import com.hzya.frame.cbs8.entity.AgentPaymentDetailEntity; +import com.hzya.frame.cbs8.entity.AgentPaymentEntity; +import com.hzya.frame.cbs8.service.IAgentPaymentDetailService; +import com.hzya.frame.cbs8.service.IAgentPaymentService; import com.hzya.frame.web.exception.BaseSystemException; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ExtServiceImpl.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/impl/Cbs8ExtServiceImpl.java similarity index 99% rename from service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ExtServiceImpl.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/impl/Cbs8ExtServiceImpl.java index accce4ca..4ab904d8 100644 --- a/service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ExtServiceImpl.java +++ b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/impl/Cbs8ExtServiceImpl.java @@ -7,7 +7,7 @@ import com.hzya.frame.cbs8.dto.req.*; import com.hzya.frame.cbs8.service.ICbs8ExtService; import com.hzya.frame.cbs8.util.CBSUtil; import com.hzya.frame.cbs8.util.CbsAccessToken; -import com.hzya.frame.seeyon.cbs8.entity.PaymentEntity; +import com.hzya.frame.cbs8.entity.PaymentEntity; import com.hzya.frame.stringutil.StringUtil; import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity; import com.hzya.frame.web.exception.BaseSystemException; diff --git a/service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ServiceImpl.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/impl/Cbs8ServiceImpl.java similarity index 99% rename from service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ServiceImpl.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/impl/Cbs8ServiceImpl.java index 6b57738e..3c800464 100644 --- a/service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ServiceImpl.java +++ b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/impl/Cbs8ServiceImpl.java @@ -12,8 +12,8 @@ import com.hzya.frame.cbs8.dto.req.*; import com.hzya.frame.cbs8.dto.res.*; import com.hzya.frame.cbs8.service.ICbs8Service; import com.hzya.frame.cbs8.util.CBSUtil; -import com.hzya.frame.seeyon.cbs8.entity.PaymentEntity; -import com.hzya.frame.seeyon.cbs8.service.IPaymentService; +import com.hzya.frame.cbs8.entity.PaymentEntity; +import com.hzya.frame.cbs8.service.IPaymentService; import com.hzya.frame.web.entity.JsonResultEntity; import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/impl/CbsLogServiceImpl.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/impl/CbsLogServiceImpl.java similarity index 97% rename from service/src/main/java/com/hzya/frame/seeyon/cbs8/service/impl/CbsLogServiceImpl.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/impl/CbsLogServiceImpl.java index a99744cf..71fe389f 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/impl/CbsLogServiceImpl.java +++ b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/impl/CbsLogServiceImpl.java @@ -1,17 +1,16 @@ -package com.hzya.frame.seeyon.cbs8.service.impl; +package com.hzya.frame.cbs8.service.impl; import cn.hutool.core.map.MapBuilder; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpRequest; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.dynamic.datasource.annotation.DS; import com.hzya.frame.basedao.service.impl.BaseService; import com.hzya.frame.cbs8.util.PayState; -import com.hzya.frame.seeyon.cbs8.dao.ICbsLogDao; -import com.hzya.frame.seeyon.cbs8.entity.CbsLogEntity; -import com.hzya.frame.seeyon.cbs8.entity.PaymentEntity; -import com.hzya.frame.seeyon.cbs8.service.ICbsLogService; +import com.hzya.frame.cbs8.dao.ICbsLogDao; +import com.hzya.frame.cbs8.entity.CbsLogEntity; +import com.hzya.frame.cbs8.entity.PaymentEntity; +import com.hzya.frame.cbs8.service.ICbsLogService; import com.hzya.frame.seeyon.util.RestUtil; import com.hzya.frame.stringutil.StringUtil; import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity; diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/impl/PaymentServiceImpl.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/impl/PaymentServiceImpl.java similarity index 94% rename from service/src/main/java/com/hzya/frame/seeyon/cbs8/service/impl/PaymentServiceImpl.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/impl/PaymentServiceImpl.java index dc593153..6ec8fab4 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/impl/PaymentServiceImpl.java +++ b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/impl/PaymentServiceImpl.java @@ -1,14 +1,13 @@ -package com.hzya.frame.seeyon.cbs8.service.impl; +package com.hzya.frame.cbs8.service.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.dynamic.datasource.annotation.DS; import com.hzya.frame.basedao.service.impl.BaseService; import com.hzya.frame.cbs8.util.PayState; -import com.hzya.frame.seeyon.cbs8.dao.IPaymentDao; -import com.hzya.frame.seeyon.cbs8.entity.PaymentEntity; -import com.hzya.frame.seeyon.cbs8.service.IPaymentService; +import com.hzya.frame.cbs8.dao.IPaymentDao; +import com.hzya.frame.cbs8.entity.PaymentEntity; +import com.hzya.frame.cbs8.service.IPaymentService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import java.util.List; diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/impl/TransactionDetailServiceImpl.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/impl/TransactionDetailServiceImpl.java similarity index 95% rename from service/src/main/java/com/hzya/frame/seeyon/cbs8/service/impl/TransactionDetailServiceImpl.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/impl/TransactionDetailServiceImpl.java index 21cee3ea..a80dd094 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/impl/TransactionDetailServiceImpl.java +++ b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/impl/TransactionDetailServiceImpl.java @@ -1,4 +1,4 @@ -package com.hzya.frame.seeyon.cbs8.service.impl; +package com.hzya.frame.cbs8.service.impl; import cn.hutool.core.map.MapBuilder; import cn.hutool.core.util.StrUtil; @@ -7,10 +7,9 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.dynamic.datasource.annotation.DS; import com.hzya.frame.basedao.service.impl.BaseService; -import com.hzya.frame.seeyon.cbs8.dao.ITransactionDetailDao; -import com.hzya.frame.seeyon.cbs8.entity.TransactionDetailEntity; -import com.hzya.frame.seeyon.cbs8.service.IPaymentService; -import com.hzya.frame.seeyon.cbs8.service.ITransactionDetailService; +import com.hzya.frame.cbs8.dao.ITransactionDetailDao; +import com.hzya.frame.cbs8.entity.TransactionDetailEntity; +import com.hzya.frame.cbs8.service.ITransactionDetailService; import com.hzya.frame.stringutil.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/service/src/main/java/com/hzya/frame/cbs8/util/CBSUtil.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/util/CBSUtil.java similarity index 100% rename from service/src/main/java/com/hzya/frame/cbs8/util/CBSUtil.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/util/CBSUtil.java diff --git a/service/src/main/java/com/hzya/frame/cbs8/util/CbsAccessToken.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/util/CbsAccessToken.java similarity index 100% rename from service/src/main/java/com/hzya/frame/cbs8/util/CbsAccessToken.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/util/CbsAccessToken.java diff --git a/service/src/main/java/com/hzya/frame/cbs8/util/CurrencyEnum.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/util/CurrencyEnum.java similarity index 100% rename from service/src/main/java/com/hzya/frame/cbs8/util/CurrencyEnum.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/util/CurrencyEnum.java diff --git a/service/src/main/java/com/hzya/frame/cbs8/util/PayState.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/util/PayState.java similarity index 100% rename from service/src/main/java/com/hzya/frame/cbs8/util/PayState.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/util/PayState.java diff --git a/service/src/main/java/com/hzya/frame/cbs8/util/SM2Util.java b/service/service-cbs/src/main/java/com.hzya.frame/cbs8/util/SM2Util.java similarity index 100% rename from service/src/main/java/com/hzya/frame/cbs8/util/SM2Util.java rename to service/service-cbs/src/main/java/com.hzya.frame/cbs8/util/SM2Util.java diff --git a/service/src/main/java/com/hzya/frame/seeyon/paybill/dao/IPayBillDao.java b/service/service-cbs/src/main/java/com.hzya.frame/paybill/dao/IPayBillDao.java similarity index 72% rename from service/src/main/java/com/hzya/frame/seeyon/paybill/dao/IPayBillDao.java rename to service/service-cbs/src/main/java/com.hzya.frame/paybill/dao/IPayBillDao.java index a0ec8db8..5093ae20 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/paybill/dao/IPayBillDao.java +++ b/service/service-cbs/src/main/java/com.hzya.frame/paybill/dao/IPayBillDao.java @@ -1,10 +1,8 @@ -package com.hzya.frame.seeyon.paybill.dao; +package com.hzya.frame.paybill.dao; -import com.hzya.frame.seeyon.entity.SeeYonInterFaceEntity; -import com.hzya.frame.seeyon.paybill.entity.PayBillEntity; +import com.hzya.frame.paybill.entity.PayBillEntity; import java.util.List; -import java.util.Map; /** * @author 👻👻👻👻👻👻👻👻👻👻 gjh diff --git a/service/src/main/java/com/hzya/frame/seeyon/paybill/dao/impl/PayBillDaoImpl.java b/service/service-cbs/src/main/java/com.hzya.frame/paybill/dao/impl/PayBillDaoImpl.java similarity index 78% rename from service/src/main/java/com/hzya/frame/seeyon/paybill/dao/impl/PayBillDaoImpl.java rename to service/service-cbs/src/main/java/com.hzya.frame/paybill/dao/impl/PayBillDaoImpl.java index 3a753554..cfb716b6 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/paybill/dao/impl/PayBillDaoImpl.java +++ b/service/service-cbs/src/main/java/com.hzya.frame/paybill/dao/impl/PayBillDaoImpl.java @@ -1,14 +1,12 @@ -package com.hzya.frame.seeyon.paybill.dao.impl; +package com.hzya.frame.paybill.dao.impl; import com.baomidou.dynamic.datasource.annotation.DS; import com.hzya.frame.basedao.dao.MybatisGenericDao; -import com.hzya.frame.seeyon.entity.SeeYonInterFaceEntity; -import com.hzya.frame.seeyon.paybill.dao.IPayBillDao; -import com.hzya.frame.seeyon.paybill.entity.PayBillEntity; +import com.hzya.frame.paybill.dao.IPayBillDao; +import com.hzya.frame.paybill.entity.PayBillEntity; import org.springframework.stereotype.Repository; import java.util.List; -import java.util.Map; /** * @author 👻👻👻👻👻👻👻👻👻👻 gjh diff --git a/service/src/main/java/com/hzya/frame/seeyon/paybill/entity/PayBillEntity.java b/service/service-cbs/src/main/java/com.hzya.frame/paybill/entity/PayBillEntity.java similarity index 98% rename from service/src/main/java/com/hzya/frame/seeyon/paybill/entity/PayBillEntity.java rename to service/service-cbs/src/main/java/com.hzya.frame/paybill/entity/PayBillEntity.java index 1a9308de..e28877bb 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/paybill/entity/PayBillEntity.java +++ b/service/service-cbs/src/main/java/com.hzya.frame/paybill/entity/PayBillEntity.java @@ -1,4 +1,4 @@ -package com.hzya.frame.seeyon.paybill.entity; +package com.hzya.frame.paybill.entity; import com.hzya.frame.web.entity.BaseEntity; diff --git a/service/src/main/java/com/hzya/frame/seeyon/paybill/entity/PayBillEntity.xml b/service/service-cbs/src/main/java/com.hzya.frame/paybill/entity/PayBillEntity.xml similarity index 95% rename from service/src/main/java/com/hzya/frame/seeyon/paybill/entity/PayBillEntity.xml rename to service/service-cbs/src/main/java/com.hzya.frame/paybill/entity/PayBillEntity.xml index 736d5914..cb5325a4 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/paybill/entity/PayBillEntity.xml +++ b/service/service-cbs/src/main/java/com.hzya.frame/paybill/entity/PayBillEntity.xml @@ -1,7 +1,7 @@ - + @@ -14,7 +14,7 @@ - SELECT body.id as id, field0070 AS bill_date, diff --git a/service/src/main/java/com/hzya/frame/seeyon/paybill/service/IPayBillService.java b/service/service-cbs/src/main/java/com.hzya.frame/paybill/service/IPayBillService.java similarity index 74% rename from service/src/main/java/com/hzya/frame/seeyon/paybill/service/IPayBillService.java rename to service/service-cbs/src/main/java/com.hzya.frame/paybill/service/IPayBillService.java index caad27a7..52c5cb53 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/paybill/service/IPayBillService.java +++ b/service/service-cbs/src/main/java/com.hzya.frame/paybill/service/IPayBillService.java @@ -1,13 +1,10 @@ -package com.hzya.frame.seeyon.paybill.service; +package com.hzya.frame.paybill.service; import com.alibaba.fastjson.JSONObject; import com.hzya.frame.basedao.service.IBaseService; -import com.hzya.frame.seeyon.cbs8.entity.PaymentEntity; -import com.hzya.frame.seeyon.paybill.entity.PayBillEntity; +import com.hzya.frame.cbs8.entity.PaymentEntity; import com.hzya.frame.web.entity.JsonResultEntity; -import java.util.List; - /** * * @content huoqu diff --git a/service/src/main/java/com/hzya/frame/seeyon/paybill/service/impl/PayBillServiceImpl.java b/service/service-cbs/src/main/java/com.hzya.frame/paybill/service/impl/PayBillServiceImpl.java similarity index 92% rename from service/src/main/java/com/hzya/frame/seeyon/paybill/service/impl/PayBillServiceImpl.java rename to service/service-cbs/src/main/java/com.hzya.frame/paybill/service/impl/PayBillServiceImpl.java index 8eac7caa..8ef0e73d 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/paybill/service/impl/PayBillServiceImpl.java +++ b/service/service-cbs/src/main/java/com.hzya.frame/paybill/service/impl/PayBillServiceImpl.java @@ -1,15 +1,14 @@ -package com.hzya.frame.seeyon.paybill.service.impl; +package com.hzya.frame.paybill.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.hzya.frame.basedao.service.impl.BaseService; import com.hzya.frame.bip.v3.v2207.util.BipUtil; -import com.hzya.frame.seeyon.cbs8.entity.PaymentEntity; -import com.hzya.frame.seeyon.paybill.dao.IPayBillDao; -import com.hzya.frame.seeyon.paybill.entity.PayBillEntity; -import com.hzya.frame.seeyon.paybill.service.IPayBillService; -import com.hzya.frame.seeyon.service.impl.SeeYonInterFaceImpl; +import com.hzya.frame.cbs8.entity.PaymentEntity; +import com.hzya.frame.paybill.dao.IPayBillDao; +import com.hzya.frame.paybill.entity.PayBillEntity; +import com.hzya.frame.paybill.service.IPayBillService; import com.hzya.frame.web.entity.JsonResultEntity; import org.apache.commons.collections.CollectionUtils; import org.jetbrains.annotations.NotNull;