调整公司外网数据库连接

service/service-cbs/service-cbs.iml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: com.hzya.frame:service:${revision}" level="project" />
+  </component>
+</module>

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 代发代扣

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 代发代扣明细

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支付日志

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

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底表

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.cbs8.dao.IAgentPaymentDao;
-import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentEntity;
+import com.hzya.frame.cbs8.entity.AgentPaymentEntity;
 import org.springframework.stereotype.Repository;
 
 /**

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.cbs8.dao.IAgentPaymentDetailDao;
-import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentDetailEntity;
+import com.hzya.frame.cbs8.entity.AgentPaymentDetailEntity;
 import org.springframework.stereotype.Repository;
 
 /**

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.cbs8.dao.ICbsLogDao;
-import com.hzya.frame.seeyon.cbs8.entity.CbsLogEntity;
+import com.hzya.frame.cbs8.entity.CbsLogEntity;
 import org.springframework.stereotype.Repository;
 
 /**

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.cbs8.dao.IPaymentDao;
-import com.hzya.frame.seeyon.cbs8.entity.PaymentEntity;
+import com.hzya.frame.cbs8.entity.PaymentEntity;
 import org.springframework.stereotype.Repository;
 
 /**

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.cbs8.dao.ITransactionDetailDao;
-import com.hzya.frame.seeyon.cbs8.dao.ITransactionDetailDao;
+import com.hzya.frame.cbs8.entity.TransactionDetailEntity;
-import com.hzya.frame.seeyon.cbs8.entity.PaymentEntity;
-import com.hzya.frame.seeyon.cbs8.entity.TransactionDetailEntity;
 import org.springframework.stereotype.Repository;
 
 /**

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;
 

service/service-cbs/src/main/java/com.hzya.frame/cbs8/entity/AgentPaymentDetailEntity.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hzya.frame.seeyon.cbs8.dao.impl.AgentPaymentDetailDaoImpl">
-    <resultMap id="get-AgentPaymentDetailEntity-result" type="com.hzya.frame.seeyon.cbs8.entity.AgentPaymentDetailEntity">
+    <resultMap id="get-AgentPaymentDetailEntity-result" type="com.hzya.frame.cbs8.entity.AgentPaymentDetailEntity">
         <result property="id" column="id" />
         <result property="formmainId" column="formmainId" />
         <result property="tabName" column="tabName" />
@@ -31,7 +31,7 @@
 
 
     <!-- 采用==查询 -->
-    <select id="entity_list_base" resultMap="get-AgentPaymentDetailEntity-result" parameterType="com.hzya.frame.seeyon.cbs8.entity.AgentPaymentDetailEntity">
+    <select id="entity_list_base" resultMap="get-AgentPaymentDetailEntity-result" parameterType="com.hzya.frame.cbs8.entity.AgentPaymentDetailEntity">
         select
         <include refid="AgentPaymentDetailEntity_Base_Column_List"/>
         from (
@@ -63,7 +63,7 @@
         </trim>
     </select>
 
-    <update id="entity_update" parameterType="com.hzya.frame.seeyon.cbs8.entity.AgentPaymentDetailEntity">
+    <update id="entity_update" parameterType="com.hzya.frame.cbs8.entity.AgentPaymentDetailEntity">
         update formson_0225 set
         <trim suffix="" suffixOverrides=",">
             <if test="payDate != null and payDate !='' ">field0045 =#{payDate},</if>
@@ -73,7 +73,7 @@
     </update>
 
     <!-- 更新支付结果 -->
-    <update id="entity_update_result" parameterType="com.hzya.frame.seeyon.cbs8.entity.AgentPaymentDetailEntity">
+    <update id="entity_update_result" parameterType="com.hzya.frame.cbs8.entity.AgentPaymentDetailEntity">
         update formson_0225 set
         <trim suffix="" suffixOverrides=",">
             <if test="payDate != null and payDate !='' ">field0045 =#{payDate},</if>

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;
 

service/service-cbs/src/main/java/com.hzya.frame/cbs8/entity/AgentPaymentEntity.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hzya.frame.seeyon.cbs8.dao.impl.AgentPaymentDaoImpl">
-    <resultMap id="get-AgentPaymentEntity-result" type="com.hzya.frame.seeyon.cbs8.entity.AgentPaymentEntity">
+    <resultMap id="get-AgentPaymentEntity-result" type="com.hzya.frame.cbs8.entity.AgentPaymentEntity">
         <result property="oaId" column="oaId" />
         <result property="title" column="title" />
         <result property="finishedflag" column="finishedflag" />
@@ -35,7 +35,7 @@
 
 
     <!-- 采用==查询 -->
-    <select id="entity_list_base" resultMap="get-AgentPaymentEntity-result" parameterType="com.hzya.frame.seeyon.cbs8.entity.AgentPaymentEntity">
+    <select id="entity_list_base" resultMap="get-AgentPaymentEntity-result" parameterType="com.hzya.frame.cbs8.entity.AgentPaymentEntity">
         select
         <include refid="AgentPaymentEntity_Base_Column_List"/>
        from (
@@ -74,7 +74,7 @@
         </trim>
     </select>
 
-    <select id="entity_list_base_unpaid" resultMap="get-AgentPaymentEntity-result" parameterType="com.hzya.frame.seeyon.cbs8.entity.AgentPaymentEntity">
+    <select id="entity_list_base_unpaid" resultMap="get-AgentPaymentEntity-result" parameterType="com.hzya.frame.cbs8.entity.AgentPaymentEntity">
         select
         <include refid="AgentPaymentEntity_Base_Column_List"/>
         from (
@@ -115,7 +115,7 @@
     </select>
 
 
-    <update id="entity_update" parameterType="com.hzya.frame.seeyon.cbs8.entity.AgentPaymentEntity">
+    <update id="entity_update" parameterType="com.hzya.frame.cbs8.entity.AgentPaymentEntity">
         update formmain_0224 set
         <trim suffix="" suffixOverrides=",">
             <if test="applyCode != null and applyCode !='' ">field0043 =#{applyCode},</if>

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;
 

service/service-cbs/src/main/java/com.hzya.frame/cbs8/entity/CbsLogEntity.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hzya.frame.seeyon.cbs8.dao.impl.CbsLogDaoImpl">
-    <resultMap id="get-CbsLogEntity-result" type="com.hzya.frame.seeyon.cbs8.entity.CbsLogEntity">
+    <resultMap id="get-CbsLogEntity-result" type="com.hzya.frame.cbs8.entity.CbsLogEntity">
         <result property="id" column="id" />
         <result property="oa_id" column="oa_id" />
         <result property="bill_code" column="bill_code" />
@@ -35,7 +35,7 @@
     </sql>
 
     <!-- 查询推送失败，用户手动发起请求 采用==查询 -->
-    <select id="entity_list_base" resultMap="get-CbsLogEntity-result" parameterType="com.hzya.frame.seeyon.cbs8.entity.CbsLogEntity">
+    <select id="entity_list_base" resultMap="get-CbsLogEntity-result" parameterType="com.hzya.frame.cbs8.entity.CbsLogEntity">
         select
         <include refid="CbsLogEntity_Base_Column_List"/>
         from
@@ -56,7 +56,7 @@
         </trim>
     </select>
 
-    <select id="entity_list_like" resultMap="get-CbsLogEntity-result" parameterType="com.hzya.frame.seeyon.cbs8.entity.CbsLogEntity">
+    <select id="entity_list_like" resultMap="get-CbsLogEntity-result" parameterType="com.hzya.frame.cbs8.entity.CbsLogEntity">
         select
         <include refid="CbsLogEntity_Base_Column_List"/>
         from
@@ -78,7 +78,7 @@
         </trim>
     </select>
 
-    <select id="CbsLogEntity_list_base_in_payment" resultMap="get-CbsLogEntity-result" parameterType="com.hzya.frame.seeyon.cbs8.entity.CbsLogEntity">
+    <select id="CbsLogEntity_list_base_in_payment" resultMap="get-CbsLogEntity-result" parameterType="com.hzya.frame.cbs8.entity.CbsLogEntity">
         select
         <include refid="CbsLogEntity_Base_Column_List"/>
         from
@@ -100,7 +100,7 @@
 
 
     <!--修改视图支付状态-->
-    <update id="entity_update" parameterType="com.hzya.frame.seeyon.cbs8.entity.CbsLogEntity">
+    <update id="entity_update" parameterType="com.hzya.frame.cbs8.entity.CbsLogEntity">
         update formmain_0232 set
         <trim suffix="" suffixOverrides=",">
             <if test="pay_state != null and pay_state !='' ">field0010 =#{pay_state},</if>

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;
 

service/service-cbs/src/main/java/com.hzya.frame/cbs8/entity/PaymentEntity.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hzya.frame.seeyon.cbs8.entity.PaymentEntity">
-    <resultMap id="get-PaymentEntity-result" type="com.hzya.frame.seeyon.cbs8.entity.PaymentEntity">
+    <resultMap id="get-PaymentEntity-result" type="com.hzya.frame.cbs8.entity.PaymentEntity">
         <result property="referenceNum" column="referenceNum" />
         <result property="busType" column="busType" />
         <result property="title" column="title" />
@@ -143,7 +143,7 @@
                 left join ORG_UNIT unit on unit.id =formmain_0209.field0002
     </sql>
     <!-- 采用==查询 -->
-    <select id="entity_list_base" resultMap="get-PaymentEntity-result" parameterType="com.hzya.frame.seeyon.cbs8.entity.PaymentEntity">
+    <select id="entity_list_base" resultMap="get-PaymentEntity-result" parameterType="com.hzya.frame.cbs8.entity.PaymentEntity">
         select v.* from (
         <include refid="base_sql"/>
         ) v
@@ -176,7 +176,7 @@
     </select>
 
     <!-- 查询交易成功，且电子回单为空的，上传电子回单用 -->
-    <select id="PaymentEntity_list_base_elec_isnull" resultMap="get-PaymentEntity-result" parameterType="com.hzya.frame.seeyon.cbs8.entity.PaymentEntity">
+    <select id="PaymentEntity_list_base_elec_isnull" resultMap="get-PaymentEntity-result" parameterType="com.hzya.frame.cbs8.entity.PaymentEntity">
        <!-- select
         <include refid="PaymentEntity_Base_Column_List"/>
         from
@@ -247,7 +247,7 @@
         </trim>
     </select>
     <!-- 查询待支付的 -->
-    <select id="PaymentEntity_list_base_unpaid" resultMap="get-PaymentEntity-result" parameterType="com.hzya.frame.seeyon.cbs8.entity.PaymentEntity">
+    <select id="PaymentEntity_list_base_unpaid" resultMap="get-PaymentEntity-result" parameterType="com.hzya.frame.cbs8.entity.PaymentEntity">
      select v.* from (
         <include refid="base_sql"/>
         ) v
@@ -284,7 +284,7 @@
 
 
     <!-- 查询未完成的 采用==查询 -->
-    <select id="PaymentEntity_list_base_in_payment" resultMap="get-PaymentEntity-result" parameterType="com.hzya.frame.seeyon.cbs8.entity.PaymentEntity">
+    <select id="PaymentEntity_list_base_in_payment" resultMap="get-PaymentEntity-result" parameterType="com.hzya.frame.cbs8.entity.PaymentEntity">
         select
         <include refid="PaymentEntity_Base_Column_List"/>
         from
@@ -321,7 +321,7 @@
 
 
     <!--修改视图支付状态-->
-    <update id="PaymentEntity_update_payState" parameterType="com.hzya.frame.seeyon.cbs8.entity.PaymentEntity">
+    <update id="PaymentEntity_update_payState" parameterType="com.hzya.frame.cbs8.entity.PaymentEntity">
         update ${tableName} set
         <trim suffix="" suffixOverrides=",">
             <if test="payDate != null and payDate !='' ">${payDateField} =#{payDate},</if>
@@ -332,7 +332,7 @@
     </update>
 
     <!--修改电子回单-->
-    <update id="PaymentEntity_update_electronic" parameterType="com.hzya.frame.seeyon.cbs8.entity.PaymentEntity">
+    <update id="PaymentEntity_update_electronic" parameterType="com.hzya.frame.cbs8.entity.PaymentEntity">
         update ${tableName} set ${receiptFiled}=#{receipt} where id = #{oaId} and ${receiptFiled} is null
     </update>
 

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;
 

service/service-cbs/src/main/java/com.hzya.frame/cbs8/entity/TransactionDetailEntity.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hzya.frame.seeyon.cbs8.entity.TransactionDetailEntity">
-    <resultMap id="get-TransactionDetailEntity-result" type="com.hzya.frame.seeyon.cbs8.entity.TransactionDetailEntity">
+    <resultMap id="get-TransactionDetailEntity-result" type="com.hzya.frame.cbs8.entity.TransactionDetailEntity">
         <result property="id" column="id" />
         <result property="accountNo" column="accountNo" />
         <result property="accountName" column="accountName" />
@@ -39,7 +39,7 @@
     </sql>
 
     <!--  采用==查询 -->
-    <select id="TransactionDetailEntity_list_base" resultMap="get-TransactionDetailEntity-result" parameterType="com.hzya.frame.seeyon.cbs8.entity.TransactionDetailEntity">
+    <select id="TransactionDetailEntity_list_base" resultMap="get-TransactionDetailEntity-result" parameterType="com.hzya.frame.cbs8.entity.TransactionDetailEntity">
         select
         <include refid="TransactionDetailEntity_Base_Column_List"/>
         from
@@ -64,7 +64,7 @@
         </trim>
     </select>
     <!-- 只查询交易流水号-->
-    <select id="TransactionDetailEntity_list_serialNumber" resultMap="get-TransactionDetailEntity-result" parameterType="com.hzya.frame.seeyon.cbs8.entity.TransactionDetailEntity">
+    <select id="TransactionDetailEntity_list_serialNumber" resultMap="get-TransactionDetailEntity-result" parameterType="com.hzya.frame.cbs8.entity.TransactionDetailEntity">
         select
         field0005 as transactionSerialNumber
         from

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.cbs8.entity.AgentPaymentDetailEntity;
-import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentEntity;
 
 /**
  * @Description 代发代扣明细

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.cbs8.entity.AgentPaymentDetailEntity;
-import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentEntity;
+import com.hzya.frame.cbs8.entity.AgentPaymentEntity;
 
 import java.util.List;
 

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;
 

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;

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;
 

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;
 

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.cbs8.dao.IAgentPaymentDetailDao;
-import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentDetailEntity;
+import com.hzya.frame.cbs8.entity.AgentPaymentDetailEntity;
-import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentEntity;
+import com.hzya.frame.cbs8.service.IAgentPaymentDetailService;
-import com.hzya.frame.seeyon.cbs8.service.IAgentPaymentDetailService;
-import com.hzya.frame.seeyon.cbs8.service.IAgentPaymentService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

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.cbs8.dao.IAgentPaymentDao;
-import com.hzya.frame.seeyon.cbs8.dao.IAgentPaymentDetailDao;
+import com.hzya.frame.cbs8.entity.AgentPaymentDetailEntity;
-import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentDetailEntity;
+import com.hzya.frame.cbs8.entity.AgentPaymentEntity;
-import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentEntity;
+import com.hzya.frame.cbs8.service.IAgentPaymentDetailService;
-import com.hzya.frame.seeyon.cbs8.service.IAgentPaymentDetailService;
+import com.hzya.frame.cbs8.service.IAgentPaymentService;
-import com.hzya.frame.seeyon.cbs8.service.IAgentPaymentService;
 import com.hzya.frame.web.exception.BaseSystemException;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;

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;

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.cbs8.entity.PaymentEntity;
-import com.hzya.frame.seeyon.cbs8.service.IPaymentService;
+import com.hzya.frame.cbs8.service.IPaymentService;
 import com.hzya.frame.web.entity.JsonResultEntity;
 import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;

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.cbs8.dao.ICbsLogDao;
-import com.hzya.frame.seeyon.cbs8.entity.CbsLogEntity;
+import com.hzya.frame.cbs8.entity.CbsLogEntity;
-import com.hzya.frame.seeyon.cbs8.entity.PaymentEntity;
+import com.hzya.frame.cbs8.entity.PaymentEntity;
-import com.hzya.frame.seeyon.cbs8.service.ICbsLogService;
+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;

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.cbs8.dao.IPaymentDao;
-import com.hzya.frame.seeyon.cbs8.entity.PaymentEntity;
+import com.hzya.frame.cbs8.entity.PaymentEntity;
-import com.hzya.frame.seeyon.cbs8.service.IPaymentService;
+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;

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.cbs8.dao.ITransactionDetailDao;
-import com.hzya.frame.seeyon.cbs8.entity.TransactionDetailEntity;
+import com.hzya.frame.cbs8.entity.TransactionDetailEntity;
-import com.hzya.frame.seeyon.cbs8.service.IPaymentService;
+import com.hzya.frame.cbs8.service.ITransactionDetailService;
-import com.hzya.frame.seeyon.cbs8.service.ITransactionDetailService;
 import com.hzya.frame.stringutil.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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.paybill.entity.PayBillEntity;
-import com.hzya.frame.seeyon.paybill.entity.PayBillEntity;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author 👻👻👻👻👻👻👻👻👻👻 gjh

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.paybill.dao.IPayBillDao;
-import com.hzya.frame.seeyon.paybill.dao.IPayBillDao;
+import com.hzya.frame.paybill.entity.PayBillEntity;
-import com.hzya.frame.seeyon.paybill.entity.PayBillEntity;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author 👻👻👻👻👻👻👻👻👻👻 gjh

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;
 

service/service-cbs/src/main/java/com.hzya.frame/paybill/entity/PayBillEntity.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hzya.frame.seeyon.paybill.dao.impl.PayBillDaoImpl">
-    <resultMap id="get-PayBillEntity-result" type="com.hzya.frame.seeyon.paybill.entity.PayBillEntity" >
+    <resultMap id="get-PayBillEntity-result" type="com.hzya.frame.paybill.entity.PayBillEntity" >
         <result property="id" column="id" jdbcType="VARCHAR"/>
         <result property="pkOrg" column="pk_org" jdbcType="VARCHAR"/>
         <result property="billDate" column="bill_date" jdbcType="VARCHAR"/>
@@ -14,7 +14,7 @@
     </resultMap>
 
     <!--工程项目查询-->
-    <select id="PayBillEntity_list_base" resultMap="get-PayBillEntity-result" parameterType="com.hzya.frame.seeyon.paybill.entity.PayBillEntity">
+    <select id="PayBillEntity_list_base" resultMap="get-PayBillEntity-result" parameterType="com.hzya.frame.paybill.entity.PayBillEntity">
        SELECT
         body.id as id,
         field0070 AS bill_date,

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.cbs8.entity.PaymentEntity;
-import com.hzya.frame.seeyon.paybill.entity.PayBillEntity;
 import com.hzya.frame.web.entity.JsonResultEntity;
 
-import java.util.List;
-
 /**
  *
  * @content huoqu

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.cbs8.entity.PaymentEntity;
-import com.hzya.frame.seeyon.paybill.dao.IPayBillDao;
+import com.hzya.frame.paybill.dao.IPayBillDao;
-import com.hzya.frame.seeyon.paybill.entity.PayBillEntity;
+import com.hzya.frame.paybill.entity.PayBillEntity;
-import com.hzya.frame.seeyon.paybill.service.IPayBillService;
+import com.hzya.frame.paybill.service.IPayBillService;
-import com.hzya.frame.seeyon.service.impl.SeeYonInterFaceImpl;
 import com.hzya.frame.web.entity.JsonResultEntity;
 import org.apache.commons.collections.CollectionUtils;
 import org.jetbrains.annotations.NotNull;