Merge branch 'yuecheng-project' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into yuecheng-project

buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/ElecBillPluginInitializer.java

@@ -3,6 +3,7 @@ package com.hzya.frame.plugin.cbs8.plugin;
 import com.alibaba.fastjson.JSONObject;
 import com.hzya.frame.base.PluginBaseEntity;
 import com.hzya.frame.plugin.cbs8.service.ICbsPluginService;
+import com.hzya.frame.web.entity.BaseResult;
 import com.hzya.frame.web.entity.JsonResultEntity;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -96,6 +97,6 @@ public class ElecBillPluginInitializer extends PluginBaseEntity {
     @Override
     public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception {
         cbsPluginService.elecBillUpload(requestJson);
-        return null;
+        return BaseResult.getSuccessMessageEntity("cbs8电子回单插件执行成功");
     }
 }

buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/PayApplyPluginInitializer.java

@@ -1,9 +1,13 @@
 package com.hzya.frame.plugin.cbs8.plugin;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.hzya.frame.base.PluginBaseEntity;
 import com.hzya.frame.plugin.cbs8.service.ICbsPluginService;
 import com.hzya.frame.seeyon.cbs8.entity.PaymentEntity;
+import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity;
+import com.hzya.frame.sysnew.integtationTaskLivingDetails.service.IIntegrationTaskLivingDetailsService;
+import com.hzya.frame.web.entity.BaseResult;
 import com.hzya.frame.web.entity.JsonResultEntity;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -19,7 +23,8 @@ public class PayApplyPluginInitializer extends PluginBaseEntity {
 
     @Autowired
     private ICbsPluginService cbsPluginService;
-
+    @Autowired
+    private IIntegrationTaskLivingDetailsService taskLivingDetailsService;
     /***
      * 插件初始化方法
      * @Author 👻👻👻👻👻👻👻👻 gjh
@@ -102,11 +107,26 @@ public class PayApplyPluginInitializer extends PluginBaseEntity {
             requestJson.remove("jsonStr");
             paymentEntity = JSONObject.parseObject(requestJson.toString(),PaymentEntity.class);
         }
-        if (null == paymentEntity)
+        if (null == paymentEntity){
             paymentEntity = new PaymentEntity();
+        }
+        String taskDetailId = requestJson.getString("integration_task_living_details_id");
+        if (StrUtil.isNotEmpty(taskDetailId)){
+            //查询日志里的参数
+            //查询日志表
+            IntegrationTaskLivingDetailsEntity taskDetailEntity = taskLivingDetailsService.get(taskDetailId);
+            if (null != taskDetailEntity){
+                //重试标记
+                paymentEntity.setRetryFlag("1");
+                paymentEntity.setReferenceNum(taskDetailEntity.getRootAppBill());
+                paymentEntity.setTaskDetailId(taskDetailId);
+            }else {
+                return BaseResult.getFailureMessageEntity("根据id:{}，查不到记录",taskDetailId);
+            }
+        }
         //支付申请
-        //paymentEntity.setOaId("8475071606892874568");
+        //paymentEntity.setOaId("-5026223055769156433");
         cbsPluginService.applyPay(paymentEntity);
-        return null;
+        return BaseResult.getSuccessMessageEntity("cbs8支付申请插件执行完成");
     }
 }

buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/TransactionDetailPluginInitializer.java

@@ -7,6 +7,7 @@ import com.hzya.frame.cbs8.dto.req.TransactionDetailReqDTO;
 import com.hzya.frame.cbs8.dto.res.TransactionDetailDTO;
 import com.hzya.frame.cbs8.util.CBSUtil;
 import com.hzya.frame.plugin.cbs8.service.ICbsPluginService;
+import com.hzya.frame.web.entity.BaseResult;
 import com.hzya.frame.web.entity.JsonResultEntity;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -120,7 +121,6 @@ public class TransactionDetailPluginInitializer extends PluginBaseEntity {
         List<TransactionDetailDTO> transactionDetailList = cbsPluginService.queryTransactionDetail(transactionDetailReqDTO);
         //保存交易明细到OA底表
         cbsPluginService.saveTransactionDetail(transactionDetailList);
-        return new JsonResultEntity("成功",true,transactionDetailList);
+        return BaseResult.getSuccessMessageEntity("成功",transactionDetailList);
-        //return null;
     }
 }

buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/service/impl/CbsPluginServiceImpl.java

@@ -84,6 +84,10 @@ public class CbsPluginServiceImpl implements ICbsPluginService {
         if (CollectionUtils.isNotEmpty(paymentList)){
             for (PaymentEntity pay : paymentList) {
                 //调用支付申请接口
+                pay.setTaskDetailId(paymentEntity.getTaskDetailId());
+                if (StrUtil.isNotEmpty(paymentEntity.getTaskDetailId())){
+                    pay.setReferenceNumNew(spliceBillCode(pay.getReferenceNum()));
+                }
                 PayResponseDTO payResponseDTO = cbs8Service.payApply(pay);
                 boolean successed = payResponseDTO.getSuccessed();
                 if (successed){
@@ -209,10 +213,11 @@ public class CbsPluginServiceImpl implements ICbsPluginService {
     public void elecBillUpload(JSONObject requestJson) throws Exception {
         //查询支付成功 没有电子回单的数据
         PaymentEntity paymentEntity = new PaymentEntity();
-       // List<PaymentEntity> paymentList = paymentService.queryElecIsNull(paymentEntity);
+        paymentEntity.setDataSourceCode(oa_data_source_code);
-        paymentEntity.setPayDate("2024-06-20");
+        List<PaymentEntity> paymentList = paymentService.queryElecIsNull(paymentEntity);
-        paymentEntity.setReferenceNum("41");
+        //paymentEntity.setPayDate("2024-06-20");
-        List<PaymentEntity> paymentList = Arrays.asList(paymentEntity);
+        //paymentEntity.setReferenceNum("41");
+        //List<PaymentEntity> paymentList = Arrays.asList(paymentEntity);
         if (CollectionUtils.isNotEmpty(paymentList)) {
             for (PaymentEntity pay : paymentList) {
                 try {
@@ -312,8 +317,9 @@ public class CbsPluginServiceImpl implements ICbsPluginService {
                                 PaymentApplyAgentDTO detailDTO = BeanUtil.copyProperties(detail,PaymentApplyAgentDTO.class);
                                 paymentApplyAgentList.add(detailDTO);
                             }
-                            //招行这里要传203
+
-                            paymentApplySubmitReqDTO.setBankExtend5("203");
+                            //不同银行添加 处理不一样
+                            //addAttribute(agentPay,paymentApplySubmitReqDTO,paymentApplyAgentList);
                             PayResponseDTO payResponseDTO =  cbs8Service.agentPayApply(paymentApplySubmitReqDTO,paymentApplyAgentList);
                             if (null != payResponseDTO){
                                 Boolean successed = payResponseDTO.getSuccessed();
@@ -341,6 +347,65 @@ public class CbsPluginServiceImpl implements ICbsPluginService {
         }
     }
 
+    /**
+     * 不同银行设置不同的字段
+     * @param agentPay
+     * @param paymentApplySubmitReqDTO 表头
+     * @param list 表体
+     */
+    private void addAttribute(AgentPaymentEntity agentPay, PaymentApplySubmitReqDTO paymentApplySubmitReqDTO,List<PaymentApplyAgentDTO> list) {
+
+        //招商 CMB
+        //代发类型
+        paymentApplySubmitReqDTO.setBankExtend5("203");
+
+
+        //浦东发展银行 PDB
+        paymentApplySubmitReqDTO.setPersonalFlag("1");
+        //代发类型
+        paymentApplySubmitReqDTO.setBankExtend5("203");
+        //单位编号
+        paymentApplySubmitReqDTO.setBankExtend6("203");
+        //代发信息 1002表示代发工资
+        paymentApplySubmitReqDTO.setBankExtend8("1002");
+
+        //民生银行 CMC
+        //1表示代发工资
+        paymentApplySubmitReqDTO.setBankExtend5("1");
+
+        //农业银行 ABC
+        //200表示同行代发工资
+        paymentApplySubmitReqDTO.setBankExtend2("200");
+        //99020001表示工资发放
+        paymentApplySubmitReqDTO.setBankExtend8("99020001");
+
+        //光大银行 CEB
+        paymentApplySubmitReqDTO.setBankExtend1("00000000");
+        paymentApplySubmitReqDTO.setBankExtend8("0");
+        //证件号，不知道填什么
+        for (PaymentApplyAgentDTO paymentApplyAgentDTO : list) {
+            paymentApplyAgentDTO.setDtlExtend1("");
+        }
+
+        //民生银行
+        //付款类型 1代表代发工资
+        paymentApplySubmitReqDTO.setBankExtend5("1");
+
+        //工商银行
+        paymentApplySubmitReqDTO.setUrgentTag("0");
+
+        //广发银行
+        //3表示代发工资
+        paymentApplySubmitReqDTO.setBankExtend2("3");
+
+        //华夏银行
+        paymentApplySubmitReqDTO.setBankExtend1("0");
+        // xhj3001表示代发工资
+        paymentApplySubmitReqDTO.setBankExtend2("xhj3001");
+
+
+    }
+
     /**
      * 代发代扣 结果详情查询
      *
@@ -495,4 +560,10 @@ public class CbsPluginServiceImpl implements ICbsPluginService {
         }
     }
 
+    //拼接新的单据号
+    private String spliceBillCode(String code){
+        String hour = Convert.toStr(DateUtil.hour(new Date(),true));
+        String minute = Convert.toStr(DateUtil.minute(new Date()));
+        return code+"-"+hour+minute;
+    }
 }

buildpackage/src/main/resources/application-xel.yml

@@ -12,7 +12,7 @@ spring:
     dynamic:
       datasource:
         master:
-          url: jdbc:mysql://hzya.ufyct.com: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
           driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置

service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ExtServiceImpl.java

@@ -45,7 +45,6 @@ public class Cbs8ExtServiceImpl implements ICbs8ExtService {
     @Override
     public SysExtensionApiEntity payApply(SysExtensionApiEntity entity) {
         String bodys = entity.getBodys();
-        logger.info("Cbs8ExtServiceImpl.payApply方法body参数:{}",bodys);
         if (StrUtil.isNotEmpty(bodys)) {
             PaymentEntity paymentEntity = JSONObject.parseObject(bodys, PaymentEntity.class);
             if (null != paymentEntity) {
@@ -73,10 +72,11 @@ public class Cbs8ExtServiceImpl implements ICbs8ExtService {
                 String requestData = JSONObject.toJSONString(list);
                 //加密 签名
                 encrypAndsign(entity, requestData);
+                //重试日志id
+                entity.getHeaders().put("integration_task_living_details_id",paymentEntity.getTaskDetailId());
                 entity.setBodys(requestData);
             }
         }
-        logger.info("Cbs8ExtServiceImpl.payApply方法执行完毕:{}",JSONObject.toJSONString(entity));
         return entity;
     }
 
@@ -96,26 +96,41 @@ public class Cbs8ExtServiceImpl implements ICbs8ExtService {
             JSONObject sourceBody = sourceData.getJSONObject("body");//源数据body
             //自定义参数，存放的是请求报文明文
             String hzyaExtData = targetHeaders.getString("hzyaExtData");
+            String taskDetailId = targetHeaders.getString("integration_task_living_details_id");
             String returnDataBase64 = logEntity.getReturnData();
             byte[] secretResByte = Base64.getDecoder().decode(returnDataBase64);
             //解密报文
             String decryptRes = CBSUtil.decrypt(secretResByte);
             //6、记录系统日志
             IntegrationTaskLivingDetailsEntity logTask = new IntegrationTaskLivingDetailsEntity();
-            logTask.setRootAppPk(sourceBody.getString("formsonId"));
+            logTask.setRootAppPk(sourceBody.getString("oaId"));
-            logTask.setRootAppBill(sourceBody.getString("referenceNum"));
+            String ferenceNum = Convert.toStr(sourceBody.getString("referenceNumNew"), sourceBody.getString("referenceNum"));
+            logTask.setRootAppBill(ferenceNum);
             logTask.setPluginId("CBS8PayApplyPlugin");
             //对方接口返回信息
             logTask.setNewTransmitInfo(decryptRes);
-            logTask.setNewPushDate(new Date());
+            Date date = new Date();
+            logTask.setNewPushDate(date);
             //调用接口请求参数
             logTask.setRootAppNewData(hzyaExtData);
             PayResponseDTO payResponseDTO = PayResponseDTO.payResValueOf(decryptRes);
-            //为true是成功
+            if (StrUtil.isEmpty(taskDetailId)){
-            if (payResponseDTO.getSuccessed()) {
+                logTask.setCreate_time(date);
-                taskLivingDetailsService.saveLogToSuccess(logTask);
+                logTask.setModify_time(date);
+                //为true是成功
+                if (payResponseDTO.getSuccessed()) {
+                    taskLivingDetailsService.saveLogToSuccess(logTask);
+                }else {
+                    taskLivingDetailsService.saveLogToFail(logTask);
+                }
             }else {
-                taskLivingDetailsService.saveLogToFail(logTask);
+                logTask.setId(taskDetailId);
+                logTask.setModify_time(date);
+                if (payResponseDTO.getSuccessed()){
+                    taskLivingDetailsService.saveLogFailToSuccess(logTask);
+                }else {
+                    taskLivingDetailsService.updateLogFailToSuccess(logTask);
+                }
             }
         } catch (Exception e) {
             logger.info("payApplyCallBack方法执行出错:{}",e);
@@ -286,14 +301,11 @@ public class Cbs8ExtServiceImpl implements ICbs8ExtService {
      * @return
      */
     private Map<String, String> headersValueOf(String sign, long timestamp) {
-        logger.info("开始组装请求头参数:{},{}",sign,timestamp);
         Map<String, String> header = new HashMap();
         header.put(CBSUtil.SIGN_HEADER_NAME, sign);
         header.put(CBSUtil.TIMESTAMP_HEADER, Long.toString(timestamp));
         header.put(HTTP.CONTENT_TYPE, CBSUtil.TARGET_CONTENT_TYPE);
-        logger.info("准备获取token");
         header.put(CBSUtil.AUTHORIZATION, CBSUtil.BEARER + CbsAccessToken.getToken());
-        logger.info("组装后的header参数:{}",JSONObject.toJSONString(header));
         return header;
     }
 
@@ -306,7 +318,6 @@ public class Cbs8ExtServiceImpl implements ICbs8ExtService {
     private void encrypAndsign(SysExtensionApiEntity entity, String requestData) {
         //签名
         long timestamp = System.currentTimeMillis();
-        logger.info("CBS请求参数明文:{}", requestData);
         String sign = CBSUtil.sign(requestData, timestamp);
         //加密
         byte[] encryptedData = CBSUtil.encrypt(requestData);
@@ -314,6 +325,5 @@ public class Cbs8ExtServiceImpl implements ICbs8ExtService {
         header.put("hzyaExtData", requestData);
         entity.setByteBodys(encryptedData);
         entity.setHeaders(header);
-        logger.info("加密，签名方法执行完毕");
     }
 }

service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/ICbsLogDao.java

@@ -9,4 +9,11 @@ import com.hzya.frame.seeyon.cbs8.entity.CbsLogEntity;
  * @Date 2024/6/14 17:30
  **/
 public interface ICbsLogDao extends IBaseDao<CbsLogEntity,String> {
+
+    /**
+     * 更新日志
+     * @param entity
+     * @return
+     */
+    int updateLog(CbsLogEntity entity);
 }

service/src/main/java/com/hzya/frame/seeyon/cbs8/dao/impl/CbsLogDaoImpl.java

@@ -1,5 +1,6 @@
 package com.hzya.frame.seeyon.cbs8.dao.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.hzya.frame.basedao.dao.MybatisGenericDao;
 import com.hzya.frame.seeyon.cbs8.dao.ICbsLogDao;
 import com.hzya.frame.seeyon.cbs8.entity.CbsLogEntity;
@@ -12,4 +13,16 @@ import org.springframework.stereotype.Repository;
  **/
 @Repository()
 public class CbsLogDaoImpl extends MybatisGenericDao<CbsLogEntity,String> implements ICbsLogDao {
+    /**
+     * 更新日志
+     *
+     * @param entity
+     * @return
+     */
+    @DS("#entity.dataSourceCode")
+    @Override
+    public int updateLog(CbsLogEntity entity) {
+        this.update(getSqlIdPrifx()+"entity_update",entity);
+        return 0;
+    }
 }

service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentDetailEntity.java

@@ -25,7 +25,10 @@ public class AgentPaymentDetailEntity extends BaseEntity {
 
     //明细序号，从1开始递增
     private int dtlSeqNum;
-
+    //明细用途
+    private String dtlPurpose;
+    //是否跨行 Y表示跨行 N表示同行
+    private String dtlBankFlag;
     //支付结果
     private String payResult;
     //支付日期
@@ -110,4 +113,20 @@ public class AgentPaymentDetailEntity extends BaseEntity {
     public void setPayDate(String payDate) {
         this.payDate = payDate;
     }
+
+    public String getDtlPurpose() {
+        return dtlPurpose;
+    }
+
+    public void setDtlPurpose(String dtlPurpose) {
+        this.dtlPurpose = dtlPurpose;
+    }
+
+    public String getDtlBankFlag() {
+        return dtlBankFlag;
+    }
+
+    public void setDtlBankFlag(String dtlBankFlag) {
+        this.dtlBankFlag = dtlBankFlag;
+    }
 }

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

@@ -11,6 +11,8 @@
         <result property="dtlCnapsCode" column="dtlCnapsCode" />
         <result property="dtlRevName" column="dtlRevName" />
         <result property="dtlRevBankName" column="dtlRevBankName" />
+        <result property="dtlBankFlag" column="dtlBankFlag" />
+        <result property="dtlPurpose" column="dtlPurpose" />
         <result property="payResult" column="payResult" />
         <result property="payDate" column="payDate" />
     </resultMap>
@@ -25,6 +27,8 @@
         dtlCnapsCode,
         dtlRevName,
         dtlRevBankName,
+        dtlPurpose,
+        dtlBankFlag,
         payResult,
         payDate
     </sql>
@@ -39,16 +43,19 @@
         formson_0225.id,
         formson_0225.formmain_id AS formmainId,
         'formson_0225' AS tabName,
+        'N' AS dtlBankFlag,
         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,
+        to_char(formmain_0224.field0030,'yyyy-MM')||'月'||'工资'AS dtlPurpose,
         formson_0225.field0044 AS payResult,
         formson_0225.field0045 AS payDate
         FROM
         formson_0225
+        LEFT JOIN formmain_0224 ON  formmain_0224.id = formson_0225.formmain_id
         )formson_0225
         <trim prefix="where" prefixOverrides="and">
             <if test="id != null and id !='' "> formson_0225.id = #{id} </if>

service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentEntity.java

@@ -40,6 +40,8 @@ public class AgentPaymentEntity extends BaseEntity {
     private String tableName;//表名称
     private String billName;//单据名称
 
+    private String payBankType;//付款银行类型
+
     public String getReferenceNum() {
         return referenceNum;
     }
@@ -151,4 +153,12 @@ public class AgentPaymentEntity extends BaseEntity {
     public void setPayDate(String payDate) {
         this.payDate = payDate;
     }
+
+    public String getPayBankType() {
+        return payBankType;
+    }
+
+    public void setPayBankType(String payBankType) {
+        this.payBankType = payBankType;
+    }
 }

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

@@ -27,6 +27,7 @@
         busType,
         amount,
         currency,
+        payBankType,
         payAccount,
         applyCode,
         payResult,
@@ -52,7 +53,8 @@
         '755915707610112' AS payAccount,
         formmain_0224.field0043 AS applyCode,
         formmain_0224.field0046 AS payResult,
-        '工资' AS purpose
+        formmain_0224.field0053 as payBankType,
+        to_char(formmain_0224.field0030,'yyyy-MM')||'月'||''工资' AS purpose
         FROM
         formmain_0224
         LEFT JOIN COL_SUMMARY ON COL_SUMMARY.FORM_RECORDID = formmain_0224.id

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

@@ -106,6 +106,7 @@
             <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="cbs_apply_code != null and cbs_apply_code !='' ">field0005 =#{cbs_apply_code},</if>
             <if test="successed != null and successed !='' ">field0014 =#{successed}</if>
         </trim>
         where id = #{id}

service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/PaymentEntity.java

@@ -45,6 +45,10 @@ public class PaymentEntity extends BaseEntity {
     private String payType;//付款类别
     private String payCompanyCode;//付款公司编码
 
+    //是否重试
+    private String retryFlag;
+    //重试日志id
+    private String taskDetailId;
     public String getOaId() {
         return oaId;
     }
@@ -324,4 +328,20 @@ public class PaymentEntity extends BaseEntity {
     public void setApplyCode(String applyCode) {
         this.applyCode = applyCode;
     }
+
+    public String getRetryFlag() {
+        return retryFlag;
+    }
+
+    public void setRetryFlag(String retryFlag) {
+        this.retryFlag = retryFlag;
+    }
+
+    public String getTaskDetailId() {
+        return taskDetailId;
+    }
+
+    public void setTaskDetailId(String taskDetailId) {
+        this.taskDetailId = taskDetailId;
+    }
 }

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

@@ -315,74 +315,37 @@
 
     <!-- 查询交易成功，且电子回单为空的，上传电子回单用 -->
     <select id="PaymentEntity_list_base_elec_isnull" resultMap="get-PaymentEntity-result" parameterType="com.hzya.frame.seeyon.cbs8.entity.PaymentEntity">
-       <!-- select
+        select v.* from (
-        <include refid="PaymentEntity_Base_Column_List"/>
+        <include refid="base_sql"/>
-        from
+        ) v
-        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="referenceNum != null and referenceNum !='' "> v.referenceNum = #{referenceNum} </if>
-            <if test="busType != null and busType !='' "> and busType = #{busType} </if>
+            <if test="busType != null and busType !='' "> and v.busType = #{busType} </if>
-            <if test="amount != null and amount !='' ">and amount = #{amount}  </if>
+            <if test="amount != null and amount !='' ">and v.amount = #{amount}  </if>
-            <if test="currency != null and currency !='' "> and currency = #{currency}  </if>
+            <if test="currency != null and currency !='' "> and v.currency = #{currency}  </if>
-            <if test="payAccount != null and payAccount !='' ">and payAccount = #{payAccount} </if>
+            <if test="payAccount != null and payAccount !='' ">and v.payAccount = #{payAccount} </if>
-            <if test="revAccount != null and revAccount !='' "> and revAccount = #{revAccount}  </if>
+            <if test="revAccount != null and revAccount !='' "> and v.revAccount = #{revAccount}  </if>
-            <if test="revAccountName != null and revAccountName !='' "> and  revAccountName = #{revAccountName}  </if>
+            <if test="revAccountName != null and revAccountName !='' "> and  v.revAccountName = #{revAccountName}  </if>
-            <if test="revBankType != null and revBankType !='' "> and revBankType = #{revBankType} </if>
+            <if test="revBankType != null and revBankType !='' "> and v.revBankType = #{revBankType} </if>
-            <if test="revBankName != null and revBankName !='' ">and revBankName = #{revBankName}  </if>
+            <if test="revBankName != null and revBankName !='' ">and v.revBankName = #{revBankName}  </if>
-            <if test="cnapsCode != null and cnapsCode !='' ">and cnapsCode = #{cnapsCode}  </if>
+            <if test="cnapsCode != null and cnapsCode !='' ">and v.cnapsCode = #{cnapsCode}  </if>
-            <if test="purpose != null and purpose !='' "> and purpose = #{purpose}  </if>
+            <if test="purpose != null and purpose !='' "> and v.purpose = #{purpose}  </if>
-            <if test="personalFlag != null and personalFlag !='' ">and personalFlag = #{personalFlag}  </if>
+            <if test="personalFlag != null and personalFlag !='' ">and v.personalFlag = #{personalFlag}  </if>
-            <if test="tableName != null and tableName !='' "> and tableName = #{tableName}  </if>
+            <if test="tableName != null and tableName !='' "> and v.tableName = #{tableName}  </if>
-            <if test="oaId != null and oaId !='' ">and oaId = #{oaId} </if>
+            <if test="oaId != null and oaId !='' ">and v.oaId = #{oaId} </if>
-            <if test="payCompany != null and payCompany !='' "> and payCompany = #{payCompany}  </if>
+            <if test="payCompany != null and payCompany !='' "> and v.payCompany = #{payCompany}  </if>
-            <if test="payCompanyCode != null and payCompanyCode !='' "> and payCompanyCode = #{payCompanyCode}  </if>
+            <if test="payCompanyCode != null and payCompanyCode !='' "> and v.payCompanyCode = #{payCompanyCode}  </if>
-            <if test="title != null and title !='' "> and  title = #{title}  </if>
+            <if test="title != null and title !='' "> and  v.title = #{title}  </if>
-            <if test="billName != null and billName !='' "> and billName = #{billName} </if>
+            <if test="billName != null and billName !='' "> and v.billName = #{billName} </if>
-            <if test="payBankName != null and payBankName !='' ">and payBankName = #{payBankName}  </if>
+            <if test="payResult != null and payResult !='' ">and v.payResult = #{payResult}  </if>
-            <if test="payType != null and payType !='' "> and payType = #{payType}  </if>
+            <if test="applyCode != null and applyCode !='' ">and v.applyCode = #{applyCode}  </if>
-            and receipt is null and personalFlag='0' and payResult = '支付成功'
+            <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.receipt is NULL OR v.receipt = '')
+            -- and payResult = '支付成功'
         </trim>
+        order by v.oaId,v.sort
     </select>
     <!-- 查询待支付的 -->
     <select id="PaymentEntity_list_base_unpaid" resultMap="get-PaymentEntity-result" parameterType="com.hzya.frame.seeyon.cbs8.entity.PaymentEntity">
@@ -412,9 +375,11 @@
             <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
+            <if test="retryFlag == null or retryFlag == ''">
-            and v.payResult is null
+                and v.payResult is null
-            and v.finishedflag = 1
+                and v.amount > 0
+                and v.finishedflag = 1
+            </if>
         </trim>
     </select>
 
@@ -424,10 +389,9 @@
 
     <!-- 查询未完成的 采用==查询 -->
     <select id="PaymentEntity_list_base_in_payment" resultMap="get-PaymentEntity-result" parameterType="com.hzya.frame.seeyon.cbs8.entity.PaymentEntity">
-        select
+        select v.* from (
-        <include refid="PaymentEntity_Base_Column_List"/>
+        <include refid="base_sql"/>
-        from
+        ) v
-        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>
@@ -450,9 +414,9 @@
             <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='支付中'
+            and (v.payResult='支付中'
-            or payResult not in ('审批撤销','审批拒绝','处理失败','退票','支付成功','取消支付','修改支付','支付失败'))
+            or v.payResult not in ('审批撤销','审批拒绝','处理失败','退票','支付成功','取消支付','修改支付','支付失败'))
-            and personalFlag='0'
+            and v.personalFlag='0'
         </trim>
     </select>
 

service/src/main/java/com/hzya/frame/seeyon/cbs8/service/impl/CbsLogServiceImpl.java

@@ -109,12 +109,13 @@ public class CbsLogServiceImpl extends BaseService<CbsLogEntity,String> implemen
                 logEntity.setApply_state(apply_state);
                 logEntity.setSuccessed(successed);
                 logEntity.setBill_code(cbsLogEntity.getBill_code());
+                logEntity.setCbs_apply_code(cbs_apply_code);
                 logEntity.setDataSourceCode(oa_data_source_code);
                 try {
                     updateLog(logEntity);
                 }catch (Exception e){
                     e.printStackTrace();
-                    logger.error("更新");
+                    logger.error("更新cbs交易日志出错:{}",e);
                 }
             }
         }
@@ -186,10 +187,10 @@ public class CbsLogServiceImpl extends BaseService<CbsLogEntity,String> implemen
      *
      * @param logEntity
      */
-    @DS("#logEntity.dataSourceCode")
+   // @DS("#logEntity.dataSourceCode")
     @Override
     public void updateLog(CbsLogEntity logEntity) {
-        cbsLogDao.update(logEntity);
+        cbsLogDao.updateLog(logEntity);
     }
 
     //获取xml模板