diff --git a/base-service/src/main/java/com/hzya/frame/sysnew/zxbank/dao/IZxBankDao.java b/fw-oa/src/main/java/com/hzya/frame/seeyon/zxbank/dao/IZxBankDao.java similarity index 93% rename from base-service/src/main/java/com/hzya/frame/sysnew/zxbank/dao/IZxBankDao.java rename to fw-oa/src/main/java/com/hzya/frame/seeyon/zxbank/dao/IZxBankDao.java index 9e4f5abd..ed0e0cec 100644 --- a/base-service/src/main/java/com/hzya/frame/sysnew/zxbank/dao/IZxBankDao.java +++ b/fw-oa/src/main/java/com/hzya/frame/seeyon/zxbank/dao/IZxBankDao.java @@ -1,9 +1,9 @@ -package com.hzya.frame.sysnew.zxbank.dao; +package com.hzya.frame.seeyon.zxbank.dao; import com.hzya.frame.basedao.dao.IBaseDao; import com.hzya.frame.mdm.mdmModuleSource.entity.MdmModuleSourceEntity; -import com.hzya.frame.sysnew.zxbank.entity.ZxBankEntity; +import com.hzya.frame.seeyon.zxbank.entity.ZxBankEntity; import java.util.HashMap; import java.util.List; diff --git a/base-service/src/main/java/com/hzya/frame/sysnew/zxbank/dao/impl/ZxBankDaoImpl.java b/fw-oa/src/main/java/com/hzya/frame/seeyon/zxbank/dao/impl/ZxBankDaoImpl.java similarity index 92% rename from base-service/src/main/java/com/hzya/frame/sysnew/zxbank/dao/impl/ZxBankDaoImpl.java rename to fw-oa/src/main/java/com/hzya/frame/seeyon/zxbank/dao/impl/ZxBankDaoImpl.java index 00190801..192305c1 100644 --- a/base-service/src/main/java/com/hzya/frame/sysnew/zxbank/dao/impl/ZxBankDaoImpl.java +++ b/fw-oa/src/main/java/com/hzya/frame/seeyon/zxbank/dao/impl/ZxBankDaoImpl.java @@ -1,15 +1,15 @@ -package com.hzya.frame.sysnew.zxbank.dao.impl; +package com.hzya.frame.seeyon.zxbank.dao.impl; import com.baomidou.dynamic.datasource.annotation.DS; import com.hzya.frame.basedao.dao.MybatisGenericDao; import com.hzya.frame.execsql.service.IExecSqlService; import com.hzya.frame.mdm.mdmModuleSource.entity.MdmModuleSourceEntity; -import com.hzya.frame.sysnew.zxbank.dao.IZxBankDao; -import com.hzya.frame.sysnew.zxbank.entity.ZxBankEntity; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Repository; +import com.hzya.frame.seeyon.zxbank.dao.IZxBankDao; +import com.hzya.frame.seeyon.zxbank.entity.ZxBankEntity; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Repository; import java.util.HashMap; import java.util.List; diff --git a/base-service/src/main/java/com/hzya/frame/sysnew/zxbank/entity/PayState.java b/fw-oa/src/main/java/com/hzya/frame/seeyon/zxbank/entity/PayState.java similarity index 95% rename from base-service/src/main/java/com/hzya/frame/sysnew/zxbank/entity/PayState.java rename to fw-oa/src/main/java/com/hzya/frame/seeyon/zxbank/entity/PayState.java index c79950ae..9edf5600 100644 --- a/base-service/src/main/java/com/hzya/frame/sysnew/zxbank/entity/PayState.java +++ b/fw-oa/src/main/java/com/hzya/frame/seeyon/zxbank/entity/PayState.java @@ -1,4 +1,4 @@ -package com.hzya.frame.sysnew.zxbank.entity; +package com.hzya.frame.seeyon.zxbank.entity; public enum PayState { PAYING("PAYING","支付中"), diff --git a/base-service/src/main/java/com/hzya/frame/sysnew/zxbank/entity/ZxBankEntity.java b/fw-oa/src/main/java/com/hzya/frame/seeyon/zxbank/entity/ZxBankEntity.java similarity index 99% rename from base-service/src/main/java/com/hzya/frame/sysnew/zxbank/entity/ZxBankEntity.java rename to fw-oa/src/main/java/com/hzya/frame/seeyon/zxbank/entity/ZxBankEntity.java index 59332ad1..160af0b7 100644 --- a/base-service/src/main/java/com/hzya/frame/sysnew/zxbank/entity/ZxBankEntity.java +++ b/fw-oa/src/main/java/com/hzya/frame/seeyon/zxbank/entity/ZxBankEntity.java @@ -1,4 +1,4 @@ -package com.hzya.frame.sysnew.zxbank.entity; +package com.hzya.frame.seeyon.zxbank.entity; import com.hzya.frame.web.entity.BaseEntity; diff --git a/base-service/src/main/java/com/hzya/frame/sysnew/zxbank/entity/ZxBankEntity.xml b/fw-oa/src/main/java/com/hzya/frame/seeyon/zxbank/entity/ZxBankEntity.xml similarity index 89% rename from base-service/src/main/java/com/hzya/frame/sysnew/zxbank/entity/ZxBankEntity.xml rename to fw-oa/src/main/java/com/hzya/frame/seeyon/zxbank/entity/ZxBankEntity.xml index d5204454..0f53c4e9 100644 --- a/base-service/src/main/java/com/hzya/frame/sysnew/zxbank/entity/ZxBankEntity.xml +++ b/fw-oa/src/main/java/com/hzya/frame/seeyon/zxbank/entity/ZxBankEntity.xml @@ -1,7 +1,7 @@ - - + + @@ -65,31 +65,31 @@ - select from v_hzya_pay where push_status is null - select from v_hzya_pay where push_status is not null and pay_result is null - select from v_hzya_pay where pay_result='已支付' and receipt is null - + update ${tabName} set ${pushStatusField} =#{pushStatus} where id=#{dataId} - + update ${tabName} set ${payResultField} =#{payResult} where id=#{dataId} diff --git a/base-service/src/main/java/com/hzya/frame/sysnew/zxbank/service/IZxBankService.java b/fw-oa/src/main/java/com/hzya/frame/seeyon/zxbank/service/IZxBankService.java similarity index 89% rename from base-service/src/main/java/com/hzya/frame/sysnew/zxbank/service/IZxBankService.java rename to fw-oa/src/main/java/com/hzya/frame/seeyon/zxbank/service/IZxBankService.java index 30efc533..9c51f399 100644 --- a/base-service/src/main/java/com/hzya/frame/sysnew/zxbank/service/IZxBankService.java +++ b/fw-oa/src/main/java/com/hzya/frame/seeyon/zxbank/service/IZxBankService.java @@ -1,8 +1,8 @@ -package com.hzya.frame.sysnew.zxbank.service; +package com.hzya.frame.seeyon.zxbank.service; import com.alibaba.fastjson.JSONObject; import com.hzya.frame.basedao.service.IBaseService; -import com.hzya.frame.sysnew.zxbank.entity.ZxBankEntity; +import com.hzya.frame.seeyon.zxbank.entity.ZxBankEntity; import com.hzya.frame.web.entity.JsonResultEntity; public interface IZxBankService extends IBaseService { diff --git a/base-service/src/main/java/com/hzya/frame/sysnew/zxbank/service/impl/ZxBankServiceImpl.java b/fw-oa/src/main/java/com/hzya/frame/seeyon/zxbank/service/impl/ZxBankServiceImpl.java similarity index 98% rename from base-service/src/main/java/com/hzya/frame/sysnew/zxbank/service/impl/ZxBankServiceImpl.java rename to fw-oa/src/main/java/com/hzya/frame/seeyon/zxbank/service/impl/ZxBankServiceImpl.java index cd671143..4057b6ef 100644 --- a/base-service/src/main/java/com/hzya/frame/sysnew/zxbank/service/impl/ZxBankServiceImpl.java +++ b/fw-oa/src/main/java/com/hzya/frame/seeyon/zxbank/service/impl/ZxBankServiceImpl.java @@ -1,21 +1,20 @@ -package com.hzya.frame.sysnew.zxbank.service.impl; +package com.hzya.frame.seeyon.zxbank.service.impl; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpRequest; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.serializer.SerializerFeature; import com.hzya.frame.basedao.service.impl.BaseService; import com.hzya.frame.mdm.mdmModuleSource.dao.impl.MdmModuleSourceDaoImpl; import com.hzya.frame.mdm.mdmModuleSource.entity.MdmModuleSourceEntity; +import com.hzya.frame.seeyon.zxbank.dao.IZxBankDao; +import com.hzya.frame.seeyon.zxbank.entity.PayState; +import com.hzya.frame.seeyon.zxbank.entity.ZxBankEntity; +import com.hzya.frame.seeyon.zxbank.service.IZxBankService; import com.hzya.frame.sysnew.comparison.service.impl.ComparisonServiceImpl; import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity; import com.hzya.frame.sysnew.integtationTaskLivingDetails.service.IIntegrationTaskLivingDetailsService; -import com.hzya.frame.sysnew.zxbank.dao.IZxBankDao; -import com.hzya.frame.sysnew.zxbank.entity.PayState; -import com.hzya.frame.sysnew.zxbank.entity.ZxBankEntity; -import com.hzya.frame.sysnew.zxbank.service.IZxBankService; import com.hzya.frame.uuid.UUIDUtils; import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity;