Commit 3399803f authored by hongguangwu's avatar hongguangwu

MVP1.7.2 顺序

parent 914cf429
...@@ -312,9 +312,7 @@ public class DateUtil { ...@@ -312,9 +312,7 @@ public class DateUtil {
} }
DateFormat df = new SimpleDateFormat(format); DateFormat df = new SimpleDateFormat(format);
df.setLenient(false); df.setLenient(false);
return df.parse( dateText.replace("/","").replace("-","") return df.parse(dateText);
.replace(CommonConstants.YEAR,"").replace(CommonConstants.MONTH,"")
.replace(CommonConstants.DAY,""));
} catch (ParseException e) { } catch (ParseException e) {
return null; return null;
} }
......
...@@ -52,9 +52,9 @@ public interface EkpBankGrantDetailMapper extends BaseMapper<EkpBankGrantDetail> ...@@ -52,9 +52,9 @@ public interface EkpBankGrantDetailMapper extends BaseMapper<EkpBankGrantDetail>
void updateStatusByGrantFail(@Param("fdParentId") String fdParentId); void updateStatusByGrantFail(@Param("fdParentId") String fdParentId);
// 发放失败,批量更新中信银行交易流水表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde // 发放失败,批量更新中信银行交易流水表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde
void updateZhongXinStatus(@Param("salaryIdList") List<String> salaryIdList); void updateZhongXinStatus(@Param("salaryId") String salaryId, @Param("detailId") String detailId);
// 发放失败,批量更新中信银行交易流水Model表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde // 发放失败,批量更新中信银行交易流水Model表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde
void updateZhongXinMainStatus(@Param("salaryIdList") List<String> salaryIdList); void updateZhongXinMainStatus(@Param("salaryId") String salaryId, @Param("detailId") String detailId);
// 发放失败,批量更新中信银行交易流水表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde // 发放失败,批量更新中信银行交易流水表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde
void updateZhongXinStatusAndBankInfo(@Param("salaryIdList") List<String> salaryIdList); void updateZhongXinStatusAndBankInfo(@Param("salaryIdList") List<String> salaryIdList);
......
...@@ -48,8 +48,8 @@ public interface EkpBankGrantDetailService extends IService<EkpBankGrantDetail> ...@@ -48,8 +48,8 @@ public interface EkpBankGrantDetailService extends IService<EkpBankGrantDetail>
void updateStatusByGrant(String fdParentId); void updateStatusByGrant(String fdParentId);
// 发放失败,批量更新中信银行交易流水表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde // 发放失败,批量更新中信银行交易流水表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde
void updateZhongXinStatus(List<String> salaryIdList); void updateZhongXinStatus(String salaryId, String detailId);
void updateZhongXinMainStatus(List<String> salaryIdList); void updateZhongXinMainStatus(String salaryId, String detailId);
// 明细再次-发放失败,批量更新中信银行交易流水表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde // 明细再次-发放失败,批量更新中信银行交易流水表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde
void updateZhongXinStatusAndBankInfo(List<String> salaryIdList); void updateZhongXinStatusAndBankInfo(List<String> salaryIdList);
......
...@@ -64,14 +64,14 @@ public class EkpBankGrantDetailServiceImpl extends ServiceImpl<EkpBankGrantDetai ...@@ -64,14 +64,14 @@ public class EkpBankGrantDetailServiceImpl extends ServiceImpl<EkpBankGrantDetai
// 发放失败,批量更新中信银行交易流水表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde // 发放失败,批量更新中信银行交易流水表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde
@Override @Override
public void updateZhongXinStatus(List<String> salaryIdList) { public void updateZhongXinStatus(String salaryId, String detailId) {
baseMapper.updateZhongXinStatus(salaryIdList); baseMapper.updateZhongXinStatus(salaryId, detailId);
} }
// 发放失败,批量更新中信银行交易流水表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde // 发放失败,批量更新中信银行交易流水表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde
@Override @Override
public void updateZhongXinMainStatus(List<String> salaryIdList) { public void updateZhongXinMainStatus(String salaryId, String detailId) {
baseMapper.updateZhongXinMainStatus(salaryIdList); baseMapper.updateZhongXinMainStatus(salaryId, detailId);
} }
// 明细再次-发放失败,批量更新中信银行交易流水表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde // 明细再次-发放失败,批量更新中信银行交易流水表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde
......
...@@ -803,7 +803,6 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -803,7 +803,6 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
EkpBankGrantDetail detailData; EkpBankGrantDetail detailData;
EkpBankPayTask main; EkpBankPayTask main;
List<EkpBankGrantDetail> oldDetailList; List<EkpBankGrantDetail> oldDetailList;
List<String> zhongXinSalaryIdList;
Map<String, EkpBankGrantDetail> oldMap; Map<String, EkpBankGrantDetail> oldMap;
BigDecimal moneySuccess; BigDecimal moneySuccess;
BigDecimal moneyFail; BigDecimal moneyFail;
...@@ -845,7 +844,6 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -845,7 +844,6 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
numFail = 0; numFail = 0;
if (dataList != null && !dataList.isEmpty()) { if (dataList != null && !dataList.isEmpty()) {
detailDataList = new ArrayList<>(); detailDataList = new ArrayList<>();
zhongXinSalaryIdList = new ArrayList<>();
for (JftApiPayrollQueryDetailResponseV1.JftApiPayrollDetail data : dataList) { for (JftApiPayrollQueryDetailResponseV1.JftApiPayrollDetail data : dataList) {
// 交易时间 // 交易时间
...@@ -875,7 +873,8 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -875,7 +873,8 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
detailData.setFdHandleStatus(""); detailData.setFdHandleStatus("");
detailData.setFdFailureFeedback(data.getCompanyHandlerResult()); detailData.setFdFailureFeedback(data.getCompanyHandlerResult());
// 批量更新中信银行表数据,使发放失败处理有数据出现 // 批量更新中信银行表数据,使发放失败处理有数据出现
zhongXinSalaryIdList.add(detailData.getFdSalaryId()); ekpBankGrantDetailService.updateZhongXinStatus(detailData.getFdSalaryId(), detailData.getFdId());
ekpBankGrantDetailService.updateZhongXinMainStatus(detailData.getFdSalaryId(), detailData.getFdId());
} }
detailDataList.add(detailData); detailDataList.add(detailData);
} }
...@@ -889,11 +888,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -889,11 +888,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
ekpBankPayTaskService.updateById(main); ekpBankPayTaskService.updateById(main);
// 更新明细状态为成功或失败 // 更新明细状态为成功或失败
ekpBankGrantDetailService.updateBatchById(detailDataList); ekpBankGrantDetailService.updateBatchById(detailDataList);
// 生成发放失败待处理表数据-也可以 批量 生成
if (!zhongXinSalaryIdList.isEmpty()) {
ekpBankGrantDetailService.updateZhongXinStatus(zhongXinSalaryIdList);
ekpBankGrantDetailService.updateZhongXinMainStatus(zhongXinSalaryIdList);
}
} }
if (numSuccess > 0) { if (numSuccess > 0) {
...@@ -935,7 +930,6 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -935,7 +930,6 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
List<JftApiPayrollQueryDetailResponseV1.JftApiPayrollDetail> dataList; List<JftApiPayrollQueryDetailResponseV1.JftApiPayrollDetail> dataList;
List<EkpBankGrantDetail> detailDataList = new ArrayList<>(); List<EkpBankGrantDetail> detailDataList = new ArrayList<>();
EkpBankGrantDetail detailData; EkpBankGrantDetail detailData;
List<String> zhongXinSalaryIdList = new ArrayList<>();
JftApiPayrollQueryDetailResponseV1.JftApiPayrollDetail data; JftApiPayrollQueryDetailResponseV1.JftApiPayrollDetail data;
List<EkpBankIcbcLog> icbcLogList = new ArrayList<>(); List<EkpBankIcbcLog> icbcLogList = new ArrayList<>();
for (EkpBankResultVo vo : detailList) { for (EkpBankResultVo vo : detailList) {
...@@ -996,7 +990,8 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -996,7 +990,8 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
detailData.setFdFailureFeedback(data.getCompanyHandlerResult()); detailData.setFdFailureFeedback(data.getCompanyHandlerResult());
detailData.setFdFailNum(vo.getFdFailNum() + 1); detailData.setFdFailNum(vo.getFdFailNum() + 1);
// 批量更新中信银行表数据,使发放失败处理有数据出现 // 批量更新中信银行表数据,使发放失败处理有数据出现
zhongXinSalaryIdList.add(vo.getFdSalaryId()); ekpBankGrantDetailService.updateZhongXinStatus(vo.getFdSalaryId(), vo.getFdId());
ekpBankGrantDetailService.updateZhongXinMainStatus(vo.getFdSalaryId(), vo.getFdId());
} }
ekpBankGrantLogService.updateById(logs); ekpBankGrantLogService.updateById(logs);
detailDataList.add(detailData); detailDataList.add(detailData);
...@@ -1005,11 +1000,6 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -1005,11 +1000,6 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
} }
// 更新明细状态为成功或失败 // 更新明细状态为成功或失败
ekpBankGrantDetailService.updateBatchById(detailDataList); ekpBankGrantDetailService.updateBatchById(detailDataList);
// 生成发放失败待处理表数据-也可以 批量 生成
if (!zhongXinSalaryIdList.isEmpty()) {
ekpBankGrantDetailService.updateZhongXinStatusAndBankInfo(zhongXinSalaryIdList);
ekpBankGrantDetailService.updateZhongXinMainStatusAndBankInfo(zhongXinSalaryIdList);
}
if (!icbcLogList.isEmpty()) { if (!icbcLogList.isEmpty()) {
ekpBankIcbcLogService.saveBatch(icbcLogList); ekpBankIcbcLogService.saveBatch(icbcLogList);
} }
......
...@@ -126,28 +126,18 @@ ...@@ -126,28 +126,18 @@
<!-- 发放失败,批量更新中信银行交易流水表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde --> <!-- 发放失败,批量更新中信银行交易流水表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde -->
<update id="updateZhongXinStatus"> <update id="updateZhongXinStatus">
update ekp_db4ed54e25543f4b7a9a a update ekp_db4ed54e25543f4b7a9a a
set a.fd_3b148bc0c28e48='失败' set a.fd_3b148bc0c28e48='失败',a.fd_tbankempid = #{detailId}
where where a.fd_3b1fe00b0f5dde = #{salaryId}
<if test="salaryIdList != null and salaryIdList.size() > 0">
a.fd_3b1fe00b0f5dde in
<foreach collection="salaryIdList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</update> </update>
<!-- 发放失败,批量更新中信银行交易流水Model表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde --> <!-- 发放失败,批量更新中信银行交易流水Model表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde -->
<update id="updateZhongXinMainStatus"> <update id="updateZhongXinMainStatus">
UPDATE modeling_simple_main a UPDATE modeling_simple_main a
JOIN ekp_db4ed54e25543f4b7a9a b on a.fd_id=b.fd_id JOIN ekp_db4ed54e25543f4b7a9a b on a.fd_id=b.fd_id
SET a.extend_data_xml=JSON_SET(a.extend_data_xml,'$[1].fd_3b148bc0c28e48', '失败') SET a.extend_data_xml=JSON_SET(a.extend_data_xml,'$[1].fd_3b148bc0c28e48', '失败','$[1].fd_tbankempid', #{detailId})
where where b.fd_3b56782982b8b2 = #{salaryId}
<if test="salaryIdList != null and salaryIdList.size() > 0">
b.fd_3b56782982b8b2 in
<foreach collection="salaryIdList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</update> </update>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment