流程结束

 Conflicts:

	pom.xml

base-buildpackage/pom.xml

@@ -50,7 +50,19 @@
                 <profile.active>zqtlocal</profile.active>
             </properties>
         </profile>
-       
+        <profile>
+            <id>kekao</id> <!--kekao-->
+            <properties>
+                <profile.active>kekao</profile.active>
+            </properties>
+        </profile>
+        <profile>
+            <id>kekaotest</id> <!--曾庆拓-->
+            <properties>
+                <profile.active>kekaotest</profile.active>
+            </properties>
+        </profile>
+
     </profiles>
     <build>
         <finalName>kangarooDataCenterV3</finalName>

base-buildpackage/src/main/java/com/hzya/frame/plugin/kekao/dao/ICreditauditDao.java

@@ -0,0 +1,10 @@
+package com.hzya.frame.plugin.kekao.dao;
+
+
+import com.hzya.frame.basedao.dao.IBaseDao;
+import com.hzya.frame.plugin.kekao.entity.CreditauditEntity;
+
+public interface ICreditauditDao extends IBaseDao<CreditauditEntity, String> {
+
+}
+

base-buildpackage/src/main/java/com/hzya/frame/plugin/kekao/dao/impl/CreditauditDaoImpl.java

@@ -0,0 +1,12 @@
+package com.hzya.frame.plugin.kekao.dao.impl;
+
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+import com.hzya.frame.plugin.kekao.dao.ICreditauditDao;
+import com.hzya.frame.plugin.kekao.entity.CreditauditEntity;
+
+
+public class CreditauditDaoImpl extends MybatisGenericDao<CreditauditEntity, String> implements ICreditauditDao {
+
+
+}
+

base-buildpackage/src/main/java/com/hzya/frame/plugin/kekao/entity/CreditauditEntity.java

@@ -0,0 +1,9 @@
+package com.hzya.frame.plugin.kekao.entity;
+
+import com.hzya.frame.web.entity.BaseEntity;
+
+public class CreditauditEntity extends BaseEntity {
+
+
+}
+

base-buildpackage/src/main/java/com/hzya/frame/plugin/kekao/entity/CreditauditEntity.xml

@@ -0,0 +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.plugin.kekao.dao.impl.CreditauditDaoImpl">
+
+
+</mapper>
+

base-buildpackage/src/main/java/com/hzya/frame/plugin/kekao/plugin/CreditauditPluginInitializer.java

@@ -0,0 +1,61 @@
+package com.hzya.frame.plugin.kekao.plugin;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.base.PluginBaseEntity;
+import com.hzya.frame.plugin.kekao.service.ICreditauditService;
+import com.hzya.frame.web.entity.JsonResultEntity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * 信用额度审批单保存提交
+ *
+ * @author makejava
+ * @since 2024-06-21 13:52:35
+ */
+public class CreditauditPluginInitializer extends PluginBaseEntity{
+    Logger logger = LoggerFactory.getLogger(CreditauditPluginInitializer.class);
+    @Autowired
+    private ICreditauditService creditauditService;
+
+      @Override
+    public void initialize() {
+        logger.info(getPluginLabel() + "执行初始化方法initialize()");
+    }
+
+    @Override
+    public void destroy() {
+        logger.info(getPluginLabel() + "执行销毁方法destroy()");
+    }
+
+    @Override
+    public String getPluginId() {
+        return "CreditauditPlugin";
+    }
+
+    @Override
+    public String getPluginName() {
+        return "CreditauditPlugin插件";
+    }
+
+    @Override
+    public String getPluginLabel() {
+        return "CreditauditPlugin";
+    }
+
+    @Override
+    public String getPluginType() {
+        return "1";
+    }
+    @Override
+    public JsonResultEntity executeBusiness(JSONObject requestJson) {
+        try {
+            logger.info("======开始执行信用额度审批单保存提交同步========");
+            return creditauditService.sendCreditauditData(requestJson);
+        }catch (Exception e){
+            logger.info("======执行信用额度审批单保存提交同步失败:{}========",e.getMessage());
+        }
+        return null;
+    }
+}

base-buildpackage/src/main/java/com/hzya/frame/plugin/kekao/plugin/SalesRebatePluginInitializer.java

@@ -0,0 +1,61 @@
+package com.hzya.frame.plugin.kekao.plugin;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.base.PluginBaseEntity;
+import com.hzya.frame.plugin.kekao.service.ICreditauditService;
+import com.hzya.frame.web.entity.JsonResultEntity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * 销售返利
+ *
+ * @author makejava
+ * @since 2024-06-21 13:52:35
+ */
+public class SalesRebatePluginInitializer extends PluginBaseEntity{
+    Logger logger = LoggerFactory.getLogger(SalesRebatePluginInitializer.class);
+    @Autowired
+    private ICreditauditService creditauditService;
+
+      @Override
+    public void initialize() {
+        logger.info(getPluginLabel() + "执行初始化方法initialize()");
+    }
+
+    @Override
+    public void destroy() {
+        logger.info(getPluginLabel() + "执行销毁方法destroy()");
+    }
+
+    @Override
+    public String getPluginId() {
+        return "SalesRebatePlugin";
+    }
+
+    @Override
+    public String getPluginName() {
+        return "SalesRebatePlugin插件";
+    }
+
+    @Override
+    public String getPluginLabel() {
+        return "SalesRebatePlugin";
+    }
+
+    @Override
+    public String getPluginType() {
+        return "1";
+    }
+    @Override
+    public JsonResultEntity executeBusiness(JSONObject requestJson) {
+        try {
+            logger.info("======开始执行销售返利同步========");
+            return creditauditService.sendSalesRebateData(requestJson);
+        }catch (Exception e){
+            logger.info("======执行销售返利同步失败:{}========",e.getMessage());
+        }
+        return null;
+    }
+}

base-buildpackage/src/main/java/com/hzya/frame/plugin/kekao/service/ICreditauditService.java

@@ -0,0 +1,27 @@
+package com.hzya.frame.plugin.kekao.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.basedao.service.IBaseService;
+import com.hzya.frame.plugin.kekao.entity.CreditauditEntity;
+import com.hzya.frame.web.entity.JsonResultEntity;
+
+public interface ICreditauditService extends IBaseService<CreditauditEntity, String>{
+
+    /**
+     * @Author lvleigang
+     * @Description  信用额度审批单保存提交同步
+     * @Date 2:32 下午 2025/8/5
+     * @param requestJson
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     **/
+    JsonResultEntity sendCreditauditData(JSONObject requestJson);
+
+    /**
+     * @Author lvleigang
+     * @Description  销售返利同步
+     * @Date 3:12 下午 2025/8/5
+     * @param requestJson
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     **/
+    JsonResultEntity sendSalesRebateData(JSONObject requestJson);
+}

base-buildpackage/src/main/java/com/hzya/frame/plugin/kekao/service/impl/CreditauditServiceImpl.java

@@ -0,0 +1,334 @@
+package com.hzya.frame.plugin.kekao.service.impl;
+
+import cn.hutool.http.HttpRequest;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.basedao.service.impl.BaseService;
+import com.hzya.frame.plugin.kekao.dao.ICreditauditDao;
+import com.hzya.frame.plugin.kekao.entity.CreditauditEntity;
+import com.hzya.frame.plugin.kekao.service.ICreditauditService;
+import com.hzya.frame.web.entity.BaseResult;
+import com.hzya.frame.web.entity.JsonResultEntity;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+
+import java.nio.charset.StandardCharsets;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class CreditauditServiceImpl extends BaseService<CreditauditEntity, String> implements ICreditauditService {
+    @Value("${zt.url}")
+    private String url;
+
+    private ICreditauditDao creditauditDao;
+
+    @Autowired
+    public void setCreditauditDao(ICreditauditDao dao) {
+        this.creditauditDao = dao;
+        this.dao = dao;
+    }
+
+    /**
+     * @param requestJson
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     * @Author lvleigang
+     * @Description 信用额度审批单保存提交同步
+     * @Date 2:32 下午 2025/8/5
+     **/
+    @Override
+    public JsonResultEntity sendCreditauditData(JSONObject requestJson) {
+        logger.error("同步信用额度审批单保存提交入参" + requestJson.toJSONString());
+        JSONObject jsonStr = requestJson.getJSONObject("jsonStr");
+        if (jsonStr == null) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        JSONArray businessDataStr = jsonStr.getJSONArray("businessDataStr");
+        if (businessDataStr == null) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        JSONObject mainData = businessDataStr.getJSONObject(0);
+        if (mainData == null) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        //组装数据
+        //获取token
+        String token = null;
+        JSONObject tokenData = new JSONObject();
+        String tokenResult = HttpRequest.post(url).
+                header("appId", "800053").
+                header("apiCode", "8000530000").
+                header("publicKey", "ZJYAWb7lhAUTYqekPkU+uHJv1/ObJxb7dT7sD8HPRDGAgyhCe7eDIk+3zDUT+v578prj").
+                header("secretKey", "fviZnLBsQUAGF8w8FSOdJi7XlIm/XAZclMxRagDLfTyJFlvnIBF3w66Hrpfzs8cYj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=").
+                body(tokenData.toJSONString()).
+                execute().
+                body();
+        logger.error("BIP Token：" + tokenResult);
+        JSONObject resoutJson = JSONObject.parseObject(tokenResult);
+        if (resoutJson.getBoolean("flag")) {
+            token = resoutJson.getJSONObject("attribute").getJSONObject("data").getString("access_token");
+        } else {
+            return BaseResult.getFailureMessageEntity("获取BIP token失败");
+        }
+        JSONObject sendData = setSendCreditauditData(mainData);
+        logger.error("同步信用额度审批单保存提交单据发送参数：" + sendData.toJSONString());
+        String sendResult = HttpRequest.post(url).
+                header("appId", "800053").
+                header("apiCode", "8000530001").
+                header("access_token", token).
+                header("publicKey", "ZJYAWb7lhAUTYqekPkU+uHJv1/ObJxb7dT7sD8HPRDGAgyhCe7eDIk+3zDUT+v578prj").
+                header("secretKey", "fviZnLBsQUAGF8w8FSOdJi7XlIm/XAZclMxRagDLfTyJFlvnIBF3w66Hrpfzs8cYj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=").
+                body(sendData.toJSONString()).
+                execute().
+                body();
+        logger.error("同步信用额度审批单保存提交单据发送返回：" + sendResult);
+        JSONObject sendJson = JSONObject.parseObject(sendResult);
+        if (sendJson.getBoolean("flag")) {
+            return BaseResult.getSuccessMessageEntity("同步信用额度审批单保存提交单据发送成功");
+        } else {
+            return BaseResult.getFailureMessageEntity("同步信用额度审批单保存提交单据发送错误："+sendJson.getString("msg"));
+        }
+    }
+
+    /**
+     * @Author lvleigang
+     * @Description  组装参数
+     * @Date 2:47 下午 2025/8/5
+     * @param mainData
+     * @return com.alibaba.fastjson.JSONObject
+     **/
+    private JSONObject setSendCreditauditData(JSONObject mainData) {
+        JSONObject sendData = new JSONObject();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+
+        // 构建headVO对象
+        JSONObject headVO = new JSONObject();
+        headVO.put("pk_org", mainData.getString("field0031"));//信用控制域
+        headVO.put("ctrantypeid", mainData.getString("field0026"));//额度审批单类型
+        headVO.put("vtrantypecode", mainData.getString("field0027"));//交易类型编码
+        headVO.put("vbillcode", mainData.getString("field0033"));//单据号
+        headVO.put("dbilldate", mainData.getString("field0003"));//单据日期
+        headVO.put("dmakedate", mainData.getString("field0003"));//制单日期
+        headVO.put("fstatusflag","");//单据状态
+        headVO.put("billmaker", mainData.getString("field0029"));//制单人
+        headVO.put("vnote",  mainData.getString("field0011"));//备注
+        if(mainData.getString("field0036") != null && !"".equals(mainData.getString("field0036"))){
+            headVO.put("capplyerid", mainData.getString("field0036"));//申请人
+        }else {
+            headVO.put("capplyerid", "XONE");
+        }
+        if(mainData.getString("field0035") != null && !"".equals(mainData.getString("field0035"))){
+            headVO.put("capplydeptid", mainData.getString("field0035"));//申请部门
+        }else {
+            headVO.put("capplydeptid", "0201");
+        }
+        if(mainData.getString("field0029") != null && !"".equals(mainData.getString("field0029"))){
+            headVO.put("creator", mainData.getString("field0029"));
+        }else {
+            headVO.put("creator", "oagly");
+        }
+        //headVO.put("vdef1", "wxzvdef1");
+
+        // 构建bodyVOList数组中的第一个对象
+        JSONObject bodyVO = new JSONObject();
+        bodyVO.put("climittypeid", mainData.getString("field0030"));//额度类型
+        bodyVO.put("pk_org", mainData.getString("field0031"));//信用控制域
+        //bodyVO.put("csaleorgid", mainData.getString("field0002"));//销售组织
+            bodyVO.put("ccustid", mainData.getString("field0024"));//客户
+        //bodyVO.put("climitlevel", mainData.getString("field0002"));//信用等级
+        bodyVO.put("ccurrencyid", mainData.getString("field0023"));//币种
+        bodyVO.put("nlimitmny", mainData.getString("field0012"));//信用额度
+        bodyVO.put("dfromdate", mainData.getString("field0020"));//有效期从
+        Date dtodate = mainData.getDate("field0014");
+        bodyVO.put("dtodate", sdf.format(dtodate)+" 23:59:59");//有效期至
+        bodyVO.put("pk_income", mainData.getString("field0032"));//收款协议-虚拟字段
+        bodyVO.put("pk_saleorg", mainData.getString("field0031"));//销售组织-虚拟字段
+
+        //bodyVO.put("dbilldate", "2025-08-05 09:36:37");
+        //bodyVO.put("vnote", "wxzB备注");
+        //bodyVO.put("vbdef1", "wxzvbdef1");
+
+        // 创建JSON数组并添加bodyVO对象
+        JSONArray bodyVOList = new JSONArray();
+        bodyVOList.add(bodyVO);
+
+        // 将headVO和bodyVOList添加到外层对象
+        sendData.put("headVO", headVO);
+        sendData.put("bodyVOList", bodyVOList);
+
+        return sendData;
+    }
+
+
+
+
+    /**
+     * @param requestJson
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     * @Author lvleigang
+     * @Description 销售返利同步
+     * @Date 2:32 下午 2025/8/5
+     **/
+    @Override
+    public JsonResultEntity sendSalesRebateData(JSONObject requestJson) {
+        logger.error("同步销售返利入参" + requestJson.toJSONString());
+        JSONObject jsonStr = requestJson.getJSONObject("jsonStr");
+        if (jsonStr == null) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        JSONArray businessDataStr = jsonStr.getJSONArray("businessDataStr");
+        if (businessDataStr == null) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        JSONObject mainData = businessDataStr.getJSONObject(0);
+        JSONObject mxData = businessDataStr.getJSONObject(1);
+        if (mainData == null) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        JSONArray jsonArray = mxData.getJSONArray("formson_1788");
+        //组装数据
+        //获取token
+        String token = null; //todo
+        JSONObject tokenData = new JSONObject();
+        String tokenResult = HttpRequest.post(url).
+                header("appId", "800053").
+                header("apiCode", "8000530000").
+                header("publicKey", "ZJYAWb7lhAUTYqekPkU+uHJv1/ObJxb7dT7sD8HPRDGAgyhCe7eDIk+3zDUT+v578prj").
+                header("secretKey", "fviZnLBsQUAGF8w8FSOdJi7XlIm/XAZclMxRagDLfTyJFlvnIBF3w66Hrpfzs8cYj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=").
+                body(tokenData.toJSONString()).
+                execute().
+                body();
+        logger.error("BIP Token：" + tokenResult);
+        JSONObject resoutJson = JSONObject.parseObject(tokenResult);
+        if (resoutJson.getBoolean("flag")) {
+            token = resoutJson.getJSONObject("attribute").getJSONObject("data").getString("access_token");
+        } else {
+            return BaseResult.getFailureMessageEntity("获取BIP token失败");
+        }
+
+
+        JSONObject sendData = setSalesRebateData(mainData,jsonArray);
+        logger.error("同步销售返利发送参数：" + sendData.toJSONString());
+        String sendResult = HttpRequest.post(url).
+                header("appId", "800053").
+                header("apiCode", "8000530002").
+                header("access_token", token).
+                header("publicKey", "ZJYAWb7lhAUTYqekPkU+uHJv1/ObJxb7dT7sD8HPRDGAgyhCe7eDIk+3zDUT+v578prj").
+                header("secretKey", "fviZnLBsQUAGF8w8FSOdJi7XlIm/XAZclMxRagDLfTyJFlvnIBF3w66Hrpfzs8cYj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=").
+                body(sendData.toJSONString()).
+                execute().
+                body();
+        logger.error("同步销售返利发送返回：" + sendResult);
+        JSONObject sendJson = JSONObject.parseObject(sendResult);
+        if (sendJson.getBoolean("flag")) {
+            return BaseResult.getSuccessMessageEntity("同步销售返利发送成功");
+        } else {
+            return BaseResult.getFailureMessageEntity("同步销售返利发送错误："+sendJson.getString("msg"));
+        }
+    }
+
+    /**
+     * @Author lvleigang
+     * @Description  组装参数
+     * @Date 2:47 下午 2025/8/5
+     * @param mainData
+     * @return com.alibaba.fastjson.JSONObject
+     **/
+    private JSONObject setSalesRebateData(JSONObject mainData,JSONArray jsonArray) {
+        JSONObject sendData = new JSONObject();
+
+        // 构建salerebate对象
+        JSONObject salerebate = new JSONObject();
+        salerebate.put("pk_salerebate", null); // 主键
+        if(mainData.getString("field0021") != null && !"".equals(mainData.getString("field0021"))){
+            salerebate.put("pk_org", mainData.getString("field0021")); // 组织，必填，取Dee组织编码：如001
+        }else {
+            salerebate.put("pk_org", "001"); // 组织，必填，取Dee组织编码：如001
+        }
+        if(mainData.getString("field0021") != null && !"".equals(mainData.getString("field0021"))){
+            salerebate.put("pk_org_v", mainData.getString("field0021")); // 组织，必填，取Dee组织编码：如001
+        }else {
+            salerebate.put("pk_org_v", "001"); // 组织多版本，必填，取Dee组织编码：如001
+        }
+        salerebate.put("pk_group", "COCOS"); // pk_group
+        salerebate.put("vbillcode", mainData.getString("field0001")); // 返利申请单号，OA申请单号
+        salerebate.put("vdef3", mainData.getString("field0034")); // oa申请部门名称
+        salerebate.put("vdef2", mainData.getString("field0033")); // oa申请人名称
+        salerebate.put("maketime", mainData.getString("field0004")); // 制单时间，必填，格式：2025-08-08 00:00:00
+        salerebate.put("lastmaketime", null); // 最后修改时间，格式：2025-08-08 00:00:00
+        if(mainData.getString("field0022") != null && !"".equals(mainData.getString("field0022"))){
+            salerebate.put("creator", mainData.getString("field0022")); // 创建人，必填，用户编码：可默认oagly
+        }else {
+            salerebate.put("creator", "oagly"); // 创建人，必填，用户编码：可默认oagly
+        }
+        salerebate.put("creationtime", mainData.getString("field0004")); // 创建时间，必填，格式：2025-08-08 00:00:00
+        salerebate.put("modifier", null); // 最后修改人
+        if(mainData.getString("field0023") != null && !"".equals(mainData.getString("field0023"))){
+            salerebate.put("billtype", mainData.getString("field0023")); // 单据类型，必填，默认：30FL
+        }else {
+            salerebate.put("billtype", "30FL"); // 单据类型，必填，默认：30FL
+        }
+        salerebate.put("transtype", null); // 交易类型
+        salerebate.put("transtypepk", null); // 交易类型 pk
+        salerebate.put("applydate", mainData.getString("field0004")); // 申请日期，必填，格式：2025-08-08 00:00:00
+        //if(mainData.getString("field0024") != null && !"".equals(mainData.getString("field0024"))){
+        //    salerebate.put("pk_psndoc", mainData.getString("field0024"));
+        //}else {
+        //    salerebate.put("pk_psndoc", "XONE");
+        //}
+        //if(mainData.getString("field0025") != null && !"".equals(mainData.getString("field0025"))){
+        //    salerebate.put("pk_dept",  mainData.getString("field0025")); // 部门，部门编码
+        //}else {
+        //    salerebate.put("pk_dept", "0201");
+        //}
+
+        salerebate.put("totalaount", mainData.getString("field0026")); // 返利总额，必填，金额总额
+        salerebate.put("memo", mainData.getString("field0016")); // 备注
+        salerebate.put("approvenote", null); // 审批批语
+        salerebate.put("approver", null); // 审批人
+        salerebate.put("approvedate", null); // 审批时间，格式：2025-08-08 00:00:00
+        salerebate.put("approvestatus", null); // 审批状态
+        salerebate.put("emendenum", null); // 修订枚举
+        salerebate.put("billmaker", "oagly"); // 制单人
+        salerebate.put("vdef1", mainData.getString("field0026")); // 返利类型编码，必填，取Dee返利类型自定义档案编码
+
+        String field0009 = null;
+        String field0028 = null;
+        // 构建pk_salerebate_b数组
+        JSONArray salerebateBArray = new JSONArray();
+        for (int i = 0; i < jsonArray.size(); i++) {
+            JSONObject salerebateB = new JSONObject();
+            salerebateB.put("pk_salerebate_b", ""); // 主键
+            if(mainData.getString("field0021") != null && !"".equals(mainData.getString("field0021"))){
+                salerebateB.put("pk_org", mainData.getString("field0021")); // 组织，必填，取Dee组织编码：如001
+            }else {
+                salerebateB.put("pk_org", "001"); // 组织，必填，取表头组织编码
+            }
+            if(mainData.getString("field0021") != null && !"".equals(mainData.getString("field0021"))){
+                salerebateB.put("pk_org_v", mainData.getString("field0021")); // 组织，必填，取Dee组织编码：如001
+            }else {
+                salerebateB.put("pk_org_v", "001"); // 组织，必填，取表头组织编码
+            }
+            salerebateB.put("rowno", String.valueOf((i+1)*10)); // 行号，必填，默认第一行：10，多行20、30递增
+            salerebateB.put("cmaterialvid", null); // 物料，取DEE物料编码
+            salerebateB.put("cmaterialid", null); // 物料（版本），取DEE物料编码
+            salerebateB.put("materialspec", null); // 规格，取DEE物料对应的规格
+            salerebateB.put("pk_measdoc", null); // 主计量单位，取DEE计量单位的编码
+            salerebateB.put("money", jsonArray.getJSONObject(i).getString("field0014")); // 返利金额，必填，返利金额
+            field0009 = jsonArray.getJSONObject(i).getString("field0009");
+            field0028 = jsonArray.getJSONObject(i).getString("field0028");
+            salerebateB.put("vmemo", null); // 行备注
+            salerebateB.put("vbdef1", null); // 自定义项 1
+
+            // 将对象添加到数组
+            salerebateBArray.add(salerebateB);
+        }
+        salerebate.put("pk_customer", field0009); // 客户，必填，取DEE客户编码
+        salerebate.put("rebatetype", field0028); // 返利类型，必填，取Dee返利类型自定义档案编码
+        // 将salerebate和pk_salerebate_b添加到外层对象
+        sendData.put("salerebate", salerebate);
+        sendData.put("pk_salerebate_b", salerebateBArray);
+
+
+        return sendData;
+    }
+}

base-buildpackage/src/main/resources/application-kekao.yml

@@ -0,0 +1,58 @@
+#######################本地环境#######################
+logging:
+  #日志级别 指定目录级别
+  level:
+    root: error
+  encodings: UTF-8
+  file:
+    #    日志保存路径
+    path: D:\yongansystem\log\zs
+spring:
+  data:
+    mongodb:
+  flyway:
+    # 启动flyway migration, 默认为true
+    enabled: false
+  datasource:
+    dynamic:
+      druid:
+        filters: stat,log4j2
+      datasource:
+        master:
+          url: jdbc:mysql://127.0.0.1:3306/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
+          username: root
+          password: bd993088e8a7c3dc5f44441617f9b4bf
+          driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
+savefile:
+  #    文件保存路径
+  path: D:\yongansystem\log\zs
+  tomcatpath: D:\yongansystem\log\zs
+  pluginpath: D:\yongansystem\log\zs
+zt:
+  url: http://127.0.0.1:10086/kangarooDataCenterV3/entranceController/externalCallInterface
+cbs8:
+  appId: 1P4AGrpz
+  appSecret: 2c2369ae5dc04382844bbe3a5abf39e1bea9cd3a
+  url: https://cbs8-openapi-reprd.csuat.cmburl.cn
+  # 测试用这个 这个是银行给的，和下面的公钥不是一对密钥
+  ya_private_key: 83BA7EC821D35F4CB31FF9A51C1EFA520FC52AF828C2337F88E91CF119B07F44
+  # 这个私钥到时候上传到cbs，和下面到是同一对
+  #ya_private_key: e1eacfdee9b8d4184437d5a2071e17ce31befc3d93395f9f05709ed562e8dc46
+  ya_public_key: 044fa399d2223760f17b81b863cb482b009294c4516f8a605dea1475ec09e720eaa98468715e5ad509a592a0b426061551c5a3df236966c23253a7d894eac0dcde
+  cbs_public_key: 0469146F06BF3B01236E84632441E826
+  #电子回单下载临时存放位置
+  elec_path: /Users/xiangerlin/Downloads/
+OA:
+  data_source_code: yc_oa
+server:
+  port: 10086
+
+database:
+  databaseName: businesscenter
+  host: 192.168.2.237
+  port: 3306
+  username: root
+  password: hzya@1314
+  filePase: /Users/apple/Desktop/log
+  fileName: data.sql
+

base-buildpackage/src/main/resources/application-kekaotest.yml

@@ -0,0 +1,58 @@
+#######################本地环境#######################
+logging:
+  #日志级别 指定目录级别
+  level:
+    root: error
+  encodings: UTF-8
+  file:
+    #    日志保存路径
+    path: D:\yongansystem\log\test
+spring:
+  data:
+    mongodb:
+  flyway:
+    # 启动flyway migration, 默认为true
+    enabled: false
+  datasource:
+    dynamic:
+      druid:
+        filters: stat,log4j2
+      datasource:
+        master:
+          url: jdbc:mysql://127.0.0.1:3306/businesscentertest?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
+          username: root
+          password: bd993088e8a7c3dc5f44441617f9b4bf
+          driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
+savefile:
+  #    文件保存路径
+  path: D:\yongansystem\log\test
+  tomcatpath: D:\yongansystem\log\test
+  pluginpath: D:\yongansystem\log\test
+zt:
+  url: http://127.0.0.1:10087/kangarooDataCenterV3/entranceController/externalCallInterface
+cbs8:
+  appId: 1P4AGrpz
+  appSecret: 2c2369ae5dc04382844bbe3a5abf39e1bea9cd3a
+  url: https://cbs8-openapi-reprd.csuat.cmburl.cn
+  # 测试用这个 这个是银行给的，和下面的公钥不是一对密钥
+  ya_private_key: 83BA7EC821D35F4CB31FF9A51C1EFA520FC52AF828C2337F88E91CF119B07F44
+  # 这个私钥到时候上传到cbs，和下面到是同一对
+  #ya_private_key: e1eacfdee9b8d4184437d5a2071e17ce31befc3d93395f9f05709ed562e8dc46
+  ya_public_key: 044fa399d2223760f17b81b863cb482b009294c4516f8a605dea1475ec09e720eaa98468715e5ad509a592a0b426061551c5a3df236966c23253a7d894eac0dcde
+  cbs_public_key: 0469146F06BF3B01236E84632441E826
+  #电子回单下载临时存放位置
+  elec_path: /Users/xiangerlin/Downloads/
+OA:
+  data_source_code: yc_oa
+server:
+  port: 10086
+
+database:
+  databaseName: businesscenter
+  host: 192.168.2.237
+  port: 3306
+  username: root
+  password: hzya@1314
+  filePase: /Users/apple/Desktop/log
+  fileName: data.sql
+

base-buildpackage/src/main/resources/application-llg.yml

@@ -30,9 +30,12 @@ spring:
 #          password: 62e4295b615a30dbf3b8ee96f41c820b
 #          driver-class-name: dm.jdbc.driver.DmDriver
 #          type: com.alibaba.druid.pool.DruidDataSource
-          url: jdbc:mysql://ufidahz.com.cn:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
+#          url: jdbc:mysql://ufidahz.com.cn:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
+#          username: root
+#          password: 62e4295b615a30dbf3b8ee96f41c820b
+          url: jdbc:mysql://172.16.10.252:3306/businesscentertest?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
           username: root
-          password: 62e4295b615a30dbf3b8ee96f41c820b
+          password: bd993088e8a7c3dc5f44441617f9b4bf
           driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
 #          url: jdbc:dm://hzya.ufyct.com:9040/businesscenter?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8
 #          url: jdbc:dm://hzya.ufyct.com:9040?schema=businesscenter&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&compatibleMode=oracle
@@ -44,6 +47,7 @@ savefile:
   path: /Users/apple/Desktop/log/local
   tomcatpath: /Users/apple/Desktop/log/local
   pluginpath: /Users/apple/Desktop/log/local
+
 zt:
   url: http://127.0.0.1:10086/kangarooDataCenterV3/entranceController/externalCallInterface
 cbs8:

base-buildpackage/src/main/resources/cfgHome/plugin/kekao/pluginCfg.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin>
+<id>CreditauditPlugin</id>
+<name>CreditauditPlugin插件</name>
+<category>20250805001</category>
+</plugin>

base-buildpackage/src/main/resources/cfgHome/plugin/kekao/spring/spring-buildpackage-dao.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans default-autowire="byName">
+<bean name="creditauditDao" class="com.hzya.frame.plugin.kekao.dao.impl.CreditauditDaoImpl" />
+</beans>

base-buildpackage/src/main/resources/cfgHome/plugin/kekao/spring/spring-buildpackage-plugin.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans default-autowire="byName">
+<bean name="creditauditPluginInitializer" class="com.hzya.frame.plugin.kekao.plugin.CreditauditPluginInitializer" />
+<bean name="salesRebatePluginInitializer" class="com.hzya.frame.plugin.kekao.plugin.SalesRebatePluginInitializer" />
+</beans>

base-buildpackage/src/main/resources/cfgHome/plugin/kekao/spring/spring-buildpackage-service.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans default-autowire="byName">
+<bean name="creditauditService" class="com.hzya.frame.plugin.kekao.service.impl.CreditauditServiceImpl" />
+</beans>

base-service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java

@@ -1938,9 +1938,9 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
                 response = closeableHttpClient.execute(post);
 
                 HttpEntity entity = response.getEntity();
-                synchronized (lock) {
+//                synchronized (lock) {
                     body.append(EntityUtils.toString(entity,"UTF-8"));
-                }
+//                }
                 flag = true;
                 logger.info("返回结果：" + body);
             } catch (Exception e) {

base-webapp/pom.xml

@@ -18,11 +18,11 @@
             <artifactId>base-service</artifactId>
             <version>${revision}</version>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>com.hzya.frame</groupId>-->
-<!--            <artifactId>fw-bip</artifactId>-->
-<!--            <version>${revision}</version>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>com.hzya.frame</groupId>
+            <artifactId>fw-bip</artifactId>
+            <version>${revision}</version>
+        </dependency>
 <!--        <dependency>-->
 <!--            <groupId>com.hzya.frame</groupId>-->
 <!--            <artifactId>fw-cbs</artifactId>-->
@@ -54,11 +54,11 @@
 <!--            <artifactId>fw-ningbobank</artifactId>-->
 <!--            <version>${revision}</version>-->
 <!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>com.hzya.frame</groupId>-->
-<!--            <artifactId>fw-oa</artifactId>-->
-<!--            <version>${revision}</version>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>com.hzya.frame</groupId>
+            <artifactId>fw-oa</artifactId>
+            <version>${revision}</version>
+        </dependency>
 <!--        <dependency>-->
 <!--            <groupId>com.hzya.frame</groupId>-->
 <!--            <artifactId>fw-u8</artifactId>-->

fw-bip/pom.xml

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>kangarooDataCenterV3</artifactId>
+        <groupId>com.hzya.frame</groupId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>fw-bip</artifactId>
+    <packaging>jar</packaging>
+    <version>${revision}</version>
+
+    <dependencies>
+            <dependency>
+                <groupId>com.hzya.frame</groupId>
+                <artifactId>base-service</artifactId>
+                <version>${revision}</version>
+            </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>${mysql-connector-java}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.hzya.bip</groupId>
+            <artifactId>pubbaseapp_nccloud_rtLevel</artifactId>
+            <version>1</version>
+            <scope>system</scope>
+            <systemPath>${basedir}/src/main/webapp/WEB-INF/lib/pubbaseapp_nccloud_rtLevel-1.jar</systemPath>
+        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.hzya.bipyonyoulog</groupId>-->
+<!--            <artifactId>yonyoulog</artifactId>-->
+<!--            <version>1</version>-->
+<!--            <scope>system</scope>-->
+<!--            <systemPath>${basedir}/src/main/resources/lib/yonyoulog.jar</systemPath>-->
+<!--        </dependency>-->
+
+<!--        <dependency>-->
+<!--            <groupId>com.hzya.bcprov</groupId>-->
+<!--            <artifactId>bcprov</artifactId>-->
+<!--            <version>1</version>-->
+<!--            <scope>system</scope>-->
+<!--            <systemPath>${basedir}/src/main/resources/lib/bcprov-jdk15on-1.70.jar</systemPath>-->
+<!--        </dependency>-->
+
+<!--        <dependency>-->
+<!--            <groupId>com.hzya.DataApiSdk</groupId>-->
+<!--            <artifactId>DataApiSdk</artifactId>-->
+<!--            <version>1</version>-->
+<!--            <scope>system</scope>-->
+<!--            <systemPath>${basedir}/src/main/resources/lib/DataApiSdk-jar-with-dependencies.jar</systemPath>-->
+<!--        </dependency>-->
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass>none</mainClass>     <!-- 取消查找本项目下的Main方法：为了解决Unable to find main class的问题 -->
+                    <classifier>execute</classifier>    <!-- 为了解决依赖模块找不到此模块中的类或属性 -->
+                    <skip>true</skip>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/dao/IBipArchivesDao.java

@@ -0,0 +1,15 @@
+package com.hzya.frame.bip.v3.v2207.dao;
+
+import com.hzya.frame.basedao.dao.IBaseDao;
+import com.hzya.frame.bip.v3.v2207.entity.BipArchivesEntity;
+import com.hzya.frame.bip.v3.v2207.entity.BipOrgsEntity;
+
+import java.util.List;
+
+
+public interface IBipArchivesDao extends IBaseDao<BipArchivesEntity, String> {
+
+    List<BipArchivesEntity> queryArchivesData(BipArchivesEntity archivesEntity);
+    List<BipArchivesEntity> queryArchivesDatays(BipArchivesEntity archivesEntity);
+
+}

fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/dao/IBipOrgsDao.java

@@ -0,0 +1,17 @@
+package com.hzya.frame.bip.v3.v2207.dao;
+
+import com.hzya.frame.basedao.dao.IBaseDao;
+import com.hzya.frame.bip.v3.v2207.entity.BipOrgsEntity;
+
+import java.util.List;
+
+
+public interface IBipOrgsDao extends IBaseDao<BipOrgsEntity, String> {
+
+    /**
+     * 查询BIP业务单元
+     * @param BipOrgsEntity
+     * @return
+     */
+     List<BipOrgsEntity> thirdInterfaceGetOrgs(BipOrgsEntity BipOrgsEntity);
+}

fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/dao/IBipOrgsDetailsDao.java

@@ -0,0 +1,17 @@
+package com.hzya.frame.bip.v3.v2207.dao;
+
+import com.hzya.frame.basedao.dao.IBaseDao;
+import com.hzya.frame.bip.v3.v2207.entity.BipOrgsDetailsEntity;
+
+import java.util.List;
+
+
+public interface IBipOrgsDetailsDao extends IBaseDao<BipOrgsDetailsEntity, String> {
+
+    /**
+     * 查询BIP业务单元银行账户
+     * @param BipOrgsDetailsEntity
+     * @return
+     */
+    List<BipOrgsDetailsEntity> thirdInterfaceGetOrgsDetails(BipOrgsDetailsEntity BipOrgsDetailsEntity);
+}

fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/dao/IBipSupplierDao.java

@@ -0,0 +1,18 @@
+package com.hzya.frame.bip.v3.v2207.dao;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hzya.frame.basedao.dao.IBaseDao;
+import com.hzya.frame.bip.v3.v2207.entity.BipSupplierEntity;
+
+import java.util.List;
+
+
+public interface IBipSupplierDao extends IBaseDao<BipSupplierEntity, String> {
+
+    /**
+     * 查询BIP供应商
+     * @param bipSupplierEntity
+     * @return
+     */
+     List<BipSupplierEntity> thirdInterfaceGetSupplier(BipSupplierEntity bipSupplierEntity);
+}

fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/dao/IBipSupplierDetailsDao.java

@@ -0,0 +1,18 @@
+package com.hzya.frame.bip.v3.v2207.dao;
+
+import com.hzya.frame.basedao.dao.IBaseDao;
+import com.hzya.frame.bip.v3.v2207.entity.BipSupplierDetailsEntity;
+import com.hzya.frame.bip.v3.v2207.entity.BipSupplierEntity;
+
+import java.util.List;
+
+
+public interface IBipSupplierDetailsDao extends IBaseDao<BipSupplierDetailsEntity, String> {
+
+    /**
+     * 查询BIP供应商明细
+     * @param bipSupplierDetailsEntity
+     * @return
+     */
+    List<BipSupplierDetailsEntity> thirdInterfaceGetSupplierDetails(BipSupplierDetailsEntity bipSupplierDetailsEntity);
+}

fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/dao/impl/BipArchivesDaoImpl.java

@@ -0,0 +1,25 @@
+package com.hzya.frame.bip.v3.v2207.dao.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+import com.hzya.frame.bip.v3.v2207.dao.IBipArchivesDao;
+import com.hzya.frame.bip.v3.v2207.dao.IBipOrgsDao;
+import com.hzya.frame.bip.v3.v2207.entity.BipArchivesEntity;
+import com.hzya.frame.bip.v3.v2207.entity.BipOrgsEntity;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository("bipArchivesDaoImpl")
+public class BipArchivesDaoImpl extends MybatisGenericDao<BipArchivesEntity,String> implements IBipArchivesDao {
+
+    @Override
+    public List<BipArchivesEntity> queryArchivesData(BipArchivesEntity entity) {
+        List<BipArchivesEntity> o = super.query(getSqlIdPrifx() + "queryArchivesData", entity);
+        return o;
+    }   @Override
+    public List<BipArchivesEntity> queryArchivesDatays(BipArchivesEntity entity) {
+        List<BipArchivesEntity> o = super.query(getSqlIdPrifx() + "queryArchivesDatays", entity);
+        return o;
+    }
+}

fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/dao/impl/BipOrgsDaoImpl.java

@@ -0,0 +1,24 @@
+package com.hzya.frame.bip.v3.v2207.dao.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+import com.hzya.frame.bip.v3.v2207.dao.IBipOrgsDao;
+import com.hzya.frame.bip.v3.v2207.dao.IBipSupplierDao;
+import com.hzya.frame.bip.v3.v2207.entity.BipOrgsEntity;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository("bipOrgsDaoImpl")
+public class BipOrgsDaoImpl extends MybatisGenericDao<BipOrgsEntity,String> implements IBipOrgsDao {
+    /**
+     * 查询BIP业务单元
+     * @param BipOrgsEntity
+     * @return
+     */
+    @DS("oracle91")
+    @Override
+    public List<BipOrgsEntity> thirdInterfaceGetOrgs(BipOrgsEntity BipOrgsEntity) {
+        return super.query("com.hzya.frame.bip.v3.v2207.dao.impl.BipOrgsDaoImpl.thirdInterfaceGetOrgs",BipOrgsEntity);
+    }
+}

fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/dao/impl/BipOrgsDetailsDaoImpl.java

@@ -0,0 +1,19 @@
+package com.hzya.frame.bip.v3.v2207.dao.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+import com.hzya.frame.bip.v3.v2207.dao.IBipOrgsDetailsDao;
+import com.hzya.frame.bip.v3.v2207.dao.IBipSupplierDetailsDao;
+import com.hzya.frame.bip.v3.v2207.entity.BipOrgsDetailsEntity;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository("bipOrgsDetailsDaoImpl")
+public class BipOrgsDetailsDaoImpl extends MybatisGenericDao<BipOrgsDetailsEntity,String> implements IBipOrgsDetailsDao {
+    @DS("oracle91")
+    @Override
+    public List<BipOrgsDetailsEntity> thirdInterfaceGetOrgsDetails(BipOrgsDetailsEntity bipOrgsDetailsEntity) {
+         return super.query("com.hzya.frame.bip.v3.v2207.dao.impl.BipOrgsDetailsDaoImpl.thirdInterfaceGetOrgsDetails",bipOrgsDetailsEntity);
+    }
+}

fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/dao/impl/BipSupplierDaoImpl.java

@@ -0,0 +1,25 @@
+package com.hzya.frame.bip.v3.v2207.dao.impl;
+
+import cn.hutool.http.HttpRequest;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+import com.hzya.frame.bip.v3.v2207.dao.IBipSupplierDao;
+import com.hzya.frame.bip.v3.v2207.entity.BipSupplierEntity;
+import com.hzya.frame.util.HttpUtil;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository("bipSupplierDaoImpl")
+public class BipSupplierDaoImpl extends MybatisGenericDao<BipSupplierEntity,String> implements IBipSupplierDao {
+    /**
+     * 查询BIP供应商
+     * @param bipSupplierEntity
+     * @return
+     */
+    @DS("oracle91")
+    @Override
+    public List<BipSupplierEntity> thirdInterfaceGetSupplier(BipSupplierEntity bipSupplierEntity) {
+        return super.query("com.hzya.frame.bip.v3.v2207.dao.impl.BipSupplierDaoImpl.thirdInterfaceGetSupplier",bipSupplierEntity);
+    }
+}

fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/dao/impl/BipSupplierDetailsDaoImpl.java

@@ -0,0 +1,20 @@
+package com.hzya.frame.bip.v3.v2207.dao.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+import com.hzya.frame.bip.v3.v2207.dao.IBipSupplierDao;
+import com.hzya.frame.bip.v3.v2207.dao.IBipSupplierDetailsDao;
+import com.hzya.frame.bip.v3.v2207.entity.BipSupplierDetailsEntity;
+import com.hzya.frame.bip.v3.v2207.entity.BipSupplierEntity;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository("bipSupplierDetailsDaoImpl")
+public class BipSupplierDetailsDaoImpl extends MybatisGenericDao<BipSupplierDetailsEntity,String> implements IBipSupplierDetailsDao {
+    @DS("oracle91")
+    @Override
+    public List<BipSupplierDetailsEntity> thirdInterfaceGetSupplierDetails(BipSupplierDetailsEntity bipSupplierDetailsEntity) {
+         return super.query("com.hzya.frame.bip.v3.v2207.dao.impl.BipSupplierDetailsDaoImpl.thirdInterfaceGetSupplierDetails",bipSupplierDetailsEntity);
+    }
+}

fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/dps/service/IPayMentService.java

@@ -0,0 +1,38 @@
+package com.hzya.frame.bip.v3.v2207.dps.service;
+
+import com.alibaba.fastjson.JSONObject;
+
+
+public interface IPayMentService {
+    
+    /**
+     * 
+     * @content 获取杭泰OA付款单传递CFS
+     * @Param 
+     * @Return 
+     * @Author hecan 
+     * @Date 2023/10/16 11:59
+     * **/
+    String sendOAPayMentToCFS(JSONObject jsonObject, String type);
+    
+    /**
+     * 
+     * @content 获取CFS登录校验码
+     * @Param 
+     * @Return 
+     * @Author hecan 
+     * @Date 2023/10/16 13:37
+     * **/
+    String sendCFSToken(String name, String password);
+
+    /**
+     *
+     * @content 获取杭泰OA报销单传递CFS
+     * @Param
+     * @Return
+     * @Author hecan
+     * @Date 2023/10/16 16:17
+     * **/
+    String sendExpenseToCFS(JSONObject jsonObject);
+
+}

fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/dps/service/impl/PayMentServiceImpl.java

@@ -0,0 +1,389 @@
+package com.hzya.frame.bip.v3.v2207.dps.service.impl;
+
+import cn.hutool.http.HttpRequest;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.bip.v3.v2207.dps.service.IPayMentService;
+import com.hzya.frame.dateutil.DateUtil;
+import org.dom4j.Document;
+import org.dom4j.DocumentHelper;
+import org.dom4j.Element;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.xml.sax.InputSource;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import java.io.StringReader;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+
+@Service(value = "payMentServiceImpl")
+public class PayMentServiceImpl implements IPayMentService {
+
+    private static final Logger logger = LoggerFactory.getLogger(PayMentServiceImpl.class);
+
+    private static  final String NAME="admin";
+    private static final String PASSWORD="aHRzejg4OA==";
+    private static final String CFSURL="http://101.132.140.208:26883/erp/services/";//测试端口:26893,正式端口:26883
+
+    /**
+     *
+     * @content 杭泰OA付款单传递CFS 注：付款单，资金归集，资金拨付，同名账户划转和借款单都用同一个接口
+     * @Param
+     * @Return
+     * @Author hecan
+     * @Date 2023/10/13 10:40
+     * **/
+    public String sendOAPayMentToCFS(JSONObject jsonStr,String type){
+        logger.info("开始执行杭泰OA付款单传递CFS");
+        try {
+        String cfsToken = sendCFSToken(NAME, PASSWORD);
+        if(null!=cfsToken) {
+            String jsonStrObj = jsonStr.getString("jsonStr");
+            JSONObject jsonObjectMain = JSON.parseObject(jsonStrObj);
+            String erpVoucherNo = jsonObjectMain.getString("erpVoucherNo");//OA主键
+            String purpose = jsonObjectMain.getString("purpose");//摘要
+            String isForindividual = "0";//是否对私付款
+            StringBuffer stringBuffer = new StringBuffer();
+            String documentType=null;
+            switch (type){
+                case "pay"://付款单
+                    documentType="01";
+                    break;
+                case "fundc"://资金归集
+                    documentType="02";
+                    break;
+                case "funda"://资金拨付
+                    documentType="03";
+                    break;
+                case "acc"://同名账户划转
+                    documentType="04";
+                    break;
+                case "loan"://借款单
+                    documentType="05";
+                    break;
+                default:
+                    break;
+            }
+            JSONArray jsonStrList = jsonObjectMain.getJSONArray("details");
+            if (null != jsonStrList && jsonStrList.size() > 0) {
+                for (Object seeyonEntity : jsonStrList) {
+                    JSONObject jsonObjectFormson = JSON.parseObject(JSON.toJSONString(seeyonEntity));
+                    String payerAccName = jsonObjectFormson.getString("payerAccName");//转出方账户名(付款账户)
+                    String payerAccNo = jsonObjectFormson.getString("payerAccNo");//转出方账号(付款账号)
+                    String curCode = jsonObjectFormson.getString("curCode");//付款方币种
+                    String payeeAccName = jsonObjectFormson.getString("payeeAccName");//收款人帐户名称
+                    String payeeAccNo = jsonObjectFormson.getString("payeeAccNo");//收款方账户号
+                    BigDecimal amount = jsonObjectFormson.getBigDecimal("amount");//发生额
+                    String payeeBankCode = jsonObjectFormson.getString("payeeBankCode");//联行号
+                    String isQuick = jsonObjectFormson.getString("isQuick");//加急标志
+                    String payType = jsonObjectFormson.getString("payType");//结算方式
+                    String businessType = jsonObjectFormson.getString("businessType");//业务类别
+                    stringBuffer.append("<map>\n");
+                    stringBuffer.append("<documentType>" + nullConvert(documentType) + "</documentType>\n");
+                    stringBuffer.append("<erpVoucherNo>" + nullConvert(erpVoucherNo) + "</erpVoucherNo>\n");
+                    //stringBuffer.append("<payerAccName>"+"浙江杭泰数智能源开发有限公司"+"</payerAccName>\n");
+                    stringBuffer.append("<payerAccName>"+nullConvert(payerAccName)+"</payerAccName>\n");
+                    //stringBuffer.append("<payerAccNo>" +"71010122002702903"+ "</payerAccNo>\n");
+                    stringBuffer.append("<payerAccNo>" + nullConvert(payerAccNo) + "</payerAccNo>\n");
+                    stringBuffer.append("<curCode>" + nullConvert(curCode) + "</curCode>\n");
+                    stringBuffer.append("<payeeAccName>" + nullConvert(payeeAccName) + "</payeeAccName>\n");
+                    stringBuffer.append("<payeeAccNo>" + nullConvert(payeeAccNo) + "</payeeAccNo>\n");
+                    stringBuffer.append("<amount>" + nullConvert(String.valueOf(amount)) + "</amount>\n");
+                    //stringBuffer.append("<payeeBankCode>"+"301331000029"+"</payeeBankCode>\n");
+                    stringBuffer.append("<payeeBankCode>"+nullConvert(payeeBankCode)+"</payeeBankCode>\n");
+                    stringBuffer.append("<isQuick>" + nullConvert(isQuick) + "</isQuick>\n");
+                    stringBuffer.append("<isForindividual>" + nullConvert(isForindividual) + "</isForindividual>\n");
+                    stringBuffer.append("<payType>" + nullConvert(payType) + "</payType>\n");
+                    stringBuffer.append("<purpose>" + nullConvert(purpose) + "</purpose>\n");
+                    stringBuffer.append("<businessType>" + nullConvert(businessType) + "</businessType>\n");
+                    stringBuffer.append("<debitByCustomer>" + nullConvert(jsonObjectFormson.getString("debitByCustomer")) + "</debitByCustomer>\n");//借方客商辅助核算编码
+                    stringBuffer.append("<debitByBankAcc>" + nullConvert(payeeAccNo) + "</debitByBankAcc>\n");//借方银行账户辅助核算编码
+                    stringBuffer.append("<debitByPersonnel>" + nullConvert(jsonObjectFormson.getString("debitByPersonnel")) + "</debitByPersonnel>\n");//借方人员辅助核算编码
+                    stringBuffer.append("<creditByCustomer>" + nullConvert(jsonObjectFormson.getString("creditByCustomer")) + "</creditByCustomer>\n");//贷方客商辅助核算编码
+                    stringBuffer.append("<creditByBankAcc>" + nullConvert(payerAccNo) + "</creditByBankAcc>\n");//贷方银行辅助核算编码
+                    stringBuffer.append("</map>\n");
+                }
+            } else {
+                stringBuffer.append("<map>\n");
+                stringBuffer.append("<erpVoucherNo>" + nullConvert(erpVoucherNo) + "</erpVoucherNo>");
+                stringBuffer.append("<purpose>" + nullConvert(purpose) + "</purpose>");
+                stringBuffer.append("<isForindividual>" + nullConvert(isForindividual) + "</isForindividual>");
+                stringBuffer.append("</map>\n");
+            }
+            String result=null;
+            String xml= requestXML(cfsToken,"BkPaymentMainExchange",stringBuffer,"OA付款单同步发送");
+            String url = "HTSZ_OA_BkPaymentMainWebService?wsdl";
+            switch (type){
+                case "pay"://付款单
+                    logger.info("OA付款单发送CFS的请求参数为:{}", xml);
+                     result = HttpRequest.post(CFSURL+url).header("Content-Type", "soap/xml").timeout(30000).body(xml).execute().body();
+                    logger.info("OA付款单发送CFS的返回参数为:{}", result);
+                    break;
+                case "fundc"://资金归集
+                    logger.info("OA资金归集发送CFS的请求参数为:{}", xml);
+                     result = HttpRequest.post(CFSURL+url).header("Content-Type", "soap/xml").timeout(30000).body(xml).execute().body();
+                    logger.info("OA资金归集发送CFS的返回参数为:{}", result);
+                    break;
+                case "funda"://资金调拨
+                    logger.info("OA资金拨付发送CFS的请求参数为:{}", xml);
+                     result = HttpRequest.post(CFSURL+url).header("Content-Type", "soap/xml").timeout(30000).body(xml).execute().body();
+                    logger.info("OA资金拨付发送CFS的返回参数为:{}", result);
+                    break;
+                case "acc"://同名账户划转
+                    logger.info("OA同名账户划转发送CFS的请求参数为:{}", xml);
+                     result = HttpRequest.post(CFSURL+url).header("Content-Type", "soap/xml").timeout(30000).body(xml).execute().body();
+                    logger.info("OA同名账户划转发送CFS的返回参数为:{}", result);
+                    break;
+                case "loan"://借款单
+                    logger.info("OA借还款发送CFS的请求参数为:{}", xml);
+                     result = HttpRequest.post(CFSURL+url).header("Content-Type", "soap/xml").timeout(30000).body(xml).execute().body();
+                    logger.info("OA借还款发送CFS的返回参数为:{}", result);
+                    break;
+                default:
+                    break;
+            }
+            return analyzeXML(result,"pay");
+        }else{
+            logger.info("请先登录CFS登录接口获取Token");
+            return null;
+        }
+    } catch (Exception e) {
+        e.printStackTrace();
+        logger.info("杭泰OA付款单传递CFS错误，原因为:{}", e.getMessage());
+    }
+        return null;
+    }
+
+    /**
+     *
+     * @content 获取CFS登录校验码
+     * @Param
+     * @Return
+     * @Author hecan
+     * @Date 2023/10/13 15:38
+     * **/
+    public String sendCFSToken(String name,String password)  {
+        try {
+            String xml="<soap:Envelope xmlns:soap=\"http://www.w3.org/2003/05/soap-envelope\" xmlns:mdm=\"http://mdmData.server.webservice.banck.com\">\n" +
+                    "   <soap:Header/>\n" +
+                    "   <soap:Body>\n" +
+                    "      <mdm:intoPaymentDataXml>\n" +
+                    "         <!--Optional:-->\n" +
+                    "         <mdm:xml>\n" +
+                    "         <![CDATA[\n" +
+                    "           <?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+                    "<message>\n" +
+                    "<head>\n" +
+                    "<transCode>LogOn</transCode>\n" +
+                    "<erpTimestamp>"+DateUtil.dateToString(new Date(), "yyyy-MM-dd HH:mm:ss")+"</erpTimestamp>\n" +
+                    "<sourcePlat>OA</sourcePlat>\n" +
+                    "<desPlat>CFS</desPlat>\n" +
+                    "<rmk>OA登录验证发送</rmk>\n" +
+                    "</head>\n" +
+                    "<body>\n" +
+                    "<user>"+name+"</user>\n" +
+                    "<password>"+password+"</password>\n" +
+                    "</body>\n" +
+                    "</message>\n" +
+                    "         ]]>\n" +
+                    "         </mdm:xml>\n" +
+                    "      </mdm:intoPaymentDataXml>\n" +
+                    "   </soap:Body>\n" +
+                    "</soap:Envelope>";
+            logger.info("CFS登录的请求参数为:{}",xml);
+            String url="HTSZ_OA_LogOnWebService?wsdl";
+            String result = HttpRequest.post(CFSURL+url).header("Content-Type", "soap/xml").timeout(30000).body(xml).execute().body();
+            logger.info("CFS登录的返回参数为:{}",result);
+            return analyzeXML(result,"login");
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.info("获取CFS登录失败，原因为:{}",e.getMessage());
+        }
+        return null;
+    }
+
+    /**
+     *
+     * @content 获取杭泰OA报销单传递CFS
+     * @Param
+     * @Return
+     * @Author hecan
+     * @Date 2023/10/16 16:17
+     * **/
+    @Override
+    public String sendExpenseToCFS(JSONObject jsonStr) {
+        logger.info("开始执行杭泰OA报销单传递CFS");
+        try {
+            String token = sendCFSToken(NAME, PASSWORD);
+            if(null != token){
+                String jsonStrObj = jsonStr.getString("jsonStr");
+                JSONObject jsonObjectMain = JSON.parseObject(jsonStrObj);
+                String erpVoucherNo = jsonObjectMain.getString("erpVoucherNo");//OA主键
+                String purpose = jsonObjectMain.getString("purpose");//摘要
+                StringBuffer stringBuffer = new StringBuffer();
+                JSONArray jsonStrList = jsonObjectMain.getJSONArray("details");
+                if(null != jsonStrList && jsonStrList.size()>0){
+                    for (Object o : jsonStrList) {
+                        JSONObject jsonObjectDetails = JSON.parseObject(JSON.toJSONString(o));
+                                String payerAccName = jsonObjectDetails.getString("payerAccName");//转出方账户名(付款账户)
+                                String payerAccNo = jsonObjectDetails.getString("payerAccNo");//转出方账号(付款账号)
+                                String curCode = jsonObjectDetails.getString("curCode");//付款方币种
+                                String payeeAccName = jsonObjectDetails.getString("payeeAccName");//收款人帐户名称
+                                String payeeAccNo = jsonObjectDetails.getString("payeeAccNo");//收款方账户号
+                                BigDecimal amount = jsonObjectDetails.getBigDecimal("amount");//发生额
+                                String payeeBankCode = jsonObjectDetails.getString("payeeBankCode");//联行号
+                                String isQuick = jsonObjectDetails.getString("isQuick");//加急标志
+                                String payType = jsonObjectDetails.getString("payType");//结算方式
+                                stringBuffer.append("<map>\n");
+                                stringBuffer.append("<erpVoucherNo>" + nullConvert(erpVoucherNo) + "</erpVoucherNo>\n");
+                                stringBuffer.append("<payerAccName>" + nullConvert(payerAccName) + "</payerAccName>\n");
+                                //stringBuffer.append("<payerAccName>"+"浙江杭泰数智能源开发有限公司"+"</payerAccName>\n");
+                                stringBuffer.append("<payerAccNo>" + nullConvert(payerAccNo) + "</payerAccNo>\n");
+                                //stringBuffer.append("<payerAccNo>" +"71010122002702903"+ "</payerAccNo>\n");
+                                stringBuffer.append("<curCode>" + nullConvert(curCode) + "</curCode>\n");
+                                stringBuffer.append("<payeeAccName>" + nullConvert(payeeAccName) + "</payeeAccName>\n");
+                                stringBuffer.append("<payeeAccNo>" + nullConvert(payeeAccNo) + "</payeeAccNo>\n");
+                                stringBuffer.append("<amount>" + nullConvert(String.valueOf(amount)) + "</amount>\n");
+                                stringBuffer.append("<payeeBankCode>" + nullConvert(payeeBankCode) + "</payeeBankCode>\n");
+                                //stringBuffer.append("<payeeBankCode>"+"301331000029"+"</payeeBankCode>\n");
+                                stringBuffer.append("<isQuick>" + nullConvert(isQuick) + "</isQuick>\n");
+                                stringBuffer.append("<payType>" + nullConvert(payType) + "</payType>\n");
+                                stringBuffer.append("<purpose>" + nullConvert(purpose) + "</purpose>\n");
+                                stringBuffer.append("</map>\n");
+                            }
+                        } else {
+                            stringBuffer.append("<map>\n");
+                            stringBuffer.append("<erpVoucherNo>" + erpVoucherNo + "</erpVoucherNo>\n");
+                            stringBuffer.append("<purpose>" + purpose + "</purpose>\n");
+                            stringBuffer.append("</map>\n");
+                        }
+               String xml= requestXML(token,"BkExpenseExchange",stringBuffer,"OA费用报销单同步发送");
+                logger.info("OA报销单发送CFS的请求参数为:{}", xml);
+                String url = "HTSZ_OA_BkExpenseWebService?wsdl";
+                String result = HttpRequest.post(CFSURL+url).header("Content-Type", "soap/xml").timeout(30000).body(xml).execute().body();
+                logger.info("OA报销单发送CFS的返回参数为:{}", result);
+                return analyzeXML(result,"pay");
+            }
+        }catch (Exception e){
+            logger.info("杭泰OA报销单传递CFS错误，原因为:{}", e.getMessage());
+        }
+        return null;
+    }
+
+    //null转成空字符串
+    private static String nullConvert(String str){
+        if (null == str){
+            return "";
+        }
+        return str;
+    }
+
+    private String requestXML(String token,String code,StringBuffer stringBuffer,String remark){
+        String xml = "<soap:Envelope xmlns:soap=\"http://www.w3.org/2003/05/soap-envelope\" xmlns:mdm=\"http://mdmData.server.webservice.banck.com\">\n" +
+                "   <soap:Header/>\n" +
+                "   <soap:Body>\n" +
+                "      <mdm:intoPaymentDataXml>\n" +
+                "         <!--Optional:-->\n" +
+                "         <mdm:xml>\n" +
+                "         <![CDATA[\n" +
+                "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+                "<message>\n" +
+                "<head>\n" +
+                "<transCode>" + code + "</transCode>\n" +
+                "<erpTimestamp>" + DateUtil.dateToString(new Date(), "yyyy-MM-dd HH:mm:ss") + "</erpTimestamp>\n" +
+                "<sourcePlat>OA</sourcePlat>\n" +
+                "<desPlat>CFS</desPlat>\n" +
+                "<rmk>" + remark + "</rmk>\n" +
+                "<sessionId>" + token + "</sessionId>\n" +
+                "</head>\n" +
+                "<body>\n" +
+                "<list>\n";
+        if (stringBuffer != null) {
+            xml += stringBuffer.toString();
+            xml += "</list>\n" +
+                    "</body>\n" +
+                    "</message>\n" +
+                    " ]]>\n" +
+                    "         </mdm:xml>\n" +
+                    "      </mdm:intoPaymentDataXml>\n" +
+                    "   </soap:Body>\n" +
+                    "</soap:Envelope>";
+        } else {
+            xml += "</list>\n" +
+                    "</body>\n" +
+                    "</message>\n" +
+                    "]]>\n" +
+                    "         </mdm:xml>\n" +
+                    "      </mdm:intoPaymentDataXml>\n" +
+                    "   </soap:Body>\n" +
+                    "</soap:Envelope>";
+        }
+        return xml;
+    }
+
+    /**
+     *
+     * @content 解析CFS返回的xml格式
+     * @Param
+     * @Return
+     * @Author hecan
+     * @Date 2023/10/19 14:07
+     * **/
+    private static  String analyzeXML(String result,String type){
+        try {
+            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+            DocumentBuilder builder = factory.newDocumentBuilder();
+            org.w3c.dom.Document document = builder.parse(new InputSource(new StringReader(result)));
+            org.w3c.dom.Element bodyElement = (org.w3c.dom.Element) document.getElementsByTagName("ns:return").item(0);
+            if (null!=bodyElement) {
+                String textContent = bodyElement.getTextContent();
+                Document documentContext = DocumentHelper.parseText(textContent);
+                Element rootElement = documentContext.getRootElement();
+                Element body = rootElement.element("body");
+                if (null != body) {
+                    switch (type) {
+                        case "login"://登录
+                            Element sessionId = body.element("sessionId");
+                            if (null != sessionId) {
+                                logger.info("CFS登录的登录校验码为:{}", sessionId.getText());
+                                return sessionId.getText();
+                            } else {
+                                logger.info("CFS登录的登录校验码没有获取到，请重新获取");
+                                return null;
+                            }
+                        case "pay"://付款单和报销单
+                            Element list = body.element("list");
+                            List<Element> elements = list.elements();
+                            String serialNo = null;
+                            String statusMsg = null;
+                            String erpVoucherNoCfs = null;
+                            for (Element element : elements) {
+                                serialNo = element.element("serialNo").getText();
+                                statusMsg = element.element("statusMsg").getText();
+                                erpVoucherNoCfs = element.element("erpVoucherNo").getText();
+                            }
+                            JSONObject jsonObject=new JSONObject();
+                            jsonObject.put("erpVoucherNoCfs",erpVoucherNoCfs);
+                            jsonObject.put("statusMsg",statusMsg);
+                            jsonObject.put("serialNo",serialNo);
+                            //return "当前单据：" + erpVoucherNoCfs + ",传递CFS返回信息:" + statusMsg + ",流水号:" + serialNo;
+                            return jsonObject.toJSONString();
+                        default:
+                            break;
+                    }
+                }
+            }
+        }catch (Exception e){
+            logger.info("解析CFS返回的xml格式错误:{}",e.getMessage());
+        }
+        return null;
+    }
+
+
+}

fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/dps/task/ElectronicTask.java

@@ -0,0 +1,194 @@
+package com.hzya.frame.bip.v3.v2207.dps.task;
+
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.bip.v3.v2207.dps.service.IPayMentService;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.io.File;
+import java.util.HashMap;
+
+
+@EnableScheduling
+@Component
+public class ElectronicTask {
+    static Logger logger= LoggerFactory.getLogger(ElectronicTask.class);
+
+    @Resource
+    private IPayMentService payMentService;
+    //@Resource
+    //private ISeeYonDao seeYonDao;
+    //@Resource
+    //private ICtpAttachmentDao ctpAttachmentDao;
+
+
+    //@Scheduled(cron = "0 20 10 * * ?")
+    //public void sendElectronicToCFS() {
+    //    logger.info("CFS电子回单共享开始执行---------->");
+    //    try {
+    //        String token = payMentService.sendCFSToken("admin", "aHRzejg4OA==");
+    //        if(null!=token) {
+    //            List<SeeyonEntity> seeyonEntities = seeYonDao.selectOAListByTypeformmain_0327(new SeeyonEntity());
+    //            if (seeyonEntities != null && seeyonEntities.size() > 0) {
+    //                for (SeeyonEntity seeyonEntity : seeyonEntities) {
+    //                    String bankAcc = seeyonEntity.getField0137();//付款账号
+    //                    //String bankAcc="03005389347";
+    //                    String erpVoucherNo = seeyonEntity.getId();//OA付款单号
+    //                    String xml = "<soap:Envelope xmlns:soap=\"http://www.w3.org/2003/05/soap-envelope\" xmlns:mdm=\"http://mdmData.server.webservice.banck.com\">\n" +
+    //                            "   <soap:Header/>\n" +
+    //                            "   <soap:Body>\n" +
+    //                            "      <mdm:intoPaymentDataXml>\n" +
+    //                            "         <!--Optional:-->\n" +
+    //                            "         <mdm:xml>\n" +
+    //                            "         <![CDATA[\n" +
+    //                            "         <?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+    //                            "<message>\n" +
+    //                            "<head>\n" +
+    //                            "<transCode>BkReceiptQueryExchange</transCode>\n" +
+    //                            "<erpTimestamp>" + DateUtil.dateToString(new Date(), "yyyy-mm-dd hh:mm:ss") + "</erpTimestamp>\n" +
+    //                            "<sourcePlat>CFS</sourcePlat>\n" +
+    //                            "<desPlat>OA</desPlat>\n" +
+    //                            "<rmk>OA电子回单共享发送</rmk>\n" +
+    //                            "<sessionId>" + token + "</sessionId>\n" +
+    //                            "</head>\n" +
+    //                            "<body>\n" +
+    //                            "<bankAcc>" + bankAcc + "</bankAcc>\n" +
+    //                            "<erpVoucherNo>" + erpVoucherNo + "</erpVoucherNo>\n" +
+    //                            "</body>\n" +
+    //                            "</message>\n" +
+    //                            "         ]]>\n" +
+    //                            "         </mdm:xml>\n" +
+    //                            "      </mdm:intoPaymentDataXml>\n" +
+    //                            "   </soap:Body>\n" +
+    //                            "</soap:Envelope>";
+    //                    logger.info("CFS电子回单共享请求参数为:{}", xml);
+    //                    String url = "http://101.132.140.208:26893/erp/services/HTSZ_OA_BkReceiptQueryWebService?wsdl";
+    //                    String result = HttpRequest.post(url).header("Content-Type", "soap/xml").timeout(30000).body(xml).execute().body();
+    //                    logger.info("CFS电子回单共享请求参数为:{}", result);
+    //                    DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+    //                    DocumentBuilder builder = factory.newDocumentBuilder();
+    //                    org.w3c.dom.Document document = builder.parse(new InputSource(new StringReader(result)));
+    //                    org.w3c.dom.Element bodyElement = (org.w3c.dom.Element) document.getElementsByTagName("ns:return").item(0);
+    //                    if (null != bodyElement) {
+    //                        String textContent = bodyElement.getTextContent();
+    //                        Document documentContext = DocumentHelper.parseText(textContent);
+    //                        Element rootElement = documentContext.getRootElement();
+    //                        Element body = rootElement.element("body");
+    //                        if("0000".equalsIgnoreCase(rootElement.element("head").element("returnCode").getText())){
+    //                            if (null != body) {
+    //                                Element listElc = body.element("list");
+    //                                List<Element> elementsElc = listElc.elements();
+    //                                for (Element element : elementsElc) {
+    //                                    String fielPath = element.element("filePath").getText();//电子回单附件路径
+    //                                    if (fielPath != null && fielPath!="") {
+    //                                        // String fielPath="C:\\Users\\笃曙\\Desktop\\15HZ000342CIBN2023091100066856211000001.pdf";
+    //                                        File file = new File(fielPath);
+    //                                        JSONObject jsonObject = fileUpload(file);
+    //                                        logger.info("上传返回的附件id为:{}", jsonObject.getString("fileUrl"));
+    //                                        if (jsonObject.getString("fileUrl") != null) {
+    //                                            //表单的附件字段=ctpAttachment的Sub_reference，表单的Summary_id=ctpAttachment的att_reference
+    //                                            String sub_reference = String.valueOf(UUIDLong.longUUID());
+    //                                            seeyonEntity.setField0264(sub_reference);
+    //                                            seeYonDao.updateFormformmain_0327(seeyonEntity);
+    //                                            //根据附件id查询附件业务数据
+    //                                            String file_url = jsonObject.getString("fileUrl");
+    //                                            CtpAttachmentEntity ctpAttachmentEntity = new CtpAttachmentEntity();
+    //                                            ctpAttachmentEntity.setFile_url(file_url);
+    //                                            String att_reference = seeyonEntity.getSummary_id();//Summary_id
+    //                                            ctpAttachmentEntity.setSub_reference(sub_reference);
+    //                                            ctpAttachmentEntity.setAtt_reference(att_reference);
+    //                                            List<CtpAttachmentEntity> ctpAttachmentEntities = ctpAttachmentDao.queryCtpAttachment(ctpAttachmentEntity);
+    //                                            //如果没有查询到数据，就新增附件业务，否则更新
+    //                                            if (ctpAttachmentEntities.size() == 0) {
+    //                                                String category = jsonObject.getString("category");
+    //                                                String type = jsonObject.getString("type");
+    //                                                String filename = jsonObject.getString("filename");
+    //                                                String mime_type = jsonObject.getString("mimeType");
+    //                                                String attachment_size = jsonObject.getString("size");
+    //                                                String id = String.valueOf(UUIDLong.longUUID());
+    //                                                ctpAttachmentEntity.setCategory(category);
+    //                                                ctpAttachmentEntity.setFilename(filename);
+    //                                                ctpAttachmentEntity.setType(type);
+    //                                                ctpAttachmentEntity.setMime_type(mime_type);
+    //                                                ctpAttachmentEntity.setAttachment_size(attachment_size);
+    //                                                ctpAttachmentEntity.setId(id);
+    //                                                ctpAttachmentEntity.setCategory("66");
+    //                                                ctpAttachmentEntity.setCreatedate(new Date());
+    //                                                ctpAttachmentDao.saveCtpAttachment(ctpAttachmentEntity);
+    //                                            } else {
+    //                                                if (ctpAttachmentEntities.size() > 1) {
+    //                                                    throw new BaseSystemException("OA附件业务表中查到多条记录");
+    //                                                }
+    //                                                //更新数据到OA附件业务表中
+    //                                                ctpAttachmentDao.updateCtpAttachment(ctpAttachmentEntity);
+    //                                            }
+    //                                        }
+    //                                    }
+    //                                }
+    //                            }
+    //                        }else{
+    //                            logger.info("CFS电子回单返回得错误编码：{}，以及返回的错误信息:{}",rootElement.element("head").element("returnCode").getText(),rootElement.element("head").element("returnMsg").getText());
+    //                        }
+    //                    }
+    //                }
+    //            }
+    //        }
+    //    }catch (Exception e){
+    //        logger.info("CFS电子回单共享错误:{}",e.getMessage());
+    //    }
+    //}
+
+
+    public static JSONObject fileUpload(File file) {
+        if (null != file) {
+            try {
+                HashMap<String, Object> paramMap = new HashMap<>();
+                paramMap.put("file", file);
+                String url = "/seeyon/rest/attachment?token=@token@";//如果后面加上applicationCategory=1&extensions=&firstSave=true，附件业务自动生成一条记录
+                url = url.replaceAll("@token@", getToken());
+                String result = HttpUtil.post("http://60.204.152.210" + url, paramMap);
+                if (StrUtil.isNotBlank(result)) {
+                    logger.info("附件上传结果"+result);
+                    JSONObject jsonObject = JSONObject.parseObject(result);
+                    String atts = jsonObject.get("atts").toString();
+                    if (StrUtil.isNotEmpty(atts)) {
+                        JSONArray jsonArray = JSONArray.parseArray(atts);
+                        JSONObject res = (JSONObject) jsonArray.get(0);
+                       /* String fileUrl =  res.getString("fileUrl");
+                        logger.info("附件id:" + fileUrl);
+                        return fileUrl;*/
+                        return res;
+                    }
+                }
+            }catch (Exception e){
+                logger.error("附件上传失败"+e.getMessage());
+            }
+        }
+        return null;
+    }
+
+    private static String getToken() {
+        //获取oatoken
+        HashMap<String, String> hashMap = new HashMap<>();
+        hashMap.put("userName", "hzyaRest");
+        hashMap.put("password", "a5ce21b8-91db-4cec-b3e3-3e44719655fd");
+        hashMap.put("loginName","bdmanager");
+        String result = HttpUtil.post("http://60.204.152.210" + "/seeyon/rest/token", JSON.toJSONString(hashMap));
+        JSONObject jsonObject = JSONObject.parseObject(result);
+        if (null != jsonObject) {
+            logger.info(result);
+            logger.info("======token：{}======" + jsonObject.getString("id"));
+            return jsonObject.getString("id");
+        }
+        return null;
+    }
+}

fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/entity/BipArchivesEntity.java

@@ -0,0 +1,188 @@
+package com.hzya.frame.bip.v3.v2207.entity;
+
+import cn.dev33.satoken.stp.StpUtil;
+import com.hzya.frame.uuid.UUIDUtils;
+import com.hzya.frame.web.entity.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * (BdCorp)实体类
+ *
+ * @author makejava
+ * @since 2023-09-06 14:47:18
+ */
+public class BipArchivesEntity extends BaseEntity {
+
+    private String archivesType;//类型
+    private String leftCode;//左编码
+    private String rightCode;//右编码
+
+    private String leftAppId;//左应用id
+    private String leftAppCode;//左应用编码
+    private String leftAppName;//左应用名称
+    private String leftApiId;//左接口ID
+    private String leftId;//左id
+    private String leftName;//左名称
+    private String rightAppId;//右应用id
+    private String rightAppCode;//右应用编码
+    private String rightAppName;//右应用名称
+    private String rightApiId;//右接口ID
+    private String rightId;//右id
+    private String rightName;//右名称
+    private String leftOrg;//左公司
+    private String rightOrg;//右公司
+
+    public String getArchivesType() {
+        return archivesType;
+    }
+
+    public void setArchivesType(String archivesType) {
+        this.archivesType = archivesType;
+    }
+
+    public String getLeftCode() {
+        return leftCode;
+    }
+
+    public void setLeftCode(String leftCode) {
+        this.leftCode = leftCode;
+    }
+
+    public String getRightCode() {
+        return rightCode;
+    }
+
+    public void setRightCode(String rightCode) {
+        this.rightCode = rightCode;
+    }
+
+    public String getLeftAppId() {
+        return leftAppId;
+    }
+
+    public void setLeftAppId(String leftAppId) {
+        this.leftAppId = leftAppId;
+    }
+
+    public String getLeftAppCode() {
+        return leftAppCode;
+    }
+
+    public void setLeftAppCode(String leftAppCode) {
+        this.leftAppCode = leftAppCode;
+    }
+
+    public String getLeftAppName() {
+        return leftAppName;
+    }
+
+    public void setLeftAppName(String leftAppName) {
+        this.leftAppName = leftAppName;
+    }
+
+    public String getLeftApiId() {
+        return leftApiId;
+    }
+
+    public void setLeftApiId(String leftApiId) {
+        this.leftApiId = leftApiId;
+    }
+
+    public String getLeftId() {
+        return leftId;
+    }
+
+    public void setLeftId(String leftId) {
+        this.leftId = leftId;
+    }
+
+    public String getLeftName() {
+        return leftName;
+    }
+
+    public void setLeftName(String leftName) {
+        this.leftName = leftName;
+    }
+
+    public String getRightAppId() {
+        return rightAppId;
+    }
+
+    public void setRightAppId(String rightAppId) {
+        this.rightAppId = rightAppId;
+    }
+
+    public String getRightAppCode() {
+        return rightAppCode;
+    }
+
+    public void setRightAppCode(String rightAppCode) {
+        this.rightAppCode = rightAppCode;
+    }
+
+    public String getRightAppName() {
+        return rightAppName;
+    }
+
+    public void setRightAppName(String rightAppName) {
+        this.rightAppName = rightAppName;
+    }
+
+    public String getRightApiId() {
+        return rightApiId;
+    }
+
+    public void setRightApiId(String rightApiId) {
+        this.rightApiId = rightApiId;
+    }
+
+    public String getRightId() {
+        return rightId;
+    }
+
+    public void setRightId(String rightId) {
+        this.rightId = rightId;
+    }
+
+    public String getRightName() {
+        return rightName;
+    }
+
+    public void setRightName(String rightName) {
+        this.rightName = rightName;
+    }
+
+    public String getLeftOrg() {
+        return leftOrg;
+    }
+
+    public void setLeftOrg(String leftOrg) {
+        this.leftOrg = leftOrg;
+    }
+
+    public String getRightOrg() {
+        return rightOrg;
+    }
+
+    public void setRightOrg(String rightOrg) {
+        this.rightOrg = rightOrg;
+    }
+
+    public void setCreate() {
+        this.setId(UUIDUtils.getUUID());
+        this.setSts("Y");
+        this.setCreate_user_id("1");
+        this.setModify_user_id("1");
+        this.setCreate_time(new Date());
+        this.setModify_time(new Date());
+        this.setOrg_id("0");
+        this.setCompanyId("0");
+    }
+    //修改信息
+    public void setUpdate() {
+        this.setModify_user_id("1");
+        this.setModify_time(new Date());
+    }
+}
+

fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/entity/BipArchivesEntity.xml

@@ -0,0 +1,71 @@
+<?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.bip.v3.v2207.dao.impl.BipArchivesDaoImpl">
+    <resultMap id="get-ArchivesEntity-result" type="com.hzya.frame.bip.v3.v2207.entity.BipArchivesEntity" >
+        <result property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="leftAppId" column="left_app_id" jdbcType="VARCHAR"/>
+        <result property="leftAppCode" column="left_app_code" jdbcType="VARCHAR"/>
+        <result property="leftAppName" column="left_app_name" jdbcType="VARCHAR"/>
+        <result property="leftApiId" column="left_api_id" jdbcType="VARCHAR"/>
+        <result property="leftId" column="left_id" jdbcType="VARCHAR"/>
+        <result property="leftCode" column="left_code" jdbcType="VARCHAR"/>
+        <result property="leftName" column="left_name" jdbcType="VARCHAR"/>
+        <result property="rightAppId" column="right_app_id" jdbcType="VARCHAR"/>
+        <result property="rightAppCode" column="right_app_code" jdbcType="VARCHAR"/>
+        <result property="rightAppName" column="right_app_name" jdbcType="VARCHAR"/>
+        <result property="rightApiId" column="right_api_id" jdbcType="VARCHAR"/>
+        <result property="rightId" column="right_id" jdbcType="VARCHAR"/>
+        <result property="rightCode" column="right_code" jdbcType="VARCHAR"/>
+        <result property="rightName" column="right_name" jdbcType="VARCHAR"/>
+        <result property="sorts" column="sorts" jdbcType="INTEGER"/>
+        <result property="create_user_id" column="create_user_id" jdbcType="VARCHAR"/>
+        <result property="create_time" column="create_time" jdbcType="TIMESTAMP"/>
+        <result property="modify_user_id" column="modify_user_id" jdbcType="VARCHAR"/>
+        <result property="modify_time" column="modify_time" jdbcType="TIMESTAMP"/>
+        <result property="sts" column="sts" jdbcType="VARCHAR"/>
+        <result property="org_id" column="org_id" jdbcType="VARCHAR"/>
+        <result property="companyId" column="company_id" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <select id="queryArchivesData" resultMap="get-ArchivesEntity-result"
+            parameterType="com.hzya.frame.bip.v3.v2207.entity.BipArchivesEntity">
+        select
+        right_code
+        from
+        <choose>
+            <when test="archivesType == '1'.toString()"> sys_personnel_control </when>
+            <when test="archivesType == '2'.toString()"> sys_org_control </when>
+            <when test="archivesType == '6'.toString()"> sys_stock_control </when>
+            <when test="archivesType == '73'.toString()"> sys_merchant_control </when>
+            <when test="archivesType == 'D01'.toString()"> sys_taxrate_control </when>
+            <when test="archivesType == 'jobass'.toString()"> sys_project_control </when>
+            <when test="archivesType == '93'.toString()"> sys_bank_control </when>
+            <when test="archivesType == '96'.toString()"> sys_bankaccount_control </when>
+            <when test="archivesType == '22'.toString()"> sys_assets_control </when>
+        </choose>
+        <trim prefix="where" prefixOverrides="and">
+            <if test="leftCode != null and leftCode != ''">and left_code = #{leftCode}</if>
+            <if test="leftOrg != null and leftOrg != ''">and left_org = #{leftOrg}</if>
+            and sts='Y'
+        </trim>
+    </select>
+
+    <select id="queryArchivesDatays" resultMap="get-ArchivesEntity-result"
+            parameterType="com.hzya.frame.bip.v3.v2207.entity.BipArchivesEntity">
+        select
+        right_code
+        from
+        <choose>
+            <when test="archivesType == '0012'.toString()"> sys_stock_control </when>
+            <when test="archivesType == '0006'.toString()"> sys_stock_control </when>
+            <when test="archivesType == '0004'.toString()"> sys_merchant_control </when>
+        </choose>
+        <trim prefix="where" prefixOverrides="and">
+            <if test="leftCode != null and leftCode != ''">and left_code = #{leftCode}</if>
+            <if test="leftOrg != null and leftOrg != ''">and left_org = #{leftOrg}</if>
+            and sts='Y'
+        </trim>
+    </select>
+
+</mapper>
+

fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/entity/BipAss.java

@@ -0,0 +1,24 @@
+package com.hzya.frame.bip.v3.v2207.entity;
+
+
+public class BipAss {
+    private String checktypecode;
+    private String checkvaluecode;
+
+
+    public String getChecktypecode() {
+        return checktypecode;
+    }
+
+    public void setChecktypecode(String checktypecode) {
+        this.checktypecode = checktypecode;
+    }
+
+    public String getCheckvaluecode() {
+        return checkvaluecode;
+    }
+
+    public void setCheckvaluecode(String checkvaluecode) {
+        this.checkvaluecode = checkvaluecode;
+    }
+}

fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/entity/BipCashflow.java

@@ -0,0 +1,23 @@
+package com.hzya.frame.bip.v3.v2207.entity;
+
+
+public class BipCashflow {
+    private String money;
+    private String pk_cashflow;
+
+    public String getMoney() {
+        return money;
+    }
+
+    public void setMoney(String money) {
+        this.money = money;
+    }
+
+    public String getPk_cashflow() {
+        return pk_cashflow;
+    }
+
+    public void setPk_cashflow(String pk_cashflow) {
+        this.pk_cashflow = pk_cashflow;
+    }
+}

fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/entity/BipOrgsDetailsEntity.java

@@ -0,0 +1,65 @@
+package com.hzya.frame.bip.v3.v2207.entity;
+
+import com.hzya.frame.web.entity.BaseEntity;
+
+/****
+ * BIP组织账户
+ * @content:
+ * @author 👻👻👻👻👻👻👻👻 gjh
+ * @date  2023-10-24 10:03
+ * @param
+ * @return
+ **/
+public class BipOrgsDetailsEntity extends BaseEntity {
+
+    /*开户行编码*/
+    private String bankCode;
+    /*开户行名称*/
+    private String bankName;
+    /*账户*/
+    private String accnum;
+    /*与组织关联的字段*/
+    private String controlorg;
+    /*联行号*/
+    private String cnapsCode;
+
+    public String getCnapsCode() {
+        return cnapsCode;
+    }
+
+    public void setCnapsCode(String cnapsCode) {
+        this.cnapsCode = cnapsCode;
+    }
+
+    public String getControlorg() {
+        return controlorg;
+    }
+
+    public void setControlorg(String controlorg) {
+        this.controlorg = controlorg;
+    }
+
+    public String getBankCode() {
+        return bankCode;
+    }
+
+    public void setBankCode(String bankCode) {
+        this.bankCode = bankCode;
+    }
+
+    public String getBankName() {
+        return bankName;
+    }
+
+    public void setBankName(String bankName) {
+        this.bankName = bankName;
+    }
+
+    public String getAccnum() {
+        return accnum;
+    }
+
+    public void setAccnum(String accnum) {
+        this.accnum = accnum;
+    }
+}

fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/entity/BipOrgsDetailsEntity.xml

@@ -0,0 +1,43 @@
+<?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.bip.v3.v2207.dao.impl.BipOrgsDetailsDaoImpl">
+	<resultMap id="get-BipOrgsDetailsEntity-result" type="com.hzya.frame.bip.v3.v2207.entity.BipOrgsDetailsEntity">
+		<result property="bankCode" column="bankCode" />
+		<result property="bankName" column="bankName" />
+		<result property="accnum" column="accnum" />
+		<result property="controlorg" column="controlorg" />
+		<result property="cnapsCode" column="cnapsCode" />
+	</resultMap>
+
+
+	<sql id="BipOrgsDetailsEntity_Base_Column_List">
+		bankdoc.code as bankCode,bankdoc.name as bankName,bankaccbas.accnum,bankaccbas.controlorg,bankaccbas.combinenum as cnapsCode
+	</sql>
+
+	<!--通过ID获取数据 -->
+	<select id="entity_get" resultMap="get-BipOrgsDetailsEntity-result">
+		select
+		<include refid="BipOrgsDetailsEntity_Base_Column_List" />
+		from bd_bankaccbas where pk_bankaccbas = #{pk_bankaccbas}
+	</select>
+
+
+	<!-- 查询 采用==查询 -->
+	<select id="thirdInterfaceGetOrgsDetails" resultMap="get-BipOrgsDetailsEntity-result" parameterType="com.hzya.frame.bip.v3.v2207.entity.BipOrgsDetailsEntity">
+		select
+		<include refid="BipOrgsDetailsEntity_Base_Column_List" />
+		from bd_bankaccbas bankaccbas
+		left join bd_bankdoc bankdoc on bankdoc.pk_bankdoc=bankaccbas.pk_bankdoc
+		<trim prefix="where" prefixOverrides="and">
+			<if test="bankCode != null and bankCode !=''">bankdoc.code=#{bankCode}</if>
+			<if test="bankName != null and bankName !='' "> and bankdoc.name = #{bankName}</if>
+			<if test="accnum != null and accnum !='' "> and bankaccbas.accnum = #{accnum}</if>
+			and bankaccbas.dr='0' and bankdoc.dr='0'  and bankaccbas.pk_banktype!='0001Z01000000000036S' and bankaccbas.controlorg = #{controlorg}
+		</trim>
+	</select>
+
+
+
+
+</mapper>
+

fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/entity/BipOrgsEntity.java

@@ -0,0 +1,63 @@
+package com.hzya.frame.bip.v3.v2207.entity;
+
+import com.hzya.frame.web.entity.BaseEntity;
+
+/**
+ * @description: BIP组织  entity
+ * @tableName: org_orgs
+ * @entityName: BipOrgsEntity
+ * @author: gjh
+ * @history: 1.0
+ */
+public class BipOrgsEntity extends BaseEntity {
+    /*单位编码*/
+    private String code;
+    /*开户单位*/
+    private String name;
+    /*BIPID*/
+    private String tripartiteId;
+    private String pk_financeorg;
+    private String orgsts;
+
+    public String getOrgsts() {
+        return orgsts;
+    }
+
+    public void setOrgsts(String orgsts) {
+        this.orgsts = orgsts;
+    }
+
+    public String getPk_financeorg() {
+        return pk_financeorg;
+    }
+
+    public void setPk_financeorg(String pk_financeorg) {
+        this.pk_financeorg = pk_financeorg;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getTripartiteId() {
+        return tripartiteId;
+    }
+
+    public void setTripartiteId(String tripartiteId) {
+        this.tripartiteId = tripartiteId;
+    }
+
+
+}

fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/entity/BipOrgsEntity.xml

@@ -0,0 +1,98 @@
+<?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.bip.v3.v2207.dao.impl.BipOrgsDaoImpl">
+	<resultMap id="get-BipOrgsEntity-result" type="com.hzya.frame.bip.v3.v2207.entity.BipOrgsEntity">
+		<result property="tripartiteId" column="tripartiteId" />
+		<result property="code" column="code" />
+		<result property="name" column="name" />
+		<result property="pk_financeorg" column="pk_financeorg"/>
+		<result property="orgsts" column="orgsts"/>
+	</resultMap>
+
+	<sql id="BipOrgsEntity_Base_Column_List">
+			orgs.pk_financeorg as tripartiteId,
+			orgs.name ,
+			orgs.code,
+	        max(org_bank.ts)as ts
+
+	</sql>
+
+	<sql id="BipOrgsEntity_Base_Column_List_details">
+		 bankdoc.code as bankCode,bankdoc.name as bankName,bankaccbas.accnum,bankaccbas.controlorg
+	</sql>
+
+	<!--通过ID获取数据 -->
+	<select id="entity_get" resultMap="get-BipOrgsEntity-result">
+		select
+		<include refid="BipOrgsEntity_Base_Column_List" />
+		from org_financeorg where pk_financeorg = #{pk_financeorg}
+	</select>
+
+	<select id="thirdInterfaceGetOrgs" resultMap="get-BipOrgsEntity-result" parameterType="com.hzya.frame.bip.v3.v2207.entity.BipOrgsEntity">
+		select
+		<include refid="BipOrgsEntity_Base_Column_List" />
+		FROM
+        org_financeorg orgs
+        left join v_hzya_org_bank  org_bank on org_bank.controlorg = orgs.pk_financeorg
+
+		<trim prefix="where" prefixOverrides="and">
+			<if test="code != null and code !=''"> orgs.code = #{code}</if>
+			<if test="name != null and name !='' "> and orgs.name = #{name}</if>
+			<if test="pk_financeorg != null and pk_financeorg !='' "> and orgs.pk_financeorg = #{tripartiteId}</if>
+			<if test="orgsts != null and orgsts !='' "> and orgs.ts >'2023-09-30 14:18:39' and orgs.ts > #{orgsts}</if>
+		     and orgs.dr='0'
+		</trim>
+        GROUP BY  orgs.pk_financeorg ,orgs.name,orgs.code
+	</select>
+
+	<!-- 查询 采用==查询 -->
+	<select id="thirdInterfaceGetSupplierDetails" resultMap="get-BipOrgsEntity-result" parameterType="com.hzya.frame.bip.v3.v2207.entity.BipOrgsEntity">
+		select
+		<include refid="BipOrgsEntity_Base_Column_List_details" />
+		 from bd_bankaccbas bankaccbas
+		left join bd_bankdoc bankdoc on bankdoc.pk_bankdoc=bankaccbas.pk_bankdoc
+		<trim prefix="where" prefixOverrides="and">
+			<if test="code != null and code !=''">bankdoc.code=#{code}</if>
+			<if test="name != null and name !='' "> and bankdoc.name = #{name}</if>
+			<if test="accnum != null and accnum !='' "> and bankaccbas.accnum = #{accnum}</if>
+			<if test="controlorg != null and controlorg !='' "> and bankaccbas.controlorg = #{controlorg}</if>
+			and bankaccbas.dr='0' and bankdoc.dr='0'  and bankaccbas.pk_banktype!='0001Z01000000000036S'
+		</trim>
+	</select>
+
+
+	<!-- 查询 采用==查询 -->
+	<!--<select id="BipOrgsEntity_list_base" resultMap="get-BipOrgsEntity-result" parameterType="com.hzya.frame.bip.v3.v2207.entity.BipOrgsEntity">
+		select
+		<include refid="BipOrgsEntity_Base_Column_List" />
+		FROM bd_cust_supplier supplier
+		left join db_customerbank  bank ON supplier.code = bank.code
+		<trim prefix="where" prefixOverrides="and">
+			<if test="code != null and code !=''">supplier.code=#{code}</if>
+			<if test="name != null and name !='' "> and supplier.name = #{name}</if>
+			<if test="taxpayerid != null and taxpayerid !='' "> and supplier.taxpayerid = #{taxpayerid}</if>
+			<if test="def1 != null and def1 !='' "> and bank.def1 = #{def1}</if>
+			<if test="def2 != null and def2 !='' "> and bank.def2 = #{def2}</if>
+			<if test="def3 != null and def3 !='' "> and bank.def3 = #{def3}</if>
+		</trim>
+	</select>-->
+
+
+	<!-- 分页查询列表 采用like格式 -->
+	<!--<select id="entity_list_like" resultMap="get-BipOrgsEntity-result" parameterType="com.hzya.frame.bip.v3.v2207.entity.BipOrgsEntity">
+		select
+		<include refid="BipOrgsEntity_Base_Column_List" />
+		FROM bd_cust_supplier supplier
+		left join db_customerbank  bank ON supplier.code = bank.code
+		<trim prefix="where" prefixOverrides="and">
+			<if test="code != null and code !=''"> supplier.code like concat('%',#{code},'%')</if>
+			<if test="name != null and name !='' "> and supplier.name like concat('%',#{name},'%')</if>
+			<if test="taxpayerid != null and taxpayerid !='' "> and supplier.taxpayeridlike concat('%',#{taxpayeridlike},'%')</if>
+			<if test="def1 != null and def1 !='' "> and bank.def1 like concat('%',#{def1},'%')</if>
+			<if test="def2 != null and def2 !='' "> and bank.def2 like concat('%',#{def2},'%')</if>
+			<if test="def3 != null and def3 !='' "> and bank.def3 like concat('%',#{def3},'%')</if>
+		</trim>
+	</select>-->
+
+</mapper>
+

fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/entity/BipSupplierDetailsEntity.java

@@ -0,0 +1,77 @@
+package com.hzya.frame.bip.v3.v2207.entity;
+
+import com.hzya.frame.web.entity.BaseEntity;
+
+public class BipSupplierDetailsEntity extends BaseEntity {
+
+    private String code;
+    private String name;
+    /*开户行*/
+    private String splitbank;
+    /*银行账号*/
+    private String bankaccno;
+    /*是否默认*/
+    private String isdefault;
+    /*联行号*/
+    private String combinno;
+
+    private String tripartiteId;
+
+    public String getCombinno() {
+        return combinno;
+    }
+
+    public void setCombinno(String combinno) {
+        this.combinno = combinno;
+    }
+
+    public String getTripartiteId() {
+        return tripartiteId;
+    }
+
+    public void setTripartiteId(String tripartiteId) {
+        this.tripartiteId = tripartiteId;
+    }
+
+    public String getIsdefault() {
+        return isdefault;
+    }
+
+    public void setIsdefault(String isdefault) {
+        this.isdefault = isdefault;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getSplitbank() {
+        return splitbank;
+    }
+
+    public void setSplitbank(String splitbank) {
+        this.splitbank = splitbank;
+    }
+
+    public String getBankaccno() {
+        return bankaccno;
+    }
+
+    public void setBankaccno(String bankaccno) {
+        this.bankaccno = bankaccno;
+    }
+
+
+}

fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/entity/BipSupplierDetailsEntity.xml

@@ -0,0 +1,44 @@
+<?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.bip.v3.v2207.dao.impl.BipSupplierDetailsDaoImpl">
+	<resultMap id="get-BipSupplierDetailsEntity-result" type="com.hzya.frame.bip.v3.v2207.entity.BipSupplierDetailsEntity">
+		<result property="code" column="code" />
+		<result property="name" column="name" />
+		<result property="splitbank" column="splitbank" />
+		<result property="bankaccno" column="bankaccno" />
+		<result property="tripartiteId" column="tripartiteId"></result>
+		<result property="combinno" column="combinno"></result>
+	</resultMap>
+
+
+	<sql id="BipSupplierDetailsEntity_Base_Column_List">
+		splitbank,bankaccno,combinno,name,code
+	</sql>
+
+	<!--通过ID获取数据 -->
+	<select id="entity_get" resultMap="get-BipSupplierDetailsEntity-result">
+		select
+		<include refid="BipSupplierDetailsEntity_Base_Column_List" />
+		from BD_SUPPLIER where pk_supplier = #{pk_supplier} and sdr='0'
+	</select>
+
+
+	<!-- 查询 采用==查询 -->
+	<select id="thirdInterfaceGetSupplierDetails" resultMap="get-BipSupplierDetailsEntity-result" parameterType="com.hzya.frame.bip.v3.v2207.entity.BipSupplierDetailsEntity">
+		select
+		<include refid="BipSupplierDetailsEntity_Base_Column_List" />
+		FROM db_customerbank
+		<trim prefix="where" prefixOverrides="and">
+			<if test="code != null and code !=''">code=#{code}</if>
+			<if test="name != null and name !='' "> and name = #{name}</if>
+			<if test="bankaccno != null and bankaccno !='' "> and bankaccno = #{bankaccno}</if>
+			<if test="splitbank != null and splitbank !='' "> and splitbank = #{splitbank}</if>
+			<if test="combinno != null and combinno !='' "> and combinno = #{combinno}</if>
+		</trim>
+	</select>
+
+
+
+
+</mapper>
+

fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/entity/BipSupplierEntity.java

@@ -0,0 +1,92 @@
+package com.hzya.frame.bip.v3.v2207.entity;
+
+import com.hzya.frame.web.entity.BaseEntity;
+
+/**
+ * @description: BIP供应商  entity
+ * @tableName: BD_SUPPLIER
+ * @entityName: BipSupplierEntity
+ * @author: gjh
+ * @history: 1.0
+ */
+public class BipSupplierEntity extends BaseEntity {
+
+    private String code;
+    private String name;
+    /*税号*/
+    private String taxpayerid;
+    /*地址*/
+    private String def1;
+    /*电话*/
+    private String def2;
+    /*联系人*/
+    private String def3;
+    private String tripartiteId;
+
+    public String getTripartiteId() {
+        return tripartiteId;
+    }
+
+    public void setTripartiteId(String tripartiteId) {
+        this.tripartiteId = tripartiteId;
+    }
+
+    private String ts;
+
+    public String getTs() {
+        return ts;
+    }
+
+    public void setTs(String ts) {
+        this.ts = ts;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getTaxpayerid() {
+        return taxpayerid;
+    }
+
+    public void setTaxpayerid(String taxpayerid) {
+        this.taxpayerid = taxpayerid;
+    }
+
+    public String getDef1() {
+        return def1;
+    }
+
+    public void setDef1(String def1) {
+        this.def1 = def1;
+    }
+
+    public String getDef2() {
+        return def2;
+    }
+
+    public void setDef2(String def2) {
+        this.def2 = def2;
+    }
+
+    public String getDef3() {
+        return def3;
+    }
+
+    public void setDef3(String def3) {
+        this.def3 = def3;
+    }
+
+}

fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/entity/BipSupplierEntity.xml

@@ -0,0 +1,96 @@
+<?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.bip.v3.v2207.dao.impl.BipSupplierDaoImpl">
+	<resultMap id="get-BipSupplierEntity-result" type="com.hzya.frame.bip.v3.v2207.entity.BipSupplierEntity">
+		<result property="taxpayerid" column="taxpayerid" />
+		<result property="def1" column="def1" />
+		<result property="def2" column="def2" />
+		<result property="def3" column="def3" />
+		<result property="code" column="code" />
+		<result property="name" column="name" />
+		<result property="ts" column="ts" />
+		<result property="tripartiteId" column="tripartiteId" />
+	</resultMap>
+
+	<sql id="BipSupplierEntity_Base_Column_List">
+		supplier.code,supplier.name,supplier.taxpayerid,bank.def1,bank.def2,bank.def3,supplier.ts,	supplier.pk_cust_sup as tripartiteId
+	</sql>
+
+	<sql id="BipSupplierEntity_Base_Column_List_details">
+		splitbank,bankaccno,name,code
+	</sql>
+
+	<!--通过ID获取数据 -->
+	<select id="entity_get" resultMap="get-BipSupplierEntity-result">
+		select
+		<include refid="BipSupplierEntity_Base_Column_List" />
+		from BD_SUPPLIER where pk_supplier = #{pk_supplier} and sdr='0'
+	</select>
+
+	<select id="thirdInterfaceGetSupplier" resultMap="get-BipSupplierEntity-result" parameterType="com.hzya.frame.bip.v3.v2207.entity.BipSupplierEntity">
+		select
+		<include refid="BipSupplierEntity_Base_Column_List" />
+		FROM bd_cust_supplier supplier
+		left join db_customerbank  bank ON supplier.code = bank.code
+		<trim prefix="where" prefixOverrides="and">
+			<if test="code != null and code !=''">supplier.code=#{code}</if>
+			<if test="name != null and name !='' "> and supplier.name = #{name}</if>
+			<if test="taxpayerid != null and taxpayerid !='' "> and supplier.taxpayerid = #{taxpayerid}</if>
+			<if test="def1 != null and def1 !='' "> and bank.def1 = #{def1}</if>
+			<if test="def2 != null and def2 !='' "> and bank.def2 = #{def2}</if>
+			<if test="def3 != null and def3 !='' "> and bank.def3 = #{def3}</if>
+			<if test="tripartiteId != null and tripartiteId !='' "> and supplier.tripartiteId = #{tripartiteId}</if>
+            <if test="ts != null and ts !='' ">   and supplier.ts >'2023-09-30 14:18:39'   and supplier.ts > #{ts} </if>
+		</trim>
+		group by supplier.code,supplier.name,supplier.taxpayerid,bank.def1,bank.def2,bank.def3,supplier.ts,	supplier.pk_cust_sup
+	</select>
+
+	<!-- 查询 采用==查询 -->
+	<select id="thirdInterfaceGetSupplierDetails" resultMap="get-BipSupplierEntity-result" parameterType="com.hzya.frame.bip.v3.v2207.entity.BipSupplierEntity">
+		select
+		<include refid="BipSupplierEntity_Base_Column_List_details" />
+		FROM db_customerbank
+		<trim prefix="where" prefixOverrides="and">
+			<if test="code != null and code !=''">code=#{code}</if>
+			<if test="name != null and name !='' "> and name = #{name}</if>
+			<if test="bankaccno != null and bankaccno !='' "> and bankaccno = #{bankaccno}</if>
+			<if test="splitbank != null and splitbank !='' "> and splitbank = #{splitbank}</if>
+		</trim>
+	</select>
+
+
+	<!-- 查询 采用==查询 -->
+	<select id="BipSupplierEntity_list_base" resultMap="get-BipSupplierEntity-result" parameterType="com.hzya.frame.bip.v3.v2207.entity.BipSupplierEntity">
+		select
+		<include refid="BipSupplierEntity_Base_Column_List" />
+		FROM bd_cust_supplier supplier
+		left join db_customerbank  bank ON supplier.code = bank.code
+		<trim prefix="where" prefixOverrides="and">
+			<if test="code != null and code !=''">supplier.code=#{code}</if>
+			<if test="name != null and name !='' "> and supplier.name = #{name}</if>
+			<if test="taxpayerid != null and taxpayerid !='' "> and supplier.taxpayerid = #{taxpayerid}</if>
+			<if test="def1 != null and def1 !='' "> and bank.def1 = #{def1}</if>
+			<if test="def2 != null and def2 !='' "> and bank.def2 = #{def2}</if>
+			<if test="def3 != null and def3 !='' "> and bank.def3 = #{def3}</if>
+		</trim>
+	</select>
+
+
+	<!-- 分页查询列表 采用like格式 -->
+	<select id="entity_list_like" resultMap="get-BipSupplierEntity-result" parameterType="com.hzya.frame.bip.v3.v2207.entity.BipSupplierEntity">
+		select
+		<include refid="BipSupplierEntity_Base_Column_List" />
+		FROM bd_cust_supplier supplier
+		left join db_customerbank  bank ON supplier.code = bank.code
+		<trim prefix="where" prefixOverrides="and">
+			<if test="code != null and code !=''"> supplier.code like concat('%',#{code},'%')</if>
+			<if test="name != null and name !='' "> and supplier.name like concat('%',#{name},'%')</if>
+			<if test="taxpayerid != null and taxpayerid !='' "> and supplier.taxpayeridlike concat('%',#{taxpayeridlike},'%')</if>
+			<if test="def1 != null and def1 !='' "> and bank.def1 like concat('%',#{def1},'%')</if>
+			<if test="def2 != null and def2 !='' "> and bank.def2 like concat('%',#{def2},'%')</if>
+			<if test="def3 != null and def3 !='' "> and bank.def3 like concat('%',#{def3},'%')</if>
+		</trim>
+	</select>
+
+</mapper>
+

fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/entity/BipTokenVo.java

@@ -0,0 +1,13 @@
+package com.hzya.frame.bip.v3.v2207.entity;
+
+import com.hzya.frame.web.entity.BaseEntity;
+
+/**
+ * com.hzya.frame.bip.v3.v2207.entity
+ *
+ * @author makejava
+ * @date 2024-05 -27 11:24
+ */
+
+public class BipTokenVo  extends BaseEntity {
+}

fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/entity/BipVoucher.java

@@ -0,0 +1,150 @@
+package com.hzya.frame.bip.v3.v2207.entity;
+
+import java.util.List;
+
+public class BipVoucher {
+    private List<BipVoucherDetails> details;
+    private List<BipVoucherDetails> detail;
+    private String no;
+    private String pk_corp;
+    private String pk_glorgbook;
+    private String pk_prepared;
+    private String pk_vouchertype;
+    private String pk_voucher;
+    private String period;
+    private String vouchertype;
+    private String attachment;
+    private String year;
+    private String prepared;
+    private String prepareddate;
+    private String num;
+    private String accbookCode;
+
+    public List<BipVoucherDetails> getDetails() {
+        return details;
+    }
+
+    public void setDetails(List<BipVoucherDetails> details) {
+        this.details = details;
+    }
+
+    public String getNo() {
+        return no;
+    }
+
+    public void setNo(String no) {
+        this.no = no;
+    }
+
+    public String getPk_corp() {
+        return pk_corp;
+    }
+
+    public void setPk_corp(String pk_corp) {
+        this.pk_corp = pk_corp;
+    }
+
+    public String getPk_glorgbook() {
+        return pk_glorgbook;
+    }
+
+    public void setPk_glorgbook(String pk_glorgbook) {
+        this.pk_glorgbook = pk_glorgbook;
+    }
+
+    public String getPk_prepared() {
+        return pk_prepared;
+    }
+
+    public void setPk_prepared(String pk_prepared) {
+        this.pk_prepared = pk_prepared;
+    }
+
+    public String getPk_vouchertype() {
+        return pk_vouchertype;
+    }
+
+    public void setPk_vouchertype(String pk_vouchertype) {
+        this.pk_vouchertype = pk_vouchertype;
+    }
+
+    public String getPk_voucher() {
+        return pk_voucher;
+    }
+
+    public void setPk_voucher(String pk_voucher) {
+        this.pk_voucher = pk_voucher;
+    }
+
+    public List<BipVoucherDetails> getDetail() {
+        return detail;
+    }
+
+    public void setDetail(List<BipVoucherDetails> detail) {
+        this.detail = detail;
+    }
+
+    public String getPeriod() {
+        return period;
+    }
+
+    public void setPeriod(String period) {
+        this.period = period;
+    }
+
+    public String getVouchertype() {
+        return vouchertype;
+    }
+
+    public void setVouchertype(String vouchertype) {
+        this.vouchertype = vouchertype;
+    }
+
+    public String getAttachment() {
+        return attachment;
+    }
+
+    public void setAttachment(String attachment) {
+        this.attachment = attachment;
+    }
+
+    public String getYear() {
+        return year;
+    }
+
+    public void setYear(String year) {
+        this.year = year;
+    }
+
+    public String getPrepared() {
+        return prepared;
+    }
+
+    public void setPrepared(String prepared) {
+        this.prepared = prepared;
+    }
+
+    public String getPrepareddate() {
+        return prepareddate;
+    }
+
+    public void setPrepareddate(String prepareddate) {
+        this.prepareddate = prepareddate;
+    }
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+
+    public String getAccbookCode() {
+        return accbookCode;
+    }
+
+    public void setAccbookCode(String accbookCode) {
+        this.accbookCode = accbookCode;
+    }
+}

fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/entity/BipVoucherDetails.java

@@ -0,0 +1,186 @@
+package com.hzya.frame.bip.v3.v2207.entity;
+
+import java.util.List;
+
+public class BipVoucherDetails {
+    private List<BipAss> ass;
+    private List<BipCashflow> cashflow;
+    private String creditamount;
+    private String debitamount;
+    private String explanation;
+    private String localcreditamount;
+    private String localdebitamount;
+    private String pk_accsubj;
+    private String pk_currtype;
+    private String debitquantity;
+    private String price;
+    private String accountCode;
+    private String amount;
+    private String globalcreditamount;
+    private String globaldebitamount;
+    private String groupdebitamount;
+    private String currtypeCode;
+    private String busidate;
+    private String groupcreditamount;
+    private String detailindex;
+
+    public List<BipAss> getAss() {
+        return ass;
+    }
+
+    public void setAss(List<BipAss> ass) {
+        this.ass = ass;
+    }
+
+    public List<BipCashflow> getCashflow() {
+        return cashflow;
+    }
+
+    public void setCashflow(List<BipCashflow> cashflow) {
+        this.cashflow = cashflow;
+    }
+
+    public String getCreditamount() {
+        return creditamount;
+    }
+
+    public void setCreditamount(String creditamount) {
+        this.creditamount = creditamount;
+    }
+
+    public String getDebitamount() {
+        return debitamount;
+    }
+
+    public void setDebitamount(String debitamount) {
+        this.debitamount = debitamount;
+    }
+
+    public String getExplanation() {
+        return explanation;
+    }
+
+    public void setExplanation(String explanation) {
+        this.explanation = explanation;
+    }
+
+    public String getLocalcreditamount() {
+        return localcreditamount;
+    }
+
+    public void setLocalcreditamount(String localcreditamount) {
+        this.localcreditamount = localcreditamount;
+    }
+
+    public String getLocaldebitamount() {
+        return localdebitamount;
+    }
+
+    public void setLocaldebitamount(String localdebitamount) {
+        this.localdebitamount = localdebitamount;
+    }
+
+    public String getPk_accsubj() {
+        return pk_accsubj;
+    }
+
+    public void setPk_accsubj(String pk_accsubj) {
+        this.pk_accsubj = pk_accsubj;
+    }
+
+    public String getPk_currtype() {
+        return pk_currtype;
+    }
+
+    public void setPk_currtype(String pk_currtype) {
+        this.pk_currtype = pk_currtype;
+    }
+
+    public String getDebitquantity() {
+        return debitquantity;
+    }
+
+    public void setDebitquantity(String debitquantity) {
+        this.debitquantity = debitquantity;
+    }
+
+    public String getPrice() {
+        return price;
+    }
+
+    public void setPrice(String price) {
+        this.price = price;
+    }
+
+    public String getAccountCode() {
+        return accountCode;
+    }
+
+    public void setAccountCode(String accountCode) {
+        this.accountCode = accountCode;
+    }
+
+    public String getAmount() {
+        return amount;
+    }
+
+    public void setAmount(String amount) {
+        this.amount = amount;
+    }
+
+    public String getGlobalcreditamount() {
+        return globalcreditamount;
+    }
+
+    public void setGlobalcreditamount(String globalcreditamount) {
+        this.globalcreditamount = globalcreditamount;
+    }
+
+    public String getGlobaldebitamount() {
+        return globaldebitamount;
+    }
+
+    public void setGlobaldebitamount(String globaldebitamount) {
+        this.globaldebitamount = globaldebitamount;
+    }
+
+    public String getGroupdebitamount() {
+        return groupdebitamount;
+    }
+
+    public void setGroupdebitamount(String groupdebitamount) {
+        this.groupdebitamount = groupdebitamount;
+    }
+
+    public String getCurrtypeCode() {
+        return currtypeCode;
+    }
+
+    public void setCurrtypeCode(String currtypeCode) {
+        this.currtypeCode = currtypeCode;
+    }
+
+    public String getBusidate() {
+        return busidate;
+    }
+
+    public void setBusidate(String busidate) {
+        this.busidate = busidate;
+    }
+
+    public String getGroupcreditamount() {
+        return groupcreditamount;
+    }
+
+    public void setGroupcreditamount(String groupcreditamount) {
+        this.groupcreditamount = groupcreditamount;
+    }
+
+    public String getDetailindex() {
+        return detailindex;
+    }
+
+    public void setDetailindex(String detailindex) {
+        this.detailindex = detailindex;
+    }
+}

fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/service/IBipPzService.java

@@ -0,0 +1,12 @@
+package com.hzya.frame.bip.v3.v2207.service;
+
+
+import com.hzya.frame.basedao.service.IBaseService;
+import com.hzya.frame.bip.v3.v2207.entity.BipTokenVo;
+import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity;
+
+public interface IBipPzService extends  IBaseService<BipTokenVo,String>{
+
+
+    SysExtensionApiEntity getPz(SysExtensionApiEntity entity);
+}

fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/service/IBipSsoService.java

@@ -0,0 +1,31 @@
+package com.hzya.frame.bip.v3.v2207.service;
+
+
+import com.hzya.frame.basedao.service.IBaseService;
+import com.hzya.frame.bip.v3.v2207.entity.BipTokenVo;
+import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity;
+import com.hzya.frame.web.entity.JsonResultEntity;
+
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+
+public interface IBipSsoService extends  IBaseService<BipTokenVo,String>{
+/**
+ *
+ * @content Bip单点统一认证接口
+ * @author laborer
+ * @date 2024/5/30 0030 13:45
+ *
+ */
+
+    String erpSso(HttpServletRequest request, String ticket)throws Exception;
+    /**
+     *
+     * @content 此方法获取sso动态加密，heade参数动态传入
+     * @author laborer
+     * @date 2024/5/27 0027 11:38
+     *
+     */
+    SysExtensionApiEntity ssoEncrypt(SysExtensionApiEntity entity);
+}

fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/service/IBipV32207BillService.java

@@ -0,0 +1,19 @@
+package com.hzya.frame.bip.v3.v2207.service;
+
+
+import com.hzya.frame.basedao.service.IBaseService;
+import com.hzya.frame.bip.v3.v2207.entity.BipTokenVo;
+import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity;
+
+public interface IBipV32207BillService extends  IBaseService<BipTokenVo,String>{
+/**
+ *
+ * @content 此方法获取BIPtoken，heade参数动态传入
+ * @author laborer
+ * @date 2024/5/27 0027 11:38
+ *
+ */
+
+    SysExtensionApiEntity getBipBill(SysExtensionApiEntity entity);
+    SysExtensionApiEntity getBipBillYs(SysExtensionApiEntity entity);
+}

fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/service/IBipV32207Service.java

@@ -0,0 +1,49 @@
+package com.hzya.frame.bip.v3.v2207.service;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hzya.frame.basedao.service.IBaseService;
+import com.hzya.frame.bip.v3.v2207.entity.BipSupplierEntity;
+import com.hzya.frame.web.entity.JsonResultEntity;
+
+public interface IBipV32207Service extends  IBaseService<BipSupplierEntity,String>{
+
+    /**
+     * @param jsonObject
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     * @Description 获取token
+     **/
+    JsonResultEntity thirdInterfaceGetToken(JSONObject jsonObject);
+
+
+    /**
+     * @param jsonObject
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     * @Description 获取供应商
+     **/
+    @DS("oracle91")
+    JsonResultEntity thirdInterfaceGetSupplier(JSONObject jsonObject);
+
+
+    /**
+     * @param jsonObject
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     * @Description 新增供应商
+     **/
+    JsonResultEntity thirdInterfaceSaveSupplier(JSONObject jsonObject);
+
+    /**
+     * 供应商传递OA
+     * @param jsonObject
+     * @return
+     */
+    JsonResultEntity thirdInterfaceSendOa(JSONObject jsonObject) throws Exception;
+
+    /**
+     * 获取BIP组织数据
+     * @param jsonObject
+     * @return
+     */
+    JsonResultEntity thirdInterfaceGetOrgs(JSONObject jsonObject);
+}

fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/service/IBipV32207TokenService.java

@@ -0,0 +1,22 @@
+package com.hzya.frame.bip.v3.v2207.service;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hzya.frame.basedao.service.IBaseService;
+import com.hzya.frame.bip.v3.v2207.entity.BipSupplierEntity;
+import com.hzya.frame.bip.v3.v2207.entity.BipTokenVo;
+import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity;
+import com.hzya.frame.web.entity.JsonResultEntity;
+
+public interface IBipV32207TokenService extends  IBaseService<BipTokenVo,String>{
+/**
+ *
+ * @content 此方法获取BIPtoken，heade参数动态传入
+ * @author laborer
+ * @date 2024/5/27 0027 11:38
+ *
+ */
+
+    SysExtensionApiEntity getBipToken(SysExtensionApiEntity entity);
+}

fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/service/impl/BipPzServiceImpl.java

@@ -0,0 +1,72 @@
+package com.hzya.frame.bip.v3.v2207.service.impl;
+
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.basedao.service.impl.BaseService;
+import com.hzya.frame.bip.v3.v2207.dao.IBipArchivesDao;
+import com.hzya.frame.bip.v3.v2207.entity.BipArchivesEntity;
+import com.hzya.frame.bip.v3.v2207.entity.BipAss;
+import com.hzya.frame.bip.v3.v2207.entity.BipTokenVo;
+import com.hzya.frame.bip.v3.v2207.entity.BipVoucher;
+import com.hzya.frame.bip.v3.v2207.entity.BipVoucherDetails;
+import com.hzya.frame.bip.v3.v2207.service.IBipPzService;
+import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity;
+import com.hzya.frame.web.entity.BaseResult;
+import jdk.nashorn.internal.ir.annotations.Reference;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.List;
+
+
+@Service(value = "bipPzService")
+public class BipPzServiceImpl extends BaseService<BipTokenVo, String> implements IBipPzService {
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Resource
+    private IBipArchivesDao bipArchivesDao;
+    /**
+     * @param entity
+     * @return com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity
+     * @Author lvleigang
+     * @Description 组装凭证数据
+     * @Date 10:52 上午 2024/11/5
+     **/
+    @Override
+    public SysExtensionApiEntity getPz(SysExtensionApiEntity entity) {
+        String bodys = entity.getBodys();
+        BipVoucher voucher = JSONObject.parseObject(bodys, BipVoucher.class);
+        List<String> fzhs = Arrays.asList(new String[]{"1", "2", "6", "73", "D01", "jobass", "93", "96", "22"});
+        if (voucher.getDetails() != null && voucher.getDetails().size() > 0) {
+            for (int a = 0; a < voucher.getDetails().size(); a++) {
+                BipVoucherDetails voucherDetails = voucher.getDetails().get(a);
+                if (voucherDetails.getAss() != null && voucherDetails.getAss().size() > 0) {
+                    for (int b = 0; b < voucherDetails.getAss().size(); b++) {
+                        BipAss ass = voucherDetails.getAss().get(b);
+                        if (ass.getChecktypecode() != null && !"".equals(ass.getChecktypecode())) {
+                            //存在需要转换的
+                            if (fzhs.contains(ass.getChecktypecode())) {
+                                BipArchivesEntity archivesEntity = new BipArchivesEntity();
+                                archivesEntity.setArchivesType(ass.getChecktypecode());
+                                archivesEntity.setLeftCode(ass.getCheckvaluecode());
+                                archivesEntity.setLeftOrg(voucher.getPk_corp());
+
+                                List<BipArchivesEntity> archivesEntities = bipArchivesDao.queryArchivesData(archivesEntity);
+                                if (archivesEntities != null && archivesEntities.size() > 0) {
+                                    ass.setCheckvaluecode(archivesEntities.get(0).getRightCode());
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        bodys = JSON.toJSONString(voucher);
+        entity.setBodys(bodys);
+        return entity;
+    }
+}

fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/service/impl/BipSsoServiceImpl.java

@@ -0,0 +1,114 @@
+package com.hzya.frame.bip.v3.v2207.service.impl;
+
+
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpException;
+import cn.hutool.http.HttpRequest;
+import com.alibaba.fastjson.JSON;
+import com.hzya.frame.basedao.service.impl.BaseService;
+import com.hzya.frame.bip.v3.v2207.entity.BipTokenVo;
+import com.hzya.frame.bip.v3.v2207.service.IBipSsoService;
+import com.hzya.frame.iputil.IPUtil;
+import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity;
+import nccloud.security.impl.SignatureTookKit;
+import org.apache.commons.codec.binary.Base64;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+
+@Service(value = "BipSsoServiceImpl")
+public class BipSsoServiceImpl extends BaseService<BipTokenVo, String> implements IBipSsoService {
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+    private final  String BASEURL = "http://192.168.2.237:8099/seeyon/thirdpartyController.do?ticket=";
+    private final  String ESBURL = "http://127.0.0.1:9081/kangarooDataCenterV3/entranceController/externalCallInterface";
+    /**
+     *
+     * @content Bip单点统一认证接口
+     * @author laborer
+     * @date 2024/5/30 0030 13:45
+     *
+     */
+
+    @Override
+    public String erpSso(HttpServletRequest request,String userCode)throws Exception {
+        logger.info("当前IP地址为"+ JSON.toJSONString(IPUtil.getIpAddress(request)));
+        String result = "";
+        boolean flag = true;
+//        logger.info("接收到致远OA认证参数的ticket：{}",ticket);
+        //通过ticket获取OA用户信息
+//        String userCode  = HttpUtil.get(BASEURL+ticket);
+        logger.info("获取到的OA用户信息：{}",userCode);
+        String dsname = "ycjf";
+        String client_id = "OAREST";//第三方系统id
+        StringBuffer sb = new StringBuffer();
+        if(StrUtil.isNotEmpty(userCode)){
+            try {
+                logger.info("开始加密");
+                String security = genKey(userCode,userCode  + (System.currentTimeMillis() + "").substring(0, 6));
+                logger.info("加密结束：{}",security);
+                sb.append("type=type_security&dsname="+dsname+"&usercode="+userCode+"&client_id="+client_id+"&security="+security);
+                String baseUrl = "http://10.75.51.78:8899/service/genThirdPartyAccessToken?"+sb.toString();
+                logger.info("请求BIPtokenbaseUrl：{}",baseUrl);
+                 result = HttpRequest.post(baseUrl)
+                        .header("Content-Type", "application/x-www-form-urlencoded")//头信息，多个头信息多次调用此方法即可
+                        .header("Content-Length", "10000")//头信息，多个头信息多次调用此方法即可
+                        .header("userid", "admin")//头信息，多个头信息多次调用此方法即可
+                        .body("{}")//表单内容
+                        .timeout(20000)//超时，毫秒
+                        .execute().body();
+                logger.info("获取到的BIPtoken信息：{}",result);
+            } catch (HttpException e) {
+                flag=false;
+                e.printStackTrace();
+            }
+        }
+        if(flag){
+            String indexUR = "http://10.75.51.78:8899/nccloud/resources/uap/rbac/thirdpartylogin/main/index.html?accesstoken="+result+"&redirect_uri=http://10.75.51.78:8899/nccloud/resources/workbench/public/common/main/index.html#";
+            logger.info(indexUR);
+            return  indexUR;
+        }else{
+            return "http://10.75.51.78:8899/nccloud/resources/uap/rbac/login/main/index.html";
+        }
+    }
+    /**
+     *
+     * @content 此方法获取sso动态加密，heade参数动态传入
+     * @author laborer
+     * @date 2024/5/27 0027 11:38
+     *
+     */
+
+    @Override
+    public SysExtensionApiEntity ssoEncrypt(SysExtensionApiEntity entity) {
+        try {
+            Map<String, String> headers = entity.getHeaders();
+            String userCode = headers.get("usercode");//用户编码
+            String dsname = headers.get("dsname");//数据源
+            String client_id = headers.get("client_id");//第三方系统id
+            StringBuffer sb = new StringBuffer();
+            String security = genKey(userCode,userCode  + (System.currentTimeMillis() + "").substring(0, 6));
+            StringBuffer querys = new StringBuffer();
+            querys.append("type=type_security");
+            querys.append("&dsname="+dsname);
+            querys.append("&usercode="+userCode);
+            querys.append("&client_id="+client_id);
+            querys.append("&security="+security);
+            entity.setQuerys(querys.toString());
+            headers.put("Content-Type", "application/x-www-form-urlencoded");
+            headers.put("userid", "admin");
+            entity.setHeaders(headers);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return entity;
+    }
+    /**获取NCC的key*/
+    private static String genKey(String userid, String key) throws Exception {
+        return new Base64().encodeToString(SignatureTookKit.digestSign(userid.getBytes(), key.getBytes()));
+    }
+
+}

fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/service/impl/BipV32207BillServiceImpl.java

@@ -0,0 +1,134 @@
+package com.hzya.frame.bip.v3.v2207.service.impl;
+
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.basedao.service.impl.BaseService;
+import com.hzya.frame.bip.v3.v2207.dao.IBipArchivesDao;
+import com.hzya.frame.bip.v3.v2207.entity.BipArchivesEntity;
+import com.hzya.frame.bip.v3.v2207.entity.BipAss;
+import com.hzya.frame.bip.v3.v2207.entity.BipTokenVo;
+import com.hzya.frame.bip.v3.v2207.entity.BipVoucher;
+import com.hzya.frame.bip.v3.v2207.entity.BipVoucherDetails;
+import com.hzya.frame.bip.v3.v2207.service.IBipV32207BillService;
+import com.hzya.frame.bip.v3.v2207.service.IBipV32207TokenService;
+import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity;
+import com.hzya.frame.util.bipV3.Encryption;
+import com.hzya.frame.util.bipV3.SHA256Util;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.net.URLEncoder;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+@Service(value = "BipV32207BillServiceImpl")
+public class BipV32207BillServiceImpl extends BaseService<BipTokenVo, String> implements IBipV32207BillService {
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+    @Resource
+    private IBipArchivesDao bipArchivesDao;
+    /**
+     *
+     * @content 此方法获取拼接单据动态加密，heade参数动态传入
+     * @author laborer
+     * @date 2024/5/27 0027 11:38
+     *
+     */
+
+    @Override
+    public SysExtensionApiEntity getBipBill(SysExtensionApiEntity entity) {
+        try {
+            Map<String, String> headers = entity.getHeaders();
+            String client_id = headers.get("client_id");
+            //token信息
+            String access_token =  headers.get("access_token");
+            //公钥
+            String pubKey =  headers.get("pubKey");
+            StringBuffer sb = new StringBuffer();
+            sb.append(client_id);
+            String parm = entity.getBodys();
+            if (StringUtils.isNotBlank(parm)) {
+                sb.append(parm);
+            }
+            sb.append(pubKey);
+            // 签名
+            String sign = SHA256Util.getSHA256(sb.toString(), pubKey);
+            StringBuffer querys = new StringBuffer();
+            querys.append("access_token="+access_token);
+            querys.append("&signature="+sign);
+            querys.append("&client_id="+client_id);
+            entity.setQuerys(querys.toString());
+            headers.put("signature",sign);
+//            headers.put("content-type","application/x-www-form-urlencoded");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return entity;
+    }
+    @Override
+    public SysExtensionApiEntity getBipBillYs(SysExtensionApiEntity entity) {
+        try {
+            String bodys = entity.getBodys();
+            BipVoucher voucher = JSONObject.parseObject(bodys, BipVoucher.class);
+            List<String> fzhs = Arrays.asList(new String[]{"0012", "0006", "0004"});
+            if (voucher.getDetail() != null && voucher.getDetail().size() > 0) {
+                for (int a = 0; a < voucher.getDetail().size(); a++) {
+                    BipVoucherDetails voucherDetails = voucher.getDetail().get(a);
+                    if (voucherDetails.getAss() != null && voucherDetails.getAss().size() > 0) {
+                        for (int b = 0; b < voucherDetails.getAss().size(); b++) {
+                            BipAss ass = voucherDetails.getAss().get(b);
+                            if (ass.getChecktypecode() != null && !"".equals(ass.getChecktypecode())) {
+                                //存在需要转换的
+                                if (fzhs.contains(ass.getChecktypecode())) {
+                                    BipArchivesEntity archivesEntity = new BipArchivesEntity();
+                                    archivesEntity.setArchivesType(ass.getChecktypecode());
+                                    archivesEntity.setLeftCode(ass.getCheckvaluecode());
+                                    archivesEntity.setLeftOrg(voucher.getPk_corp());
+
+                                    List<BipArchivesEntity> archivesEntities = bipArchivesDao.queryArchivesDatays(archivesEntity);
+                                    if (archivesEntities != null && archivesEntities.size() > 0) {
+                                        ass.setCheckvaluecode(archivesEntities.get(0).getRightCode());
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            bodys = JSON.toJSONString(voucher);
+            entity.setBodys(bodys);
+
+            Map<String, String> headers = entity.getHeaders();
+            String client_id = headers.get("client_id");
+            //token信息
+            String access_token =  headers.get("access_token");
+            //公钥
+            String pubKey =  headers.get("pubKey");
+            StringBuffer sb = new StringBuffer();
+            sb.append(client_id);
+            String parm = entity.getBodys();
+            if (StringUtils.isNotBlank(parm)) {
+                sb.append(parm);
+            }
+            sb.append(pubKey);
+            // 签名
+            String sign = SHA256Util.getSHA256(sb.toString(), pubKey);
+            StringBuffer querys = new StringBuffer();
+            querys.append("access_token="+access_token);
+            querys.append("&signature="+sign);
+            querys.append("&client_id="+client_id);
+            entity.setQuerys(querys.toString());
+            headers.put("signature",sign);
+//            headers.put("content-type","application/x-www-form-urlencoded");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return entity;
+    }
+}

fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/service/impl/BipV32207ServiceImpl.java

@@ -0,0 +1,480 @@
+package com.hzya.frame.bip.v3.v2207.service.impl;
+
+
+import cn.hutool.http.HttpRequest;
+import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.google.gson.Gson;
+import com.hzya.frame.base.PluginBaseEntity;
+import com.hzya.frame.basedao.service.impl.BaseService;
+import com.hzya.frame.bip.v3.v2207.dao.IBipOrgsDao;
+import com.hzya.frame.bip.v3.v2207.dao.IBipOrgsDetailsDao;
+import com.hzya.frame.bip.v3.v2207.dao.IBipSupplierDao;
+import com.hzya.frame.bip.v3.v2207.dao.IBipSupplierDetailsDao;
+import com.hzya.frame.bip.v3.v2207.entity.BipOrgsDetailsEntity;
+import com.hzya.frame.bip.v3.v2207.entity.BipOrgsEntity;
+import com.hzya.frame.bip.v3.v2207.entity.BipSupplierDetailsEntity;
+import com.hzya.frame.bip.v3.v2207.entity.BipSupplierEntity;
+import com.hzya.frame.bip.v3.v2207.service.IBipV32207Service;
+import com.hzya.frame.dateutil.DateUtil;
+import com.hzya.frame.util.PluginUtils;
+import com.hzya.frame.util.bipV3.Encryption;
+import com.hzya.frame.util.bipV3.SHA256Util;
+import com.hzya.frame.util.oldNcc.CompressUtil;
+import com.hzya.frame.util.oldNcc.Decryption;
+import com.hzya.frame.web.entity.BaseResult;
+import com.hzya.frame.web.entity.JsonResultEntity;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+import java.net.URLEncoder;
+import java.util.*;
+
+
+@Service(value = "bipV32207Service")
+public class BipV32207ServiceImpl extends BaseService<BipSupplierEntity, String> implements IBipV32207Service {
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+    //定义项目开始同步日期
+    private String ts = "2023-09-30 15:47:08";
+    //组织的同步日期
+    private String orgsts = "2023-09-30 15:47:08";
+    @Autowired
+    private IBipSupplierDao bipSupplierDao;
+
+    @Autowired
+    private IBipSupplierDetailsDao bipSupplierDetailsDao;
+
+    @Autowired
+    private IBipOrgsDao bipOrgsDao;
+
+    @Autowired
+    private IBipOrgsDetailsDao bipOrgsDetailsDao;
+
+
+    /**
+     * @param object
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     * @Description 获取token
+     **/
+    @Override
+    public JsonResultEntity thirdInterfaceGetToken(JSONObject object) {
+        JSONObject jsonObject = getstrObj("jsonStr", object);
+        String client_id = jsonObject.getString("client_id");
+        String pubKey = jsonObject.getString("pubKey");
+        String client_secret = jsonObject.getString("client_secret");
+        String username = jsonObject.getString("username");
+        String pwd = jsonObject.getString("pwd");
+        String busi_center = jsonObject.getString("busi_center");
+        String dsname = jsonObject.getString("dsname");
+        String baseUrl = jsonObject.getString("baseUrl");
+        Map<String, String> paramMap = new HashMap<String, String>();
+        // 密码模式认证
+        paramMap.put("grant_type", "password");
+        // 第三方应用id
+        paramMap.put("client_id", client_id);
+        // 第三方应用secret 公钥加密
+        try {
+            paramMap.put("client_secret", URLEncoder.encode(Encryption.pubEncrypt(pubKey, client_secret), "utf-8"));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        // ncc用户名
+        paramMap.put("username", username);
+        // 密码 公钥加密
+        try {
+            paramMap.put("password", URLEncoder.encode(Encryption.pubEncrypt(pubKey, pwd), "utf-8"));
+        } catch (Exception e) {
+            return BaseResult.getFailureMessageEntity("获取token失败");
+        }
+        // 账套编码
+        paramMap.put("biz_center", busi_center);
+        // 签名
+        String sign = SHA256Util.getSHA256(client_id + client_secret + username + pwd + pubKey, pubKey);
+        paramMap.put("signature", sign);
+        paramMap.put("dsname", dsname);
+        String url = baseUrl + "/nccloud/opm/accesstoken";
+        String mediaType = "application/x-www-form-urlencoded";
+        String token = null;
+        try {
+            token = doPostHutool(url, paramMap, mediaType, null, "", "token");
+        } catch (Exception e) {
+            return BaseResult.getFailureMessageEntity("获取token失败");
+        }
+        if (JSONUtil.isTypeJSON(token)) {
+            JSONObject jsonObject1 = JSONObject.parseObject(token);
+            return BaseResult.getSuccessMessageEntity("获取token成功", jsonObject1);
+        } else {
+            return BaseResult.getSuccessMessageEntity("获取token成功", token);
+        }
+    }
+
+    /**
+     * 发送post请求
+     *
+     * @param baseUrl
+     * @param paramMap
+     * @param mediaType
+     * @param headers
+     * @param json
+     * @return
+     */
+    private String doPostHutool(String baseUrl, Map<String, String> paramMap, String mediaType, Map<String, String> headers, String json, String type) {
+        String result = null;
+
+        try {
+            StringBuffer sb = new StringBuffer();
+            sb.append(baseUrl);
+            if (paramMap != null) {
+                sb.append("?");
+                for (Map.Entry<String, String> entry : paramMap.entrySet()) {
+                    String key = entry.getKey();
+                    String value = entry.getValue();
+                    sb.append(key + "=" + value).append("&");
+                }
+            }
+            if ("bill".equals(type)) {
+                sb.append("?");
+                for (Map.Entry<String, String> entry : headers.entrySet()) {
+                    String key = entry.getKey();
+                    String value = entry.getValue();
+                    sb.append(key + "=" + value).append("&");
+                }
+            }
+            baseUrl = sb.toString().substring(0, sb.toString().length() - 1);
+            HttpRequest re = HttpRequest.post(baseUrl);
+            re.addHeaders(headers);
+            result = re.body(json)
+                    .timeout(2000000)//超时，毫秒
+                    .execute().body();
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+
+        return result;
+    }
+
+    /**
+     * @param key
+     * @param object
+     * @return com.alibaba.fastjson.JSONObject
+     * @Author lvleigang
+     * @Description 获取对象转换成jsonobj
+     * @Date 11:51 下午 2023/7/10
+     **/
+    public JSONObject getstrObj(String key, JSONObject object) {
+        if (checkStr(object.getString(key))) {
+            return object.getJSONObject(key);
+        }
+        return new JSONObject();
+    }
+
+    /**
+     * @param str
+     * @return void
+     * @Author lvleigang
+     * @Description 校验字符串
+     * @Date 11:41 上午 2022/12/7
+     **/
+    protected Boolean checkStr(String str) {
+        Boolean flag = true;
+        if (str == null || "".equals(str)) {
+            flag = false;
+        }
+        return flag;
+    }
+
+    /**
+     * @param jsonObject
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     * @Description 获取供应商
+     **/
+    @Override
+    public JsonResultEntity thirdInterfaceGetSupplier(JSONObject jsonObject) {
+        BipSupplierEntity bipSupplierEntity = getData("jsonStr", jsonObject, BipSupplierEntity.class);
+        //设置查询区间
+        bipSupplierEntity.setTs(ts);
+        logger.info("查询供应商数据，当前TS："+ts);
+        List<BipSupplierEntity> bipSupplierEntities = bipSupplierDao.thirdInterfaceGetSupplier(bipSupplierEntity);
+        //更新TS时间
+        ts = DateUtil.dateToString(new Date(),"yyyy-MM-dd HH:mm:ss");
+        logger.info("TS已更新："+ts);
+        //System.out.println("查询供应商明细");
+        logger.info("查询供应商明细"+JSON.toJSONString(bipSupplierEntities));
+        List<JSONObject> jsonObjectList=new ArrayList<>();
+        //[{"code":"SL20231101727","dataSourceCode":"master","name":"无锡恒君安管理咨询有限公司","taxpayerid":"91320205MAD2HAQN6Q","tripartiteId":"0001A31000000002M3TS","ts":"2023-11-16 14:05:10"}]
+
+        List<BipSupplierDetailsEntity>  bipSupplierDetails = null;
+        for (BipSupplierEntity supplierEntity : bipSupplierEntities) {
+            List<JSONObject> list=new ArrayList<>();
+            JSONObject jsonObjectResult=new JSONObject();
+            jsonObjectResult.put("code",supplierEntity.getCode());
+            jsonObjectResult.put("name",supplierEntity.getName());
+            jsonObjectResult.put("taxpayerid",supplierEntity.getTaxpayerid());
+            jsonObjectResult.put("def1",supplierEntity.getDef1());
+            jsonObjectResult.put("def2",supplierEntity.getDef2());
+            jsonObjectResult.put("def3",supplierEntity.getDef3());
+            jsonObjectResult.put("tripartiteId",supplierEntity.getTripartiteId());
+            //根据供应商编码和名称查询明细
+            String code = supplierEntity.getCode();
+            String name = supplierEntity.getName();
+            //System.out.println("根据供应处名称，编码获取明细数据：code:"+code +"name:"+name);
+            logger.info("根据供应处名称，编码获取明细数据：code:"+code +"name:"+name);
+            BipSupplierDetailsEntity bipSupplierDetailsEntity = new BipSupplierDetailsEntity();
+            bipSupplierDetailsEntity.setCode(code);
+            bipSupplierDetailsEntity.setName(name);
+            logger.info("根据供应商编码，名称查询银行档案 {}",JSON.toJSONString(bipSupplierDetailsEntity));
+            List<BipSupplierDetailsEntity> bipSupplierDetailsEntities =    queryBipSupplierDetails(bipSupplierDetailsEntity) ;
+//                    /bipSupplierDetails.stream().filter(that-> code.equalsIgnoreCase(that.getCode() ) &&   name.equalsIgnoreCase(that.getName() ) ).collect(Collectors.toList());
+            logger.info("根据供应处名称，编码获取明细数据 bipSupplierDetailsEntities值：{}",JSON.toJSONString(bipSupplierDetailsEntities));
+          if (bipSupplierDetailsEntities.size()>0 && null!=bipSupplierDetailsEntities){
+                bipSupplierDetailsEntities.get(0).setIsdefault("-8073674727882144390");
+                for (BipSupplierDetailsEntity supplierDetailsEntity : bipSupplierDetailsEntities) {
+                    JSONObject jsonObjectDetails=new JSONObject();
+                    jsonObjectDetails.put("splitbank",supplierDetailsEntity.getSplitbank());
+                    jsonObjectDetails.put("bankaccno",supplierDetailsEntity.getBankaccno());
+                    jsonObjectDetails.put("combinno",supplierDetailsEntity.getCombinno());
+                    jsonObjectDetails.put("isdefault",supplierDetailsEntity.getIsdefault());
+                    list.add(jsonObjectDetails);
+                }
+            }
+             jsonObjectResult.put("details",list);
+            jsonObjectList.add(jsonObjectResult);
+        }
+        return BaseResult.getSuccessMessageEntity("查询成功",jsonObjectList);
+    }
+    @DS("oracle91")
+    private  List<BipSupplierDetailsEntity>  queryBipSupplierDetails(BipSupplierDetailsEntity bipSupplierDetailsEntity){
+//        BipSupplierDetailsEntity bipSupplierDetailsEntity=new BipSupplierDetailsEntity();
+//        bipSupplierDetailsEntity.setCode(supplierEntity.getCode());
+//        bipSupplierDetailsEntity.setName(supplierEntity.getName());
+
+        List<BipSupplierDetailsEntity> bipSupplierDetailsEntities = bipSupplierDetailsDao.thirdInterfaceGetSupplierDetails(bipSupplierDetailsEntity);
+        return bipSupplierDetailsEntities;
+    }
+
+
+    /**
+     * 获取BIP组织数据
+     * @param jsonObject
+     * @return
+     */
+    @Override
+    public JsonResultEntity thirdInterfaceGetOrgs(JSONObject jsonObject) {
+        BipOrgsEntity bipOrgsEntity = getData("jsonStr", jsonObject, BipOrgsEntity.class);
+        //设置查询区间
+        bipOrgsEntity.setOrgsts(orgsts);
+        logger.info("查询组织数据，当前TS：" + orgsts);
+        List<BipOrgsEntity> bipOrgsEntities = bipOrgsDao.thirdInterfaceGetOrgs(bipOrgsEntity);
+        //更新TS时间
+        orgsts = DateUtil.dateToString(new Date(), "yyyy-MM-dd HH:mm:ss");
+        logger.info("组织TS已更新：" + orgsts);
+        logger.info("查询组织明细" + JSON.toJSONString(bipOrgsEntities));
+        List<JSONObject> jsonObjectList = new ArrayList<>();
+        if (null != bipOrgsEntities && bipOrgsEntities.size() > 0) {
+            for (BipOrgsEntity orgsEntity : bipOrgsEntities) {
+                List<JSONObject> list = new ArrayList<>();
+                JSONObject jsonObjectResult = new JSONObject();
+                jsonObjectResult.put("code", orgsEntity.getCode());//单位编码
+                jsonObjectResult.put("name", orgsEntity.getName());//单位名称
+                jsonObjectResult.put("tripartiteId", orgsEntity.getTripartiteId());//BIPID
+                //根据组织主键查询明细
+                String tripartiteId = orgsEntity.getTripartiteId();
+                //System.out.println("根据供应处名称，编码获取明细数据：code:"+code +"name:"+name);
+                logger.info("根据组织主键获取明细数据：pk_financeorg:{}", tripartiteId);
+                BipOrgsDetailsEntity bipOrgsDetailsEntity = new BipOrgsDetailsEntity();
+                bipOrgsDetailsEntity.setControlorg(tripartiteId);
+                List<BipOrgsDetailsEntity> bipOrgsDetailsEntities = queryBipOrgsDetails(bipOrgsDetailsEntity);
+                if (bipOrgsDetailsEntities.size() > 0 && null != bipOrgsDetailsEntities) {
+                    for (BipOrgsDetailsEntity orgsDetailsEntity : bipOrgsDetailsEntities) {
+                        JSONObject jsonObjectDetails = new JSONObject();
+                        jsonObjectDetails.put("bankCode", orgsDetailsEntity.getBankCode());//开户行编码
+                        jsonObjectDetails.put("bankName", orgsDetailsEntity.getBankName());//开户行名称
+                        jsonObjectDetails.put("accnum", orgsDetailsEntity.getAccnum());//账户
+                        jsonObjectDetails.put("cnapsCode", orgsDetailsEntity.getCnapsCode());//联行号
+                        list.add(jsonObjectDetails);
+                    }
+                }
+                jsonObjectResult.put("details", list);
+                jsonObjectList.add(jsonObjectResult);
+            }
+        }
+        return BaseResult.getSuccessMessageEntity("查询成功", jsonObjectList);
+    }
+    private  List<BipOrgsDetailsEntity>  queryBipOrgsDetails(BipOrgsDetailsEntity bipOrgsDetailsEntity){
+        List<BipOrgsDetailsEntity> bipOrgsDetailsEntities = bipOrgsDetailsDao.thirdInterfaceGetOrgsDetails(bipOrgsDetailsEntity);
+        return bipOrgsDetailsEntities;
+    }
+
+    /**
+     * @param object
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     * @Description 新增供应商
+     **/
+    @Override
+    public JsonResultEntity thirdInterfaceSaveSupplier(JSONObject object) {
+        JSONObject jsonObject = getstrObj("jsonStr", object);
+        //认证access_token
+        String access_token = jsonObject.getString("access_token");
+        //认证security_key
+        String security_key = jsonObject.getString("security_key");
+        //服务器ip：port
+        String baseUrl = jsonObject.getString("baseUrl");
+        //api方法
+        String apiUrl = jsonObject.getString("apiUrl");
+        //发送的数据
+        String sendData =jsonObject.getString("sendData");
+        //对应于在第三方应用注册当中的app_id
+        String client_id = jsonObject.getString("client_id");
+        //公钥
+        String pubKey = jsonObject.getString("pubKey");
+        //接口调用业务标识
+        String busi_id = jsonObject.getString("busi_id");
+        //重复调用检查
+        String repeat_check = jsonObject.getString("repeat_check");
+        //返回值压缩加密级别
+        String secret_level = jsonObject.getString("secret_level") == null ? "L0": jsonObject.getString("secret_level") ;
+        try {
+            String returnStr = sendApi(access_token, security_key, baseUrl,apiUrl,sendData,client_id,pubKey,busi_id,repeat_check,secret_level);
+            if(JSONUtil.isTypeJSON(returnStr)){
+                JSONObject jsonObject1 = JSONObject.parseObject(returnStr);
+                return BaseResult.getSuccessMessageEntity("发送数据成功",jsonObject1);
+            }else {
+                return BaseResult.getSuccessMessageEntity("发送数据成功",returnStr);
+            }
+        } catch (Exception e) {
+            return BaseResult.getFailureMessageEntity("发送数据错误");
+        }
+    }
+
+    /**
+     * 供应商传递OA
+     * @param jsonObject
+     * @return
+     */
+    @Override
+    public JsonResultEntity thirdInterfaceSendOa(JSONObject jsonObject) throws Exception {
+        JSONObject jsonObjectStr = getstrObj("jsonStr", jsonObject);
+        PluginBaseEntity pluginBaseEntity = PluginUtils.getPluginsById(jsonObjectStr.getString("plug_id"));
+        JsonResultEntity s = pluginBaseEntity.executeBusiness(jsonObjectStr);
+        return BaseResult.getSuccessMessageEntity("传递成功");
+    }
+
+
+    /**
+     * @param access_token 认证access_token
+     * @param security_key 认证security_key
+     * @param baseUrl      服务器ip：port
+     * @param apiUrl       api方法
+     * @param putParameter 发送的数据
+     * @param client_id    对应于在第三方应用注册当中的app_id
+     * @param pubKey       公钥
+     * @param busi_id      接口调用业务标识
+     * @param repeat_check 重复调用检查
+     * @param secret_level 返回值压缩加密级别
+     * @return java.lang.String
+     * @Author lvleigang
+     * @Description 发起api接口
+     * @Date 9:52 上午 2023/8/22
+     **/
+    private String sendApi(String access_token, String security_key, String baseUrl, String apiUrl, String putParameter, String client_id, String pubKey, String busi_id, String repeat_check, String secret_level) throws Exception{
+        // header 参数
+        Map<String, String> headermap = new HashMap<>();
+        headermap.put("access_token", access_token);
+        headermap.put("client_id", client_id);
+        StringBuffer sb = new StringBuffer();
+        sb.append(client_id);
+        if (StringUtils.isNotBlank(putParameter)) {
+            sb.append(putParameter);
+        }
+        sb.append(pubKey);
+        String sign = SHA256Util.getSHA256(sb.toString(), pubKey);
+        headermap.put("signature", sign);
+        if (StringUtils.isNotBlank(busi_id)) {
+            headermap.put("busi_id", busi_id);
+        }
+        if (StringUtils.isNotBlank(repeat_check)) {
+            headermap.put("repeat_check", repeat_check);
+        }
+        String mediaType = "application/json;charset=utf-8";
+        // 表体数据json
+        // 根据安全级别选择加密或压缩请求表体参数
+        String json = dealRequestBody(putParameter, security_key, secret_level);
+        // 返回值
+        String sendUrl = baseUrl + apiUrl;
+        String result = doPostHutool(sendUrl, null, mediaType, headermap, json, "bill");
+        String changeData = dealResponseBody(result, security_key, secret_level);
+        return changeData;
+    }
+
+    // 返回值进行过加密和压缩，对返回值进行解压和解密
+    private static String dealResponseBody(String source, String security_key, String level) throws Exception {
+        String result = null;
+        if (StringUtils.isEmpty(level) || SecretConst.LEVEL0.equals(level)) {
+            result = source;
+        } else if (SecretConst.LEVEL1.equals(level)) {
+            result = Decryption.symDecrypt(security_key, source);
+        } else if (SecretConst.LEVEL2.equals(level)) {
+            result = CompressUtil.gzipDecompress(source);
+        } else if (SecretConst.LEVEL3.equals(level)) {
+            result = CompressUtil.gzipDecompress(Decryption.symDecrypt(security_key, source));
+        } else if (SecretConst.LEVEL4.equals(level)) {
+            result = Decryption.symDecrypt(security_key, CompressUtil.gzipDecompress(source));
+        } else {
+            throw new Exception("无效的安全等级");
+        }
+
+        return result;
+    }
+
+    // 根据安全级别设置，表体是否加密或压缩
+    private static String dealRequestBody(String source, String security_key, String level) throws Exception {
+        String result = null;
+        if (StringUtils.isEmpty(level) || SecretConst.LEVEL0.equals(level)) {
+            result = source;
+        } else if (SecretConst.LEVEL1.equals(level)) {
+            result = Encryption.symEncrypt(security_key, source);
+        } else if (SecretConst.LEVEL2.equals(level)) {
+            result = CompressUtil.gzipCompress(source);
+        } else if (SecretConst.LEVEL3.equals(level)) {
+            result = Encryption.symEncrypt(security_key, CompressUtil.gzipCompress(source));
+        } else if (SecretConst.LEVEL4.equals(level)) {
+            result = CompressUtil.gzipCompress(Encryption.symEncrypt(security_key, source));
+        } else {
+            throw new Exception("无效的安全等级");
+        }
+
+        return result;
+    }
+
+    class SecretConst {
+        /**
+         * LEVEL0 不压缩、不加密
+         */
+        public static final String LEVEL0 = "L0";
+        /**
+         * LEVEL1 只加密、不压缩
+         */
+        public static final String LEVEL1 = "L1";
+        /**
+         * LEVEL2 只压缩、不加密
+         */
+        public static final String LEVEL2 = "L2";
+        /**
+         * LEVEL3 先压缩、后加密
+         */
+        public static final String LEVEL3 = "L3";
+        /**
+         * LEVEL4 先加密、后压缩
+         */
+        public static final String LEVEL4 = "L4";
+    }
+}

fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/service/impl/BipV32207TokenServiceImpl.java

@@ -0,0 +1,92 @@
+package com.hzya.frame.bip.v3.v2207.service.impl;
+
+
+import cn.hutool.http.HttpRequest;
+import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hzya.frame.base.PluginBaseEntity;
+import com.hzya.frame.basedao.service.impl.BaseService;
+import com.hzya.frame.bip.v3.v2207.dao.IBipOrgsDao;
+import com.hzya.frame.bip.v3.v2207.dao.IBipOrgsDetailsDao;
+import com.hzya.frame.bip.v3.v2207.dao.IBipSupplierDao;
+import com.hzya.frame.bip.v3.v2207.dao.IBipSupplierDetailsDao;
+import com.hzya.frame.bip.v3.v2207.entity.*;
+import com.hzya.frame.bip.v3.v2207.service.IBipV32207Service;
+import com.hzya.frame.bip.v3.v2207.service.IBipV32207TokenService;
+import com.hzya.frame.dateutil.DateUtil;
+import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity;
+import com.hzya.frame.util.PluginUtils;
+import com.hzya.frame.util.bipV3.Encryption;
+import com.hzya.frame.util.bipV3.SHA256Util;
+import com.hzya.frame.util.oldNcc.CompressUtil;
+import com.hzya.frame.util.oldNcc.Decryption;
+import com.hzya.frame.web.entity.BaseResult;
+import com.hzya.frame.web.entity.JsonResultEntity;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.net.URLEncoder;
+import java.util.*;
+
+
+@Service(value = "bipV32207TokenService")
+public class BipV32207TokenServiceImpl extends BaseService<BipTokenVo, String> implements IBipV32207TokenService {
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+    /**
+     *
+     * @content 此方法获取BIPtoken，heade参数动态传入
+     * @author laborer
+     * @date 2024/5/27 0027 11:38
+     *
+     */
+
+    @Override
+    public SysExtensionApiEntity getBipToken(SysExtensionApiEntity entity) {
+        try {
+            Map<String, String> headers = entity.getHeaders();
+            String client_id = headers.get("client_id");
+            Map<String, String> paramMap = new HashMap<String, String>();
+            // 密码模式认证
+            paramMap.put("grant_type", "client_credentials");
+            // 第三方应用id
+            paramMap.put("client_id", client_id);
+            // 第三方应用secret]
+            String client_secret =  headers.get("client_secret");
+            // 账套编码
+            String busi_center =  headers.get("busi_center");
+            //用户编码
+            String usercode =  headers.get("usercode");
+            //数据库编码
+            String dsname =  headers.get("dsname");
+            String pubKey =  headers.get("pubKey");
+            // 第三方应用secret 公钥加密]
+            paramMap.put("client_secret", URLEncoder.encode(Encryption.pubEncrypt(pubKey, client_secret), "utf-8"));
+            // 账套编码
+            paramMap.put("biz_center", busi_center);
+            // // TODO 传递数据源和ncc登录用户
+            paramMap.put("dsname", dsname);
+            paramMap.put("usercode", usercode);
+            // 签名
+            String sign = SHA256Util.getSHA256(client_id + client_secret + pubKey,pubKey);
+            paramMap.put("signature", sign);
+            StringBuffer querys = new StringBuffer();
+            querys.append("biz_center="+busi_center);
+            querys.append("&grant_type="+"client_credentials");
+            querys.append("&signature="+sign);
+            querys.append("&dsname="+dsname);
+            querys.append("&client_secret="+URLEncoder.encode(Encryption.pubEncrypt(pubKey, client_secret), "utf-8"));
+            querys.append("&usercode="+usercode);
+            querys.append("&client_id="+client_id);
+            entity.setQuerys(querys.toString());
+            headers.put("content-type","application/x-www-form-urlencoded");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return entity;
+    }
+}

fw-bip/src/main/java/com/hzya/frame/bip/v3/v2207/util/BipUtil.java

@@ -0,0 +1,65 @@
+package com.hzya.frame.bip.v3.v2207.util;
+
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpRequest;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+
+/**
+ * com.hzya.frame.bip.v3.v2207.util
+ *
+ * @author makejava
+ * @date 2024-05 -30 14:20
+ */
+
+public class BipUtil {
+    /**
+     *
+     * @content 发送单据到BIP系统
+     * @author laborer
+     * @date 2024/6/21 0021 10:51
+     *
+     */
+
+    public static String sendU9cTOBipEsb(String parm, String apiCode,String token){
+        String baseUrl = "http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface";
+        System.out.println("推送参数"+parm);
+        String result = HttpRequest.post(baseUrl)
+                .header("appId", "800023")//头信息，多个头信息多次调用此方法即可
+                .header("access_token", token)//头信息，多个头信息多次调用此方法即可
+                .header("apiCode", apiCode)//头信息，多个头信息多次调用此方法即可
+                .header("publicKey", "ZJYA1vBeY1ai53iNmbAEsw6DImjkXGBkdMailxcBdliFC85Ce7eDIk+3zDUT+v578prj")//头信息，多个头信息多次调用此方法即可
+                .header("secretKey", "7Gp6OjHrIaQ6R3tXGPrI4morjQyWL+qu4JJschQnkBRtv26VDgGFVYKOy5kMZfd/j3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=")//头信息，多个头信息多次调用此方法即可
+                .body(parm)//表单内容
+                .timeout(20000)//超时，毫秒
+                .execute().body();
+        System.out.println("返回参数"+result);
+        if(StrUtil.isNotEmpty(result)){
+            return analytic(result);
+        }
+        return null;
+    }
+    public static String getBipToken(String userCode, String apiCode){
+        String baseUrl = "http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface";
+        String result = HttpRequest.post(baseUrl)
+                .header("appId", "800023")//头信息，多个头信息多次调用此方法即可
+                .header("apiCode", apiCode)//头信息，多个头信息多次调用此方法即可
+                .header("usercode", userCode)//头信息，多个头信息多次调用此方法即可
+                .header("publicKey", "ZJYA1vBeY1ai53iNmbAEsw6DImjkXGBkdMailxcBdliFC85Ce7eDIk+3zDUT+v578prj")//头信息，多个头信息多次调用此方法即可
+                .header("secretKey", "7Gp6OjHrIaQ6R3tXGPrI4morjQyWL+qu4JJschQnkBRtv26VDgGFVYKOy5kMZfd/j3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=")//头信息，多个头信息多次调用此方法即可
+                .body("")//表单内容
+                .timeout(20000)//超时，毫秒
+                .execute().body();
+        System.out.println("返回参数"+result);
+        if(StrUtil.isNotEmpty(result)){
+             JSONObject obj = JSON.parseObject( analytic(result));
+            JSONObject data = obj.getJSONObject("data");
+            return data.getString("access_token");
+        }
+        return null;
+    }
+    public static String analytic(String parm){
+        JSONObject main = JSON.parseObject(parm);
+        return main.getString("attribute");
+    }
+}

fw-bip/src/main/webapp/WEB-INF/web.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
+         version="4.0">
+</web-app>

fw-oa/pom.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>kangarooDataCenterV3</artifactId>
+        <groupId>com.hzya.frame</groupId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>fw-oa</artifactId>
+    <packaging>jar</packaging>
+    <version>${revision}</version>
+
+    <dependencies>
+            <dependency>
+                <groupId>com.hzya.frame</groupId>
+                <artifactId>base-service</artifactId>
+                <version>${revision}</version>
+            </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>${mysql-connector-java}</version>
+        </dependency>
+
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass>none</mainClass>     <!-- 取消查找本项目下的Main方法：为了解决Unable to find main class的问题 -->
+                    <classifier>execute</classifier>    <!-- 为了解决依赖模块找不到此模块中的类或属性 -->
+                    <skip>true</skip>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

fw-oa/src/main/java/com/hzya/frame/seeyon/cap4/form/dto/FormDTO.java

@@ -0,0 +1,74 @@
+package com.hzya.frame.seeyon.cap4.form.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+import java.util.List;
+
+/**
+ * @Description 无流程表单批量保存请求参数
+ * @Author xiangerlin
+ * @Date 2024/1/8 11:18
+ **/
+public class FormDTO {
+    @JSONField(ordinal = 4)
+    private String formCode;//模版编号
+    @JSONField(ordinal = 5)
+    private String loginName;//模版编号
+    @JSONField(ordinal = 2)
+    private String rightId;//权限id，找到无流程表单，点新增，弹出的窗口上会有这个参数
+    @JSONField(ordinal = 3)
+    private List<FormDataDTO> dataList;//导入的数据
+    @JSONField(ordinal = 1)
+    private String[] uniqueFiled;//更新用的唯一标识
+    @JSONField(ordinal = 6)
+    private Boolean doTrigger;//是否执行触发(Since V8.0sp2),测试中发现传了这个参数会报错
+
+    public String getFormCode() {
+        return formCode;
+    }
+
+    public void setFormCode(String formCode) {
+        this.formCode = formCode;
+    }
+
+    public String getLoginName() {
+        return loginName;
+    }
+
+    public void setLoginName(String loginName) {
+        this.loginName = loginName;
+    }
+
+    public String getRightId() {
+        return rightId;
+    }
+
+    public void setRightId(String rightId) {
+        this.rightId = rightId;
+    }
+
+    public List<FormDataDTO> getDataList() {
+        return dataList;
+    }
+
+    public void setDataList(List<FormDataDTO> dataList) {
+        this.dataList = dataList;
+    }
+
+    public String[] getUniqueFiled() {
+        return uniqueFiled;
+    }
+
+    public void setUniqueFiled(String[] uniqueFiled) {
+        this.uniqueFiled = uniqueFiled;
+    }
+
+    public Boolean getDoTrigger() {
+        return doTrigger;
+    }
+
+    public void setDoTrigger(Boolean doTrigger) {
+        this.doTrigger = doTrigger;
+    }
+}

fw-oa/src/main/java/com/hzya/frame/seeyon/cap4/form/dto/FormDataDTO.java

@@ -0,0 +1,36 @@
+package com.hzya.frame.seeyon.cap4.form.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+import java.util.List;
+
+/**
+ * @Description dataList节点
+ * @Author xiangerlin
+ * @Date 2024/1/8 11:26
+ **/
+public class FormDataDTO {
+    @JSONField(ordinal = 1)
+    private MasterTableDTO masterTable;//主表数据
+    @JSONField(ordinal = 2)
+    private List<SubTableDTO> subTables;//子表数据
+
+    //private List<> attachmentInfos;//附件列表
+
+    public MasterTableDTO getMasterTable() {
+        return masterTable;
+    }
+
+    public void setMasterTable(MasterTableDTO masterTable) {
+        this.masterTable = masterTable;
+    }
+
+    public List<SubTableDTO> getSubTables() {
+        return subTables;
+    }
+
+    public void setSubTables(List<SubTableDTO> subTables) {
+        this.subTables = subTables;
+    }
+}

fw-oa/src/main/java/com/hzya/frame/seeyon/cap4/form/dto/MasterTableDTO.java

@@ -0,0 +1,45 @@
+package com.hzya.frame.seeyon.cap4.form.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+import java.util.List;
+
+/**
+ * @Description 主表数据
+ * @Author xiangerlin
+ * @Date 2024/1/8 11:29
+ **/
+
+public class MasterTableDTO {
+    @JSONField(ordinal = 1)
+    private String name;//表名
+    @JSONField(ordinal = 2)
+    private RecordDTO record;//数据
+    @JSONField(ordinal = 3)
+    private List<String> changedFields;//需要计算的字段
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public RecordDTO getRecord() {
+        return record;
+    }
+
+    public void setRecord(RecordDTO record) {
+        this.record = record;
+    }
+
+    public List<String> getChangedFields() {
+        return changedFields;
+    }
+
+    public void setChangedFields(List<String> changedFields) {
+        this.changedFields = changedFields;
+    }
+}

fw-oa/src/main/java/com/hzya/frame/seeyon/cap4/form/dto/RecordDTO.java

@@ -0,0 +1,34 @@
+package com.hzya.frame.seeyon.cap4.form.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+import java.util.List;
+
+/**
+ * @Description record节点
+ * @Author xiangerlin
+ * @Date 2024/1/8 11:31
+ **/
+public class RecordDTO {
+    @JSONField(ordinal = 1)
+    private long id;//数据id，测试中发现新增时这个参数随便填写 不影响导入
+    @JSONField(ordinal = 2)
+    private List<RecordFieldDTO> fields;//字段列表
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public List<RecordFieldDTO> getFields() {
+        return fields;
+    }
+
+    public void setFields(List<RecordFieldDTO> fields) {
+        this.fields = fields;
+    }
+}

fw-oa/src/main/java/com/hzya/frame/seeyon/cap4/form/dto/RecordFieldDTO.java

@@ -0,0 +1,52 @@
+package com.hzya.frame.seeyon.cap4.form.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * @Description masterTable—record—fields的结构
+ * @Author xiangerlin
+ * @Date 2024/1/8 11:32
+ **/
+public class RecordFieldDTO {
+    @JSONField(ordinal = 1)
+    private String name;//数据域名称 ,fieldxxxx
+    @JSONField(ordinal = 2)
+    private String value;//数据值（优先）
+    @JSONField(ordinal = 3)
+    private String showValue;//显示值
+
+    public RecordFieldDTO() {
+
+    }
+
+    public RecordFieldDTO(String name, String value, String showValue) {
+        this.name = name;
+        this.value = value;
+        this.showValue = showValue;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public String getShowValue() {
+        return showValue;
+    }
+
+    public void setShowValue(String showValue) {
+        this.showValue = showValue;
+    }
+}

fw-oa/src/main/java/com/hzya/frame/seeyon/cap4/form/dto/SubTableDTO.java

@@ -0,0 +1,9 @@
+package com.hzya.frame.seeyon.cap4.form.dto;
+
+/**
+ * @Description 子表数据
+ * @Author xiangerlin
+ * @Date 2024/1/8 11:29
+ **/
+public class SubTableDTO {
+}

fw-oa/src/main/java/com/hzya/frame/seeyon/cbs8/dao/IAgentPaymentDao.java

@@ -0,0 +1,12 @@
+package com.hzya.frame.seeyon.cbs8.dao;
+
+import com.hzya.frame.basedao.dao.IBaseDao;
+import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentEntity;
+
+/**
+ * @Description 代发代扣
+ * @Author xiangerlin
+ * @Date 2024/6/26 10:50
+ **/
+public interface IAgentPaymentDao extends IBaseDao<AgentPaymentEntity,String> {
+}

fw-oa/src/main/java/com/hzya/frame/seeyon/cbs8/dao/IAgentPaymentDetailDao.java

@@ -0,0 +1,12 @@
+package com.hzya.frame.seeyon.cbs8.dao;
+
+import com.hzya.frame.basedao.dao.IBaseDao;
+import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentDetailEntity;
+
+/**
+ * @Description 代发代扣明细
+ * @Author xiangerlin
+ * @Date 2024/6/26 10:54
+ **/
+public interface IAgentPaymentDetailDao extends IBaseDao<AgentPaymentDetailEntity,String> {
+}

fw-oa/src/main/java/com/hzya/frame/seeyon/cbs8/dao/ICbsLogDao.java

@@ -0,0 +1,12 @@
+package com.hzya.frame.seeyon.cbs8.dao;
+
+import com.hzya.frame.basedao.dao.IBaseDao;
+import com.hzya.frame.seeyon.cbs8.entity.CbsLogEntity;
+
+/**
+ * @Description cbs8支付日志
+ * @Author xiangerlin
+ * @Date 2024/6/14 17:30
+ **/
+public interface ICbsLogDao extends IBaseDao<CbsLogEntity,String> {
+}

fw-oa/src/main/java/com/hzya/frame/seeyon/cbs8/dao/IPaymentDao.java

@@ -0,0 +1,10 @@
+package com.hzya.frame.seeyon.cbs8.dao;
+
+import com.hzya.frame.basedao.dao.IBaseDao;
+import com.hzya.frame.seeyon.cbs8.entity.PaymentEntity;
+
+/**
+ * oa集成cbs
+ */
+public interface IPaymentDao extends IBaseDao<PaymentEntity,String> {
+}

fw-oa/src/main/java/com/hzya/frame/seeyon/cbs8/dao/ITransactionDetailDao.java

@@ -0,0 +1,12 @@
+package com.hzya.frame.seeyon.cbs8.dao;
+
+import com.hzya.frame.basedao.dao.IBaseDao;
+import com.hzya.frame.seeyon.cbs8.entity.TransactionDetailEntity;
+
+/**
+ * @Description cbs交易明细 oa底表
+ * @Author xiangerlin
+ * @Date 2024/6/24 11:10
+ **/
+public interface ITransactionDetailDao extends IBaseDao<TransactionDetailEntity,String> {
+}

fw-oa/src/main/java/com/hzya/frame/seeyon/cbs8/dao/impl/AgentPaymentDaoImpl.java

@@ -0,0 +1,15 @@
+package com.hzya.frame.seeyon.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 org.springframework.stereotype.Repository;
+
+/**
+ * @Description
+ * @Author xiangerlin
+ * @Date 2024/6/26 10:51
+ **/
+@Repository("OAAgentPaymentDaoImpl")
+public class AgentPaymentDaoImpl extends MybatisGenericDao<AgentPaymentEntity,String> implements IAgentPaymentDao {
+}

fw-oa/src/main/java/com/hzya/frame/seeyon/cbs8/dao/impl/AgentPaymentDetailDaoImpl.java

@@ -0,0 +1,15 @@
+package com.hzya.frame.seeyon.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 org.springframework.stereotype.Repository;
+
+/**
+ * @Description
+ * @Author xiangerlin
+ * @Date 2024/6/26 10:55
+ **/
+@Repository("OAAgentPaymentDetailDaoImpl")
+public class AgentPaymentDetailDaoImpl extends MybatisGenericDao<AgentPaymentDetailEntity,String> implements IAgentPaymentDetailDao {
+}

fw-oa/src/main/java/com/hzya/frame/seeyon/cbs8/dao/impl/CbsLogDaoImpl.java

@@ -0,0 +1,15 @@
+package com.hzya.frame.seeyon.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 org.springframework.stereotype.Repository;
+
+/**
+ * @Description
+ * @Author xiangerlin
+ * @Date 2024/6/14 17:31
+ **/
+@Repository()
+public class CbsLogDaoImpl extends MybatisGenericDao<CbsLogEntity,String> implements ICbsLogDao {
+}

fw-oa/src/main/java/com/hzya/frame/seeyon/cbs8/dao/impl/PaymentDaoImpl.java

@@ -0,0 +1,15 @@
+package com.hzya.frame.seeyon.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 org.springframework.stereotype.Repository;
+
+/**
+ * @Description oa集成cbs
+ * @Author xiangerlin
+ * @Date 2024/6/6 16:28
+ **/
+@Repository("OAPaymentDaoImpl")
+public class PaymentDaoImpl extends MybatisGenericDao<PaymentEntity,String> implements IPaymentDao {
+}

fw-oa/src/main/java/com/hzya/frame/seeyon/cbs8/dao/impl/TransactionDetailDaoImpl.java

@@ -0,0 +1,17 @@
+package com.hzya.frame.seeyon.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 org.springframework.stereotype.Repository;
+
+/**
+ * @Description
+ * @Author xiangerlin
+ * @Date 2024/6/24 11:10
+ **/
+@Repository("OATransactionDetailDaoImpl")
+public class TransactionDetailDaoImpl extends MybatisGenericDao<TransactionDetailEntity,String> implements ITransactionDetailDao {
+}

fw-oa/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentDetailEntity.java

@@ -0,0 +1,113 @@
+package com.hzya.frame.seeyon.cbs8.entity;
+
+import com.hzya.frame.web.entity.BaseEntity;
+
+/**
+ * @Description 代发代扣明细表
+ * @Author xiangerlin
+ * @Date 2024/6/18 14:58
+ **/
+public class AgentPaymentDetailEntity extends BaseEntity {
+    //每笔明细金额
+    private String dtlAmount;
+    //收款账号
+    private String dtlRevAccount;
+    //联行号 同行可不传，跨行必传
+    private String dtlCnapsCode;
+    //收款账户名称
+    private String dtlRevName;
+    //收款开户行 ,如果传的联行号能匹配到对应到开户行，cbs8会自动带出
+    private String dtlRevBankName;
+    //主表id
+    private String formmainId;
+    //表名
+    private String tabName;
+
+    //明细序号，从1开始递增
+    private int dtlSeqNum;
+
+    //支付结果
+    private String payResult;
+    //支付日期
+    private String payDate;
+
+    public String getDtlAmount() {
+        return dtlAmount;
+    }
+
+    public void setDtlAmount(String dtlAmount) {
+        this.dtlAmount = dtlAmount;
+    }
+
+    public String getDtlRevAccount() {
+        return dtlRevAccount;
+    }
+
+    public void setDtlRevAccount(String dtlRevAccount) {
+        this.dtlRevAccount = dtlRevAccount;
+    }
+
+    public String getDtlCnapsCode() {
+        return dtlCnapsCode;
+    }
+
+    public void setDtlCnapsCode(String dtlCnapsCode) {
+        this.dtlCnapsCode = dtlCnapsCode;
+    }
+
+    public String getDtlRevName() {
+        return dtlRevName;
+    }
+
+    public void setDtlRevName(String dtlRevName) {
+        this.dtlRevName = dtlRevName;
+    }
+
+    public String getDtlRevBankName() {
+        return dtlRevBankName;
+    }
+
+    public void setDtlRevBankName(String dtlRevBankName) {
+        this.dtlRevBankName = dtlRevBankName;
+    }
+
+    public String getFormmainId() {
+        return formmainId;
+    }
+
+    public void setFormmainId(String formmainId) {
+        this.formmainId = formmainId;
+    }
+
+    public String getTabName() {
+        return tabName;
+    }
+
+    public void setTabName(String tabName) {
+        this.tabName = tabName;
+    }
+
+    public int getDtlSeqNum() {
+        return dtlSeqNum;
+    }
+
+    public void setDtlSeqNum(int dtlSeqNum) {
+        this.dtlSeqNum = dtlSeqNum;
+    }
+
+    public String getPayResult() {
+        return payResult;
+    }
+
+    public void setPayResult(String payResult) {
+        this.payResult = payResult;
+    }
+
+    public String getPayDate() {
+        return payDate;
+    }
+
+    public void setPayDate(String payDate) {
+        this.payDate = payDate;
+    }
+}

fw-oa/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentDetailEntity.xml

@@ -0,0 +1,84 @@
+<?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">
+        <result property="id" column="id" />
+        <result property="formmainId" column="formmainId" />
+        <result property="tabName" column="tabName" />
+        <result property="dtlSeqNum" column="dtlSeqNum" />
+        <result property="dtlAmount" column="dtlAmount" />
+        <result property="dtlRevAccount" column="dtlRevAccount" />
+        <result property="dtlCnapsCode" column="dtlCnapsCode" />
+        <result property="dtlRevName" column="dtlRevName" />
+        <result property="dtlRevBankName" column="dtlRevBankName" />
+        <result property="payResult" column="payResult" />
+        <result property="payDate" column="payDate" />
+    </resultMap>
+
+    <sql id="AgentPaymentDetailEntity_Base_Column_List">
+        id,
+        formmainId,
+        tabName,
+        dtlSeqNum,
+        dtlAmount,
+        dtlRevAccount,
+        dtlCnapsCode,
+        dtlRevName,
+        dtlRevBankName,
+        payResult,
+        payDate
+    </sql>
+
+
+    <!-- 采用==查询 -->
+    <select id="entity_list_base" resultMap="get-AgentPaymentDetailEntity-result" parameterType="com.hzya.frame.seeyon.cbs8.entity.AgentPaymentDetailEntity">
+        select
+        <include refid="AgentPaymentDetailEntity_Base_Column_List"/>
+        from (
+        SELECT
+        formson_0225.id,
+        formson_0225.formmain_id AS formmainId,
+        'formson_0225' AS tabName,
+        formson_0225.field0001 AS dtlSeqNum,
+        formson_0225.field0019 AS dtlAmount,
+        formson_0225.field0036 AS dtlRevAccount,
+        formson_0225.field0035 AS dtlCnapsCode,
+        formson_0225.field0037 AS dtlRevName,
+        formson_0225.field0034 AS dtlRevBankName,
+        formson_0225.field0044 AS payResult,
+        formson_0225.field0045 AS payDate
+        FROM
+        formson_0225
+        )formson_0225
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null and id !='' "> formson_0225.id = #{id} </if>
+            <if test="formmainId != null and formmainId !='' "> and formson_0225.formmainId = #{formmainId} </if>
+            <if test="tabName != null and tabName !='' "> and formson_0225.tabName = #{tabName} </if>
+            <if test="dtlSeqNum != null and dtlSeqNum !='' "> and formson_0225.dtlSeqNum = #{dtlSeqNum} </if>
+            <if test="dtlAmount != null and dtlAmount !='' "> and formson_0225.dtlAmount = #{dtlAmount} </if>
+            <if test="dtlRevAccount != null and dtlRevAccount !='' "> and formson_0225.dtlRevAccount = #{dtlRevAccount} </if>
+            <if test="dtlCnapsCode != null and dtlCnapsCode !='' "> and formson_0225.dtlCnapsCode = #{dtlCnapsCode} </if>
+            <if test="dtlRevName != null and dtlRevName !='' "> and formson_0225.dtlRevName = #{dtlRevName} </if>
+            <if test="dtlRevBankName != null and dtlRevBankName !='' "> and formson_0225.dtlRevBankName = #{dtlRevBankName} </if>
+        </trim>
+    </select>
+
+    <update id="entity_update" parameterType="com.hzya.frame.seeyon.cbs8.entity.AgentPaymentDetailEntity">
+        update formson_0225 set
+        <trim suffix="" suffixOverrides=",">
+            <if test="payDate != null and payDate !='' ">field0045 =#{payDate},</if>
+            <if test="payResult != null and payResult !='' ">field0044 =#{payResult}</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <!-- 更新支付结果 -->
+    <update id="entity_update_result" parameterType="com.hzya.frame.seeyon.cbs8.entity.AgentPaymentDetailEntity">
+        update formson_0225 set
+        <trim suffix="" suffixOverrides=",">
+            <if test="payDate != null and payDate !='' ">field0045 =#{payDate},</if>
+            <if test="payResult != null and payResult !='' ">field0044 =#{payResult}</if>
+        </trim>
+        where field0001=#{dtlSeqNum} and field0019=#{dtlAmount} and field0035=#{dtlCnapsCode} and field0037=#{dtlRevName}
+    </update>
+</mapper>

fw-oa/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentEntity.java

@@ -0,0 +1,145 @@
+package com.hzya.frame.seeyon.cbs8.entity;
+
+import com.hzya.frame.web.entity.BaseEntity;
+
+/**
+ * @Description 代发代扣 主表
+ * @Author xiangerlin
+ * @Date 2024/6/18 14:44
+ **/
+public class AgentPaymentEntity extends BaseEntity {
+
+    //oa id
+    private String oaId;
+    private String finishedflag;
+    //流程标题
+    private String title;
+    //业务参考号
+    private String referenceNum;
+    /**
+     * 业务类型
+     * 201-代扣
+     * 203-代发
+     * 代发工资传203
+     */
+    private String busType;
+    //总金额 小数位2位
+    private String amount;
+    //币种
+    private String currency;
+    //付款账号
+    private String payAccount;
+    //用途
+    private String purpose;
+    //申请单号
+    private String applyCode;
+    //支付结果
+    private String payResult;
+
+    private String tableName;//表名称
+    private String billName;//单据名称
+
+    public String getReferenceNum() {
+        return referenceNum;
+    }
+
+    public void setReferenceNum(String referenceNum) {
+        this.referenceNum = referenceNum;
+    }
+
+    public String getBusType() {
+        return busType;
+    }
+
+    public void setBusType(String busType) {
+        this.busType = busType;
+    }
+
+    public String getAmount() {
+        return amount;
+    }
+
+    public void setAmount(String amount) {
+        this.amount = amount;
+    }
+
+    public String getCurrency() {
+        return currency;
+    }
+
+    public void setCurrency(String currency) {
+        this.currency = currency;
+    }
+
+    public String getPayAccount() {
+        return payAccount;
+    }
+
+    public void setPayAccount(String payAccount) {
+        this.payAccount = payAccount;
+    }
+
+    public String getPurpose() {
+        return purpose;
+    }
+
+    public void setPurpose(String purpose) {
+        this.purpose = purpose;
+    }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName;
+    }
+
+    public String getBillName() {
+        return billName;
+    }
+
+    public void setBillName(String billName) {
+        this.billName = billName;
+    }
+
+    public String getOaId() {
+        return oaId;
+    }
+
+    public void setOaId(String oaId) {
+        this.oaId = oaId;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getFinishedflag() {
+        return finishedflag;
+    }
+
+    public void setFinishedflag(String finishedflag) {
+        this.finishedflag = finishedflag;
+    }
+
+    public String getApplyCode() {
+        return applyCode;
+    }
+
+    public void setApplyCode(String applyCode) {
+        this.applyCode = applyCode;
+    }
+
+    public String getPayResult() {
+        return payResult;
+    }
+
+    public void setPayResult(String payResult) {
+        this.payResult = payResult;
+    }
+}

fw-oa/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentEntity.xml

@@ -0,0 +1,126 @@
+<?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">
+        <result property="oaId" column="oaId" />
+        <result property="title" column="title" />
+        <result property="finishedflag" column="finishedflag" />
+        <result property="referenceNum" column="referenceNum" />
+        <result property="busType" column="busType" />
+        <result property="amount" column="amount" />
+        <result property="currency" column="currency" />
+        <result property="payAccount" column="payAccount" />
+        <result property="purpose" column="purpose" />
+        <result property="tableName" column="tableName" />
+        <result property="billName" column="billName" />
+        <result property="applyCode" column="applyCode" />
+        <result property="payResult" column="payResult" />
+    </resultMap>
+
+    <sql id="AgentPaymentEntity_Base_Column_List">
+        oaId,
+        tableName,
+        finishedflag,
+        title,
+        billName,
+        referenceNum,
+        busType,
+        amount,
+        currency,
+        payAccount,
+        applyCode,
+        payResult,
+        purpose
+    </sql>
+
+
+    <!-- 采用==查询 -->
+    <select id="entity_list_base" resultMap="get-AgentPaymentEntity-result" parameterType="com.hzya.frame.seeyon.cbs8.entity.AgentPaymentEntity">
+        select
+        <include refid="AgentPaymentEntity_Base_Column_List"/>
+       from (
+        SELECT
+        formmain_0224.id AS oaId,
+        'formmain_0224' as tableName,
+        formmain_0224.finishedflag,
+        COL_SUMMARY.SUBJECT AS title,
+        '工资表' AS billName,
+        formmain_0224.field0002 AS referenceNum,
+        '203' AS busType,
+        formmain_0224.field0020 AS amount,
+        '10' AS currency,
+        '755915707610112' AS payAccount,
+        formmain_0224.field0043 AS applyCode,
+        formmain_0224.field0046 AS payResult,
+        '工资' AS purpose
+        FROM
+        formmain_0224
+        LEFT JOIN COL_SUMMARY ON COL_SUMMARY.FORM_RECORDID = formmain_0224.id
+        )formmain_0224
+        <trim prefix="where" prefixOverrides="and">
+            <if test="referenceNum != null and referenceNum !='' "> formmain_0224.referenceNum = #{referenceNum} </if>
+            <if test="busType != null and busType !='' "> and formmain_0224.busType = #{busType} </if>
+            <if test="amount != null and amount !='' ">and formmain_0224.amount = #{amount}  </if>
+            <if test="currency != null and currency !='' "> and formmain_0224.currency = #{currency}  </if>
+            <if test="payAccount != null and payAccount !='' ">and formmain_0224.payAccount = #{payAccount} </if>
+            <if test="applyCode != null and applyCode !='' ">and formmain_0224.applyCode = #{applyCode} </if>
+            <if test="payResult != null and payResult !='' ">and formmain_0224.payResult = #{payResult} </if>
+            <if test="purpose != null and purpose !='' "> and formmain_0224.purpose = #{purpose}  </if>
+            <if test="tableName != null and tableName !='' "> and formmain_0224.tableName = #{tableName}  </if>
+            <if test="oaId != null and oaId !='' ">and formmain_0224.oaId = #{oaId} </if>
+            <if test="title != null and title !='' "> and  formmain_0224.title = #{title}  </if>
+            <if test="billName != null and billName !='' "> and formmain_0224.billName = #{billName} </if>
+            <if test="finishedflag != null and finishedflag !='' "> and formmain_0224.finishedflag = #{finishedflag}  </if>
+        </trim>
+    </select>
+
+    <select id="entity_list_base_unpaid" resultMap="get-AgentPaymentEntity-result" parameterType="com.hzya.frame.seeyon.cbs8.entity.AgentPaymentEntity">
+        select
+        <include refid="AgentPaymentEntity_Base_Column_List"/>
+        from (
+        SELECT
+        formmain_0224.id AS oaId,
+        'formmain_0224' as tableName,
+        formmain_0224.finishedflag,
+        COL_SUMMARY.SUBJECT AS title,
+        '工资表' AS billName,
+        formmain_0224.field0002 AS referenceNum,
+        '203' AS busType,
+        formmain_0224.field0020 AS amount,
+        '10' AS currency,
+        '755915707610112' AS payAccount,
+        formmain_0224.field0043 AS applyCode,
+        formmain_0224.field0046 AS payResult,
+        '工资' AS purpose
+        FROM
+        formmain_0224
+        LEFT JOIN COL_SUMMARY ON COL_SUMMARY.FORM_RECORDID = formmain_0224.id
+        )formmain_0224
+        <trim prefix="where" prefixOverrides="and">
+            <if test="referenceNum != null and referenceNum !='' "> formmain_0224.referenceNum = #{referenceNum} </if>
+            <if test="busType != null and busType !='' "> and formmain_0224.busType = #{busType} </if>
+            <if test="amount != null and amount !='' ">and formmain_0224.amount = #{amount}  </if>
+            <if test="currency != null and currency !='' "> and formmain_0224.currency = #{currency}  </if>
+            <if test="payAccount != null and payAccount !='' ">and formmain_0224.payAccount = #{payAccount} </if>
+            <if test="applyCode != null and applyCode !='' ">and formmain_0224.applyCode = #{applyCode} </if>
+            <if test="purpose != null and purpose !='' "> and formmain_0224.purpose = #{purpose}  </if>
+            <if test="tableName != null and tableName !='' "> and formmain_0224.tableName = #{tableName}  </if>
+            <if test="oaId != null and oaId !='' ">and formmain_0224.oaId = #{oaId} </if>
+            <if test="title != null and title !='' "> and  formmain_0224.title = #{title}  </if>
+            <if test="billName != null and billName !='' "> and formmain_0224.billName = #{billName} </if>
+            <if test="finishedflag != null and finishedflag !='' "> and formmain_0224.finishedflag = #{finishedflag}  </if>
+        </trim>
+        and formmain_0224.applyCode is null
+        and formmain_0224.payResult is null
+    </select>
+
+
+    <update id="entity_update" parameterType="com.hzya.frame.seeyon.cbs8.entity.AgentPaymentEntity">
+        update formmain_0224 set
+        <trim suffix="" suffixOverrides=",">
+            <if test="applyCode != null and applyCode !='' ">field0043 =#{applyCode},</if>
+            <if test="payResult != null and payResult !='' ">field0046 =#{payResult}</if>
+        </trim>
+        where id = #{oaId}
+    </update>
+</mapper>

fw-oa/src/main/java/com/hzya/frame/seeyon/cbs8/entity/CbsLogEntity.java

@@ -0,0 +1,151 @@
+package com.hzya.frame.seeyon.cbs8.entity;
+
+import com.hzya.frame.web.entity.BaseEntity;
+
+/**
+ * @Description cbs支付日志
+ * @Author xiangerlin
+ * @Date 2024/6/14 17:16
+ **/
+public class CbsLogEntity extends BaseEntity {
+    //流程标题
+    private String title;
+    //请款主体
+    private String pay_company;
+    //收款人
+    private String payee;
+    //金额
+    private String amount;
+    //cbs申请单号
+    private String cbs_apply_code;
+    //日志表id
+    private String id;
+    //oa单据id
+    private String oa_id;
+    //oa单据号
+    private String bill_code;
+    //英文表名
+    private String tab_name_en;
+    //中文表名
+    private String tab_name_ch;
+    //支付状态
+    private String pay_state;
+    //支付信息
+    private String message;
+    //支付申请状态
+    private String apply_state;
+    //成功标记
+    private String successed;
+
+    public String getOa_id() {
+        return oa_id;
+    }
+
+    public void setOa_id(String oa_id) {
+        this.oa_id = oa_id;
+    }
+
+    public String getBill_code() {
+        return bill_code;
+    }
+
+    public void setBill_code(String bill_code) {
+        this.bill_code = bill_code;
+    }
+
+    public String getTab_name_en() {
+        return tab_name_en;
+    }
+
+    public void setTab_name_en(String tab_name_en) {
+        this.tab_name_en = tab_name_en;
+    }
+
+    public String getTab_name_ch() {
+        return tab_name_ch;
+    }
+
+    public void setTab_name_ch(String tab_name_ch) {
+        this.tab_name_ch = tab_name_ch;
+    }
+
+    public String getPay_state() {
+        return pay_state;
+    }
+
+    public void setPay_state(String pay_state) {
+        this.pay_state = pay_state;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public String getApply_state() {
+        return apply_state;
+    }
+
+    public void setApply_state(String apply_state) {
+        this.apply_state = apply_state;
+    }
+
+    public String getSuccessed() {
+        return successed;
+    }
+
+    public void setSuccessed(String successed) {
+        this.successed = successed;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getPay_company() {
+        return pay_company;
+    }
+
+    public void setPay_company(String pay_company) {
+        this.pay_company = pay_company;
+    }
+
+    public String getPayee() {
+        return payee;
+    }
+
+    public void setPayee(String payee) {
+        this.payee = payee;
+    }
+
+    public String getAmount() {
+        return amount;
+    }
+
+    public void setAmount(String amount) {
+        this.amount = amount;
+    }
+
+    public String getCbs_apply_code() {
+        return cbs_apply_code;
+    }
+
+    public void setCbs_apply_code(String cbs_apply_code) {
+        this.cbs_apply_code = cbs_apply_code;
+    }
+}

fw-oa/src/main/java/com/hzya/frame/seeyon/cbs8/entity/CbsLogEntity.xml

@@ -0,0 +1,116 @@
+<?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">
+        <result property="id" column="id" />
+        <result property="oa_id" column="oa_id" />
+        <result property="bill_code" column="bill_code" />
+        <result property="tab_name_en" column="tab_name_en" />
+        <result property="tab_name_ch" column="tab_name_ch" />
+        <result property="pay_state" column="pay_state" />
+        <result property="message" column="message" />
+        <result property="apply_state" column="apply_state" />
+        <result property="successed" column="successed" />
+        <result property="title" column="title" />
+        <result property="pay_company" column="pay_company" />
+        <result property="payee" column="payee" />
+        <result property="amount" column="amount" />
+        <result property="cbs_apply_code" column="cbs_apply_code" />
+    </resultMap>
+
+    <sql id="CbsLogEntity_Base_Column_List">
+        id,
+        field0002 as title,
+        field0003 as pay_company,
+        field0004 as payee,
+        field0005 as cbs_apply_code,
+        field0006 as bill_code,
+        field0007 as oa_id,
+        field0008 as tab_name_ch,
+        field0009 as tab_name_en,
+        field0010 as pay_state,
+        field0011 as message,
+        field0012 as apply_state,
+        field0014 as successed
+    </sql>
+
+    <!-- 查询推送失败，用户手动发起请求 采用==查询 -->
+    <select id="entity_list_base" resultMap="get-CbsLogEntity-result" parameterType="com.hzya.frame.seeyon.cbs8.entity.CbsLogEntity">
+        select
+        <include refid="CbsLogEntity_Base_Column_List"/>
+        from
+        formmain_0232
+        <trim prefix="where" prefixOverrides="and">
+            <if test="title != null and title !='' "> field0002 = #{title} </if>
+            <if test="pay_company != null and pay_company !='' "> and field0003 = #{pay_company} </if>
+            <if test="payee != null and payee !='' "> and field0004 = #{payee} </if>
+            <if test="cbs_apply_code != null and cbs_apply_code !='' "> and field0005 = #{cbs_apply_code} </if>
+            <if test="bill_code != null and bill_code !='' "> and field0006 = #{bill_code} </if>
+            <if test="oa_id != null and oa_id !='' "> and field0007 = #{oa_id} </if>
+            <if test="tab_name_ch != null and tab_name_ch !='' "> and field0008 = #{tab_name_ch} </if>
+            <if test="tab_name_en != null and tab_name_en !='' "> and field0009 = #{tab_name_en} </if>
+            <if test="pay_state != null and pay_state !='' "> and field0010 = #{pay_state} </if>
+            <if test="message != null and message !='' "> and field0011 = #{message} </if>
+            <if test="apply_state != null and apply_state !='' "> and field0012 = #{apply_state} </if>
+            <if test="successed != null and successed !='' "> and field0014 = #{successed} </if>
+        </trim>
+    </select>
+
+    <select id="entity_list_like" resultMap="get-CbsLogEntity-result" parameterType="com.hzya.frame.seeyon.cbs8.entity.CbsLogEntity">
+        select
+        <include refid="CbsLogEntity_Base_Column_List"/>
+        from
+        formmain_0232
+        <trim prefix="where" prefixOverrides="and">
+            <if test="title != null and title !='' "> field0002 = #{title} </if>
+            <if test="id != null and id !='' "> and id = #{id} </if>
+            <if test="pay_company != null and pay_company !='' "> and field0003 like '${pay_company}%' </if>
+            <if test="payee != null and payee !='' "> and field0004 like '${payee}%' </if>
+            <if test="cbs_apply_code != null and cbs_apply_code !='' "> and field0005 like '${cbs_apply_code}%' </if>
+            <if test="bill_code != null and bill_code !='' "> and field0006 like '${bill_code}%' </if>
+            <if test="oa_id != null and oa_id !='' "> and field0007 = #{oa_id} </if>
+            <if test="tab_name_ch != null and tab_name_ch !='' "> and field0008 like '${tab_name_ch}%' </if>
+            <if test="tab_name_en != null and tab_name_en !='' "> and field0009 like '${tab_name_en}%' </if>
+            <if test="pay_state != null and pay_state !='' "> and field0010 like '${pay_state}%' </if>
+            <if test="message != null and message !='' "> and field0011 like '${message}%' </if>
+            <if test="apply_state != null and apply_state !='' "> and field0012 like '${apply_state}%' </if>
+            <if test="successed != null and successed !='' "> and field0014 like '${successed}%' </if>
+        </trim>
+    </select>
+
+    <select id="CbsLogEntity_list_base_in_payment" resultMap="get-CbsLogEntity-result" parameterType="com.hzya.frame.seeyon.cbs8.entity.CbsLogEntity">
+        select
+        <include refid="CbsLogEntity_Base_Column_List"/>
+        from
+        formmain_0232
+        <trim prefix="where" prefixOverrides="and">
+            <if test="oa_id != null and oa_id !='' "> field0007 = #{oa_id} </if>
+            <if test="id != null and id !='' "> and id = #{id} </if>
+            <if test="bill_code != null and bill_code !='' "> and field0006 = #{bill_code} </if>
+            <if test="tab_name_en != null and tab_name_en !='' "> and field0008 = #{tab_name_en} </if>
+            <if test="tab_name_ch != null and tab_name_ch !='' "> and field0009 = #{tab_name_ch} </if>
+            <if test="pay_state != null and pay_state !='' "> and field0010 = #{pay_state} </if>
+            <if test="message != null and message !='' "> and field0011 = #{message} </if>
+            <if test="apply_state != null and apply_state !='' "> and field0012 = #{apply_state} </if>
+            <if test="successed != null and successed !='' "> and field0014 = #{successed} </if>
+            and (field0010='支付中'
+            or field0010 not in ('审批撤销','审批拒绝','处理失败','退票','支付成功','取消支付','修改支付','支付失败','推送失败'))
+        </trim>
+    </select>
+
+
+    <!--修改视图支付状态-->
+    <update id="entity_update" parameterType="com.hzya.frame.seeyon.cbs8.entity.CbsLogEntity">
+        update formmain_0232 set
+        <trim suffix="" suffixOverrides=",">
+            <if test="pay_state != null and pay_state !='' ">field0010 =#{pay_state},</if>
+            field0011 =#{message},
+            <if test="apply_state != null and apply_state !='' ">field0012 =#{apply_state},</if>
+            <if test="successed != null and successed !='' ">field0014 =#{successed}</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+
+
+</mapper>

fw-oa/src/main/java/com/hzya/frame/seeyon/cbs8/entity/PaymentEntity.java

@@ -0,0 +1,327 @@
+package com.hzya.frame.seeyon.cbs8.entity;
+
+import com.hzya.frame.web.entity.BaseEntity;
+
+/**
+ * @Description
+ * @Author xiangerlin
+ * @Date 2024/6/6 16:17
+ **/
+public class PaymentEntity extends BaseEntity {
+
+    private String oaId;//主表id
+    private String formsonId;//明细表id
+    private String payCompany;//付款公司
+    private String title;//流程标题
+    private String tableName;//表名称
+    private String billName;//单据名称
+    private String referenceNum;//业务参考号 唯一id
+    private String referenceNumNew;//重试的时候生成新的业务参考号
+    private String busType;//业务类型
+    private String payResultField;//支付结果字段
+    private String payDateField;//打款日期字段
+    private String applyCodeField;//支付申请单号字段
+    private String receiptFiled;//电子回单字段
+    private String summaryId;//summaryid
+    private String startDate;//单据日期
+    private String finishedflag;//流程状态
+    private String payDate;//打款日期
+    private String payResult;//支付结果
+    private String applyCode;//支付申请单号
+    private String payAccount;//付款账号
+    private String payBankName;//付款开户银行
+    private String amount;//金额
+    private String purpose;//支付用途
+    private String revAccount;//收款账号
+    private String revBankName;//收款开户行名称
+    private String revBankType;//收款银行类型
+    private String revAccountName;//收款账户名称
+    private String cnapsCode;//联行号
+    private String receipt;//电子回单
+    private String currency;//币种 数字
+    private String currencyName;//币种 中文
+    private String currencyCode;//币种编码
+    private String personalFlag;//公私标记
+    private String payType;//付款类别
+    private String payCompanyCode;//付款公司编码
+
+    public String getOaId() {
+        return oaId;
+    }
+
+    public void setOaId(String oaId) {
+        this.oaId = oaId;
+    }
+
+    public String getPayCompany() {
+        return payCompany;
+    }
+
+    public void setPayCompany(String payCompany) {
+        this.payCompany = payCompany;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName;
+    }
+
+    public String getBillName() {
+        return billName;
+    }
+
+    public void setBillName(String billName) {
+        this.billName = billName;
+    }
+
+    public String getReferenceNum() {
+        return referenceNum;
+    }
+
+    public void setReferenceNum(String referenceNum) {
+        this.referenceNum = referenceNum;
+    }
+
+    public String getReferenceNumNew() {
+        return referenceNumNew;
+    }
+
+    public void setReferenceNumNew(String referenceNumNew) {
+        this.referenceNumNew = referenceNumNew;
+    }
+
+    public String getBusType() {
+        return busType;
+    }
+
+    public void setBusType(String busType) {
+        this.busType = busType;
+    }
+
+    public String getPayResultField() {
+        return payResultField;
+    }
+
+    public void setPayResultField(String payResultField) {
+        this.payResultField = payResultField;
+    }
+
+    public String getPayDateField() {
+        return payDateField;
+    }
+
+    public void setPayDateField(String payDateField) {
+        this.payDateField = payDateField;
+    }
+
+    public String getReceiptFiled() {
+        return receiptFiled;
+    }
+
+    public void setReceiptFiled(String receiptFiled) {
+        this.receiptFiled = receiptFiled;
+    }
+
+    public String getSummaryId() {
+        return summaryId;
+    }
+
+    public void setSummaryId(String summaryId) {
+        this.summaryId = summaryId;
+    }
+
+    public String getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(String startDate) {
+        this.startDate = startDate;
+    }
+
+    public String getFinishedflag() {
+        return finishedflag;
+    }
+
+    public void setFinishedflag(String finishedflag) {
+        this.finishedflag = finishedflag;
+    }
+
+    public String getPayDate() {
+        return payDate;
+    }
+
+    public void setPayDate(String payDate) {
+        this.payDate = payDate;
+    }
+
+    public String getPayResult() {
+        return payResult;
+    }
+
+    public void setPayResult(String payResult) {
+        this.payResult = payResult;
+    }
+
+    public String getPayAccount() {
+        return payAccount;
+    }
+
+    public void setPayAccount(String payAccount) {
+        this.payAccount = payAccount;
+    }
+
+    public String getPayBankName() {
+        return payBankName;
+    }
+
+    public void setPayBankName(String payBankName) {
+        this.payBankName = payBankName;
+    }
+
+    public String getAmount() {
+        return amount;
+    }
+
+    public void setAmount(String amount) {
+        this.amount = amount;
+    }
+
+    public String getPurpose() {
+        return purpose;
+    }
+
+    public void setPurpose(String purpose) {
+        this.purpose = purpose;
+    }
+
+    public String getRevAccount() {
+        return revAccount;
+    }
+
+    public void setRevAccount(String revAccount) {
+        this.revAccount = revAccount;
+    }
+
+    public String getRevBankName() {
+        return revBankName;
+    }
+
+    public void setRevBankName(String revBankName) {
+        this.revBankName = revBankName;
+    }
+
+    public String getRevBankType() {
+        return revBankType;
+    }
+
+    public void setRevBankType(String revBankType) {
+        this.revBankType = revBankType;
+    }
+
+    public String getRevAccountName() {
+        return revAccountName;
+    }
+
+    public void setRevAccountName(String revAccountName) {
+        this.revAccountName = revAccountName;
+    }
+
+    public String getCnapsCode() {
+        return cnapsCode;
+    }
+
+    public void setCnapsCode(String cnapsCode) {
+        this.cnapsCode = cnapsCode;
+    }
+
+    public String getReceipt() {
+        return receipt;
+    }
+
+    public void setReceipt(String receipt) {
+        this.receipt = receipt;
+    }
+
+    public String getCurrency() {
+        return currency;
+    }
+
+    public void setCurrency(String currency) {
+        this.currency = currency;
+    }
+
+    public String getCurrencyName() {
+        return currencyName;
+    }
+
+    public void setCurrencyName(String currencyName) {
+        this.currencyName = currencyName;
+    }
+
+    public String getCurrencyCode() {
+        return currencyCode;
+    }
+
+    public void setCurrencyCode(String currencyCode) {
+        this.currencyCode = currencyCode;
+    }
+
+    public String getPersonalFlag() {
+        return personalFlag;
+    }
+
+    public void setPersonalFlag(String personalFlag) {
+        this.personalFlag = personalFlag;
+    }
+
+    public String getPayType() {
+        return payType;
+    }
+
+    public void setPayType(String payType) {
+        this.payType = payType;
+    }
+
+    public String getPayCompanyCode() {
+        return payCompanyCode;
+    }
+
+    public void setPayCompanyCode(String payCompanyCode) {
+        this.payCompanyCode = payCompanyCode;
+    }
+
+    public String getFormsonId() {
+        return formsonId;
+    }
+
+    public void setFormsonId(String formsonId) {
+        this.formsonId = formsonId;
+    }
+
+    public String getApplyCodeField() {
+        return applyCodeField;
+    }
+
+    public void setApplyCodeField(String applyCodeField) {
+        this.applyCodeField = applyCodeField;
+    }
+
+    public String getApplyCode() {
+        return applyCode;
+    }
+
+    public void setApplyCode(String applyCode) {
+        this.applyCode = applyCode;
+    }
+}

fw-oa/src/main/java/com/hzya/frame/seeyon/cbs8/entity/PaymentEntity.xml

@@ -0,0 +1,339 @@
+<?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">
+        <result property="referenceNum" column="referenceNum" />
+        <result property="busType" column="busType" />
+        <result property="title" column="title" />
+        <result property="amount" column="amount" />
+        <result property="currency" column="currency" />
+        <result property="payAccount" column="payAccount" jdbcType="VARCHAR" />
+        <result property="revAccount" column="revAccount" />
+        <result property="revAccountName" column="revAccountName" />
+        <result property="revBankType" column="revBankType" />
+        <result property="revBankName" column="revBankName" />
+        <result property="cnapsCode" column="cnapsCode" />
+        <result property="purpose" column="purpose" />
+        <result property="personalFlag" column="personalFlag" />
+        <result property="tableName" column="tableName" />
+        <result property="oaId" column="oaId" />
+        <result property="formsonId" column="formsonId" />
+        <result property="payCompany" column="payCompany" />
+        <result property="billName" column="billName" />
+        <result property="payResultField" column="payResultField" />
+        <result property="payDateField" column="payDateField" />
+        <result property="applyCodeField" column="applyCodeField" />
+        <result property="applyCode" column="applyCode" />
+        <result property="receiptFiled" column="receiptFiled" />
+        <result property="summaryId" column="summaryId" />
+        <result property="startDate" column="startDate" />
+        <result property="finishedflag" column="finishedflag" />
+        <result property="payDate" column="payDate" />
+        <result property="payResult" column="payResult" />
+        <result property="payBankName" column="payBankName" />
+        <result property="receipt" column="receipt" />
+        <result property="payType" column="payType" />
+        <result property="payCompanyCode" column="payCompanyCode" />
+    </resultMap>
+
+    <sql id="PaymentEntity_Base_Column_List">
+     oaId,
+    formsonId,
+     payCompany,
+     payCompanyCode,
+     title,
+     tableName,
+     billName,
+     referenceNum,
+     busType,
+     payResultField,
+     payDateField,
+     applyCodeField,
+     receiptFiled,
+     summaryId,
+     startDate,
+     finishedflag,
+     payDate,
+     payResult,
+     applyCode,
+     payAccount,
+     payBankName,
+     amount,
+     purpose,
+     revAccount,
+     revBankName,
+     revBankType,
+     revAccountName,
+     cnapsCode,
+     receipt,
+     currency,
+     personalFlag,
+     payType
+    </sql>
+
+    <!-- 基础查询语句  -->
+    <sql id="base_sql">
+        SELECT
+            formmain_0209.id as oaId, -- 主表id
+            formson_0210.formsonId,
+            'formson_0210' as tableName, -- 表名
+            COL_SUMMARY.SUBJECT as title, -- 单据标题
+            unit.name as payCompany, -- 付款公司
+            '差旅费报销单' as billName,
+            'field0072' as payResultField, -- 支付结果字段
+            'field0073' as payDateField, -- 打款日期字段
+            'field0080' AS applyCodeField,-- CBS支付申请单号
+            '' as receiptFiled,-- 电子回单字段
+            COL_SUMMARY.id as summaryId,
+            formmain_0209.field0017||'-'||formson_0210.sort as referenceNum, -- 单据编号
+            formmain_0209.START_DATE as startDate, -- 单据日期
+            formmain_0209.FINISHEDFLAG as finishedflag, -- 流程状态
+            formson_0210.field0073 as payDate, -- 打款日期
+            formson_0210.field0072 as payResult, -- 支付结果
+            formson_0210.field0080 AS applyCode,-- 支付申请单号
+            REGEXP_REPLACE(formmain_0209.field0042, '[[:space:]]', '') as payAccount, -- 付款账户
+            REGEXP_REPLACE(formmain_0209.field0041, '[[:space:]]', '') as payBankName, -- 付款开户行
+            formson_0210.field0031 as amount, -- 金额
+            formmain_0209.field0038 as purpose,  -- 用途
+            formmain_0209.field0038 as cbsAbstract, -- 摘要
+            REGEXP_REPLACE(formson_0210.field0069, '[[:space:]]', '') as revAccount, -- 收款账户
+            formson_0210.field0068 as revBankName, -- 收款开户行
+            formson_0210.field0075 as revAccountName, -- 收款人
+            REGEXP_REPLACE(formson_0210.field0071, '[[:space:]]', '') as cnapsCode, -- 收款联行号
+            item.ENUMVALUE  as personalFlag,-- 公私标记
+            formson_0210.field0079 as revBankType,
+            '10' as currency,
+            '202' as busType,
+            '' as receipt -- 电子回单
+        FROM
+            (
+                SELECT
+                    WM_CONCAT(id) AS formsonId,
+                    formmain_id,
+                    SUM(field0031) AS field0031,
+                    MIN(sort) AS sort,
+                    field0068,
+                    field0069,
+                    field0071,
+                    field0079,
+                    field0075,
+                    field0070,
+                    field0072,
+                    field0073,
+                    field0080
+                FROM
+                    formson_0210
+                WHERE
+                    field0067 = '-5486592002512828355'
+                GROUP BY
+                    formmain_id,
+                    field0068,
+                    field0069,
+                    field0071,
+                    field0079,
+                    field0075,
+                    field0070,
+                    field0072,
+                    field0073,
+                    field0080
+            )formson_0210
+                LEFT JOIN formmain_0209 ON formson_0210.FORMMAIN_ID = formmain_0209.id
+                LEFT JOIN COL_SUMMARY ON COL_SUMMARY.FORM_RECORDID = formmain_0209.id
+                left join CTP_ENUM_ITEM item on item.id =formson_0210.field0070
+                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 v.* from (
+        <include refid="base_sql"/>
+        ) v
+        <trim prefix="where" prefixOverrides="and">
+            <if test="referenceNum != null and referenceNum !='' "> v.referenceNum = #{referenceNum} </if>
+            <if test="busType != null and busType !='' "> and v.busType = #{busType} </if>
+            <if test="amount != null and amount !='' ">and v.amount = #{amount}  </if>
+            <if test="currency != null and currency !='' "> and v.currency = #{currency}  </if>
+            <if test="payAccount != null and payAccount !='' ">and v.payAccount = #{payAccount} </if>
+            <if test="revAccount != null and revAccount !='' "> and v.revAccount = #{revAccount}  </if>
+            <if test="revAccountName != null and revAccountName !='' "> and  v.revAccountName = #{revAccountName}  </if>
+            <if test="revBankType != null and revBankType !='' "> and v.revBankType = #{revBankType} </if>
+            <if test="revBankName != null and revBankName !='' ">and v.revBankName = #{revBankName}  </if>
+            <if test="cnapsCode != null and cnapsCode !='' ">and v.cnapsCode = #{cnapsCode}  </if>
+            <if test="purpose != null and purpose !='' "> and v.purpose = #{purpose}  </if>
+            <if test="personalFlag != null and personalFlag !='' ">and v.personalFlag = #{personalFlag}  </if>
+            <if test="tableName != null and tableName !='' "> and v.tableName = #{tableName}  </if>
+            <if test="oaId != null and oaId !='' ">and v.oaId = #{oaId} </if>
+            <if test="payCompany != null and payCompany !='' "> and v.payCompany = #{payCompany}  </if>
+            <if test="payCompanyCode != null and payCompanyCode !='' "> and v.payCompanyCode = #{payCompanyCode}  </if>
+            <if test="title != null and title !='' "> and  v.title = #{title}  </if>
+            <if test="billName != null and billName !='' "> and v.billName = #{billName} </if>
+            <if test="payResult != null and payResult !='' ">and v.payResult = #{payResult}  </if>
+            <if test="applyCode != null and applyCode !='' ">and v.applyCode = #{applyCode}  </if>
+            <if test="payBankName != null and payBankName !='' ">and v.payBankName = #{payBankName}  </if>
+            <if test="payType != null and payType !='' "> and v.payType = #{payType}  </if>
+            <if test="finishedflag != null and finishedflag !='' "> and v.finishedflag = #{finishedflag}  </if>
+
+        </trim>
+    </select>
+
+    <!-- 查询交易成功，且电子回单为空的，上传电子回单用 -->
+    <select id="PaymentEntity_list_base_elec_isnull" resultMap="get-PaymentEntity-result" parameterType="com.hzya.frame.seeyon.cbs8.entity.PaymentEntity">
+       <!-- select
+        <include refid="PaymentEntity_Base_Column_List"/>
+        from
+        v_hzya_oa_cbs_all-->
+        -- 差旅费报销单
+        SELECT
+        formson_0210.id as oaId, -- 主表id
+        'formson_0210' as tableName, -- 表名
+        COL_SUMMARY.SUBJECT as title, -- 单据标题
+        unit.name as payCompany, -- 付款公司
+        '差旅费报销单' as billName,
+        'field0072' as payResultField, -- 支付结果字段
+        'field0073' as payDateField, -- 打款日期字段
+        '' as receiptFiled,-- 电子回单字段
+        COL_SUMMARY.id as summaryId,
+        formmain_0209.field0017||'-'||formson_0210.sort as referenceNum, -- 单据编号
+        formmain_0209.START_DATE as startDate, -- 单据日期
+        formmain_0209.FINISHEDFLAG as finishedflag, -- 流程状态
+        formson_0210.field0073 as payDate, -- 打款日期
+        formson_0210.field0072 as payResult, -- 支付结果
+        REGEXP_REPLACE(formmain_0209.field0042, '[[:space:]]', '') as payAccount, -- 付款账户
+        REGEXP_REPLACE(formmain_0209.field0041, '[[:space:]]', '') as payBankName, -- 付款开户行
+        formson_0210.field0031 as amount, -- 金额
+        formmain_0209.field0038 as purpose,  -- 用途
+        formmain_0209.field0038 as cbsAbstract, -- 摘要
+        REGEXP_REPLACE(formson_0210.field0069, '[[:space:]]', '') as revAccount, -- 收款账户
+        formson_0210.field0068 as revBankName, -- 收款开户行
+        '' as revAccountName, -- 收款人
+        REGEXP_REPLACE(formson_0210.field0071, '[[:space:]]', '') as cnapsCode, -- 收款联行号
+        item.showvalue as personalFlag,-- 公私标记
+        '' as revBankType,-- 收款银行类型
+        '10' as currency,-- 币种
+        '' as busType,-- 业务类型
+        '' as receipt -- 电子回单
+        from
+        formson_0210
+        LEFT JOIN formmain_0209 ON formson_0210.FORMMAIN_ID = formmain_0209.id
+        LEFT JOIN COL_SUMMARY ON COL_SUMMARY.FORM_RECORDID = formmain_0209.id
+        LEFT JOIN CTP_AFFAIR ON CTP_AFFAIR.object_id = COL_SUMMARY.id
+        left join CTP_ENUM_ITEM item on item.id =formson_0210.field0070
+        left join ORG_UNIT unit on unit.id =formmain_0209.field0002
+        -- left join V_USER_VIEW_ALL us on us.staffid=formmain_0209.field0024
+        WHERE 1=1
+        -- and formson_0210.field0031>0
+        and CTP_AFFAIR.node_name = '发起者' and CTP_AFFAIR.COMPLETE_TIME is null and CTP_AFFAIR.STATE = 3
+        <trim prefix="where" prefixOverrides="and">
+            <if test="referenceNum != null and referenceNum !='' "> referenceNum = #{referenceNum} </if>
+            <if test="busType != null and busType !='' "> and busType = #{busType} </if>
+            <if test="amount != null and amount !='' ">and amount = #{amount}  </if>
+            <if test="currency != null and currency !='' "> and currency = #{currency}  </if>
+            <if test="payAccount != null and payAccount !='' ">and payAccount = #{payAccount} </if>
+            <if test="revAccount != null and revAccount !='' "> and revAccount = #{revAccount}  </if>
+            <if test="revAccountName != null and revAccountName !='' "> and  revAccountName = #{revAccountName}  </if>
+            <if test="revBankType != null and revBankType !='' "> and revBankType = #{revBankType} </if>
+            <if test="revBankName != null and revBankName !='' ">and revBankName = #{revBankName}  </if>
+            <if test="cnapsCode != null and cnapsCode !='' ">and cnapsCode = #{cnapsCode}  </if>
+            <if test="purpose != null and purpose !='' "> and purpose = #{purpose}  </if>
+            <if test="personalFlag != null and personalFlag !='' ">and personalFlag = #{personalFlag}  </if>
+            <if test="tableName != null and tableName !='' "> and tableName = #{tableName}  </if>
+            <if test="oaId != null and oaId !='' ">and oaId = #{oaId} </if>
+            <if test="payCompany != null and payCompany !='' "> and payCompany = #{payCompany}  </if>
+            <if test="payCompanyCode != null and payCompanyCode !='' "> and payCompanyCode = #{payCompanyCode}  </if>
+            <if test="title != null and title !='' "> and  title = #{title}  </if>
+            <if test="billName != null and billName !='' "> and billName = #{billName} </if>
+            <if test="payBankName != null and payBankName !='' ">and payBankName = #{payBankName}  </if>
+            <if test="payType != null and payType !='' "> and payType = #{payType}  </if>
+            and receipt is null and personalFlag='0' and payResult = '支付成功'
+        </trim>
+    </select>
+    <!-- 查询待支付的 -->
+    <select id="PaymentEntity_list_base_unpaid" resultMap="get-PaymentEntity-result" parameterType="com.hzya.frame.seeyon.cbs8.entity.PaymentEntity">
+     select v.* from (
+        <include refid="base_sql"/>
+        ) v
+        <trim prefix="where" prefixOverrides="and">
+            <if test="referenceNum != null and referenceNum !='' "> v.referenceNum = #{referenceNum} </if>
+            <if test="busType != null and busType !='' "> and v.busType = #{busType} </if>
+            <if test="amount != null and amount !='' ">and v.amount = #{amount}  </if>
+            <if test="currency != null and currency !='' "> and v.currency = #{currency}  </if>
+            <if test="payAccount != null and payAccount !='' ">and v.payAccount = #{payAccount} </if>
+            <if test="revAccount != null and revAccount !='' "> and v.revAccount = #{revAccount}  </if>
+            <if test="revAccountName != null and revAccountName !='' "> and  v.revAccountName = #{revAccountName}  </if>
+            <if test="revBankType != null and revBankType !='' "> and v.revBankType = #{revBankType} </if>
+            <if test="revBankName != null and revBankName !='' ">and v.revBankName = #{revBankName}  </if>
+            <if test="cnapsCode != null and cnapsCode !='' ">and v.cnapsCode = #{cnapsCode}  </if>
+            <if test="purpose != null and purpose !='' "> and v.purpose = #{purpose}  </if>
+            <if test="personalFlag != null and personalFlag !='' ">and v.personalFlag = #{personalFlag}  </if>
+            <if test="tableName != null and tableName !='' "> and v.tableName = #{tableName}  </if>
+            <if test="oaId != null and oaId !='' ">and v.oaId = #{oaId} </if>
+            <if test="payCompany != null and payCompany !='' "> and v.payCompany = #{payCompany}  </if>
+            <if test="payCompanyCode != null and payCompanyCode !='' "> and v.payCompanyCode = #{payCompanyCode}  </if>
+            <if test="title != null and title !='' "> and  v.title = #{title}  </if>
+            <if test="billName != null and billName !='' "> and v.billName = #{billName} </if>
+            <if test="payResult != null and payResult !='' ">and v.payResult = #{payResult}  </if>
+            <if test="payBankName != null and payBankName !='' ">and v.payBankName = #{payBankName}  </if>
+            <if test="payType != null and payType !='' "> and v.payType = #{payType}  </if>
+            <if test="finishedflag != null and finishedflag !='' "> and v.finishedflag = #{finishedflag}  </if>
+            and v.amount > 0
+            and v.payResult is null
+        </trim>
+    </select>
+
+
+
+
+
+    <!-- 查询未完成的 采用==查询 -->
+    <select id="PaymentEntity_list_base_in_payment" resultMap="get-PaymentEntity-result" parameterType="com.hzya.frame.seeyon.cbs8.entity.PaymentEntity">
+        select
+        <include refid="PaymentEntity_Base_Column_List"/>
+        from
+        v_hzya_oa_cbs
+        <trim prefix="where" prefixOverrides="and">
+            <if test="referenceNum != null and referenceNum !='' "> referenceNum = #{referenceNum} </if>
+            <if test="busType != null and busType !='' "> and busType = #{busType} </if>
+            <if test="amount != null and amount !='' ">and amount = #{amount}  </if>
+            <if test="currency != null and currency !='' "> and currency = #{currency}  </if>
+            <if test="payAccount != null and payAccount !='' ">and payAccount = #{payAccount} </if>
+            <if test="revAccount != null and revAccount !='' "> and revAccount = #{revAccount}  </if>
+            <if test="revAccountName != null and revAccountName !='' "> and  revAccountName = #{revAccountName}  </if>
+            <if test="revBankType != null and revBankType !='' "> and revBankType = #{revBankType} </if>
+            <if test="revBankName != null and revBankName !='' ">and revBankName = #{revBankName}  </if>
+            <if test="cnapsCode != null and cnapsCode !='' ">and cnapsCode = #{cnapsCode}  </if>
+            <if test="purpose != null and purpose !='' "> and purpose = #{purpose}  </if>
+            <if test="personalFlag != null and personalFlag !='' ">and personalFlag = #{personalFlag}  </if>
+            <if test="tableName != null and tableName !='' "> and tableName = #{tableName}  </if>
+            <if test="oaId != null and oaId !='' ">and oaId = #{oaId} </if>
+            <if test="payCompany != null and payCompany !='' "> and payCompany = #{payCompany}  </if>
+            <if test="payCompanyCode != null and payCompanyCode !='' "> and payCompanyCode = #{payCompanyCode}  </if>
+            <if test="title != null and title !='' "> and  title = #{title}  </if>
+            <if test="billName != null and billName !='' "> and billName = #{billName} </if>
+            <if test="payResult != null and payResult !='' ">and payResult = #{payResult}  </if>
+            <if test="payBankName != null and payBankName !='' ">and payBankName = #{payBankName}  </if>
+            <if test="payType != null and payType !='' "> and payType = #{payType}  </if>
+            and (payResult='支付中'
+            or payResult not in ('审批撤销','审批拒绝','处理失败','退票','支付成功','取消支付','修改支付','支付失败'))
+            and personalFlag='0'
+        </trim>
+    </select>
+
+
+
+
+    <!--修改视图支付状态-->
+    <update id="PaymentEntity_update_payState" parameterType="com.hzya.frame.seeyon.cbs8.entity.PaymentEntity">
+        update ${tableName} set
+        <trim suffix="" suffixOverrides=",">
+            <if test="payDate != null and payDate !='' ">${payDateField} =#{payDate},</if>
+            <if test="payResult != null and payResult !='' ">${payResultField} =#{payResult},</if>
+            <if test="applyCodeField != null and applyCodeField !='' ">${applyCodeField} =#{applyCode}</if>
+        </trim>
+        where id = #{formsonId}
+    </update>
+
+    <!--修改电子回单-->
+    <update id="PaymentEntity_update_electronic" parameterType="com.hzya.frame.seeyon.cbs8.entity.PaymentEntity">
+        update ${tableName} set ${receiptFiled}=#{receipt} where id = #{oaId} and ${receiptFiled} is null
+    </update>
+
+</mapper>

fw-oa/src/main/java/com/hzya/frame/seeyon/cbs8/entity/TransactionDetailEntity.java

@@ -0,0 +1,155 @@
+package com.hzya.frame.seeyon.cbs8.entity;
+
+import com.hzya.frame.web.entity.BaseEntity;
+
+/**
+ * @Description cbs交易明细日志OA底表
+ * @Author xiangerlin
+ * @Date 2024/6/24 10:49
+ **/
+public class TransactionDetailEntity extends BaseEntity {
+    private String id;//id
+    private String accountNo;//银行账号
+    private String accountName;//户名
+    private String openBank;//开户行名称
+    private String bankType;//我方银行类型
+    private String bankTransactionDate;//交易日期
+    private String transactionSerialNumber;//交易流水号
+    private String bankSerialNumber;//银行流水号
+    private String currency;//币种
+    private String incurredAmount;//发生额
+    private String purpose;//用途
+    private String digest;//摘要
+    private String oppositeAccount;//对方账号
+    private String oppositeName;//对方户名
+    private String oppositeOpeningBank;//对方开户行
+
+    private String remark;//备注
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getAccountNo() {
+        return accountNo;
+    }
+
+    public void setAccountNo(String accountNo) {
+        this.accountNo = accountNo;
+    }
+
+    public String getAccountName() {
+        return accountName;
+    }
+
+    public void setAccountName(String accountName) {
+        this.accountName = accountName;
+    }
+
+    public String getOpenBank() {
+        return openBank;
+    }
+
+    public void setOpenBank(String openBank) {
+        this.openBank = openBank;
+    }
+
+    public String getBankTransactionDate() {
+        return bankTransactionDate;
+    }
+
+    public void setBankTransactionDate(String bankTransactionDate) {
+        this.bankTransactionDate = bankTransactionDate;
+    }
+
+    public String getTransactionSerialNumber() {
+        return transactionSerialNumber;
+    }
+
+    public void setTransactionSerialNumber(String transactionSerialNumber) {
+        this.transactionSerialNumber = transactionSerialNumber;
+    }
+
+    public String getCurrency() {
+        return currency;
+    }
+
+    public void setCurrency(String currency) {
+        this.currency = currency;
+    }
+
+    public String getIncurredAmount() {
+        return incurredAmount;
+    }
+
+    public void setIncurredAmount(String incurredAmount) {
+        this.incurredAmount = incurredAmount;
+    }
+
+    public String getPurpose() {
+        return purpose;
+    }
+
+    public void setPurpose(String purpose) {
+        this.purpose = purpose;
+    }
+
+    public String getDigest() {
+        return digest;
+    }
+
+    public void setDigest(String digest) {
+        this.digest = digest;
+    }
+
+    public String getOppositeAccount() {
+        return oppositeAccount;
+    }
+
+    public void setOppositeAccount(String oppositeAccount) {
+        this.oppositeAccount = oppositeAccount;
+    }
+
+    public String getOppositeName() {
+        return oppositeName;
+    }
+
+    public void setOppositeName(String oppositeName) {
+        this.oppositeName = oppositeName;
+    }
+
+    public String getOppositeOpeningBank() {
+        return oppositeOpeningBank;
+    }
+
+    public void setOppositeOpeningBank(String oppositeOpeningBank) {
+        this.oppositeOpeningBank = oppositeOpeningBank;
+    }
+
+    public String getBankType() {
+        return bankType;
+    }
+
+    public void setBankType(String bankType) {
+        this.bankType = bankType;
+    }
+
+    public String getBankSerialNumber() {
+        return bankSerialNumber;
+    }
+
+    public void setBankSerialNumber(String bankSerialNumber) {
+        this.bankSerialNumber = bankSerialNumber;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+}

fw-oa/src/main/java/com/hzya/frame/seeyon/cbs8/entity/TransactionDetailEntity.xml

@@ -0,0 +1,91 @@
+<?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">
+        <result property="id" column="id" />
+        <result property="accountNo" column="accountNo" />
+        <result property="accountName" column="accountName" />
+        <result property="openBank" column="openBank" />
+        <result property="bankType" column="bankType" />
+        <result property="bankTransactionDate" column="bankTransactionDate" />
+        <result property="transactionSerialNumber" column="transactionSerialNumber" />
+        <result property="currency" column="currency" />
+        <result property="incurredAmount" column="incurredAmount" />
+        <result property="purpose" column="purpose" />
+        <result property="digest" column="digest" />
+        <result property="oppositeAccount" column="oppositeAccount" />
+        <result property="oppositeName" column="oppositeName" />
+        <result property="oppositeOpeningBank" column="oppositeOpeningBank" />
+        <result property="remark" column="remark" />
+    </resultMap>
+
+    <sql id="TransactionDetailEntity_Base_Column_List">
+        id,
+        field0001 as accountNo,
+        field0002 as accountName,
+        field0003 as openBank,
+        field0004 as bankType,
+        field0005 as transactionSerialNumber,
+        field0006 as bankTransactionDate,
+        field0007 as bankSerialNumber,
+        field0008 as currency,
+        field0009 as incurredAmount,
+        field0010 as purpose,
+        field0011 as digest,
+        field0012 as oppositeAccount,
+        field0013 as oppositeName,
+        field0014 as oppositeOpeningBank,
+        field0015 as remark
+    </sql>
+
+    <!--  采用==查询 -->
+    <select id="TransactionDetailEntity_list_base" resultMap="get-TransactionDetailEntity-result" parameterType="com.hzya.frame.seeyon.cbs8.entity.TransactionDetailEntity">
+        select
+        <include refid="TransactionDetailEntity_Base_Column_List"/>
+        from
+        formmain_0233
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null and id !='' ">id = #{id} </if>
+            <if test="accountNo != null and accountNo !='' "> and field0001 = #{accountNo} </if>
+            <if test="accountName != null and accountName !='' "> and field0002 = #{accountName} </if>
+            <if test="openBank != null and openBank !='' "> and field0003 = #{openBank} </if>
+            <if test="bankType != null and bankType !='' "> and field0004 = #{bankType} </if>
+            <if test="transactionSerialNumber != null and transactionSerialNumber !='' "> and field0005 = #{transactionSerialNumber} </if>
+            <if test="bankTransactionDate != null and bankTransactionDate !='' "> and field0006 = #{bankTransactionDate} </if>
+            <if test="bankSerialNumber != null and bankSerialNumber !='' "> and field0007 = #{bankSerialNumber} </if>
+            <if test="currency != null and currency !='' "> and field0008 = #{currency} </if>
+            <if test="incurredAmount != null and incurredAmount !='' "> and field0009 = #{incurredAmount} </if>
+            <if test="purpose != null and purpose !='' "> and field0010 = #{purpose} </if>
+            <if test="digest != null and digest !='' "> and field0011 = #{digest} </if>
+            <if test="oppositeAccount != null and oppositeAccount !='' "> and field0012 = #{oppositeAccount} </if>
+            <if test="oppositeName != null and oppositeName !='' "> and field0013 = #{oppositeName} </if>
+            <if test="oppositeOpeningBank != null and oppositeOpeningBank !='' "> and field0014 = #{oppositeOpeningBank} </if>
+            <if test="remark != null and remark !='' "> and field0015 = #{remark} </if>
+        </trim>
+    </select>
+    <!-- 只查询交易流水号-->
+    <select id="TransactionDetailEntity_list_serialNumber" resultMap="get-TransactionDetailEntity-result" parameterType="com.hzya.frame.seeyon.cbs8.entity.TransactionDetailEntity">
+        select
+        field0005 as transactionSerialNumber
+        from
+        formmain_0233
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null and id !='' ">id = #{id} </if>
+            <if test="accountNo != null and accountNo !='' "> and field0001 = #{accountNo} </if>
+            <if test="accountName != null and accountName !='' "> and field0002 = #{accountName} </if>
+            <if test="openBank != null and openBank !='' "> and field0003 = #{openBank} </if>
+            <if test="bankType != null and bankType !='' "> and field0004 = #{bankType} </if>
+            <if test="transactionSerialNumber != null and transactionSerialNumber !='' "> and field0005 = #{transactionSerialNumber} </if>
+            <if test="bankTransactionDate != null and bankTransactionDate !='' "> and field0006 >= #{bankTransactionDate} </if>
+            <if test="bankSerialNumber != null and bankSerialNumber !='' "> and field0007 = #{bankSerialNumber} </if>
+            <if test="currency != null and currency !='' "> and field0008 = #{currency} </if>
+            <if test="incurredAmount != null and incurredAmount !='' "> and field0009 = #{incurredAmount} </if>
+            <if test="purpose != null and purpose !='' "> and field0010 = #{purpose} </if>
+            <if test="digest != null and digest !='' "> and field0011 = #{digest} </if>
+            <if test="oppositeAccount != null and oppositeAccount !='' "> and field0012 = #{oppositeAccount} </if>
+            <if test="oppositeName != null and oppositeName !='' "> and field0013 = #{oppositeName} </if>
+            <if test="oppositeOpeningBank != null and oppositeOpeningBank !='' "> and field0014 = #{oppositeOpeningBank} </if>
+            <if test="remark != null and remark !='' "> and field0015 = #{remark} </if>
+        </trim>
+    </select>
+</mapper>

fw-oa/src/main/java/com/hzya/frame/seeyon/cbs8/service/IAgentPaymentDetailService.java

@@ -0,0 +1,18 @@
+package com.hzya.frame.seeyon.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;
+
+/**
+ * @Description 代发代扣明细
+ * @Author xiangerlin
+ * @Date 2024/6/26 11:00
+ **/
+public interface IAgentPaymentDetailService extends IBaseService<AgentPaymentDetailEntity,String> {
+    /**
+     * 更新明细表支付状态
+     * @param detail
+     */
+    void updatePayResult(AgentPaymentDetailEntity detail);
+}