浏览代码

调整

master
huminghao 2 天前
父节点
当前提交
819a0940ab

+ 1
- 1
zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/system/StaffBlackRequestDTO.java 查看文件

@NotNull(message = "员工状态不能为空") @NotNull(message = "员工状态不能为空")
private Integer status; private Integer status;
@NotBlank(message = "下黑原因不能为空") @NotBlank(message = "下黑原因不能为空")
private String reasonIn;
private String remark;
} }

+ 2
- 2
zhywpt-app-userw/src/main/java/cn/com/taiji/userw/manager/system/StaffManagerImpl.java 查看文件

createStaffBlack(staff, dto); createStaffBlack(staff, dto);
//删除openId缓存 //删除openId缓存
deleteTokenByOpenId(staff.getOpenId()); deleteTokenByOpenId(staff.getOpenId());
saveStaffChangeLog(staff.getStaffId(), "下黑原因:"+dto.getReasonIn(), openId, StaffChangeType.STATUS);
saveStaffChangeLog(staff.getStaffId(), "下黑原因:"+dto.getRemark(), openId, StaffChangeType.STATUS);
return staff.getId(); return staff.getId();
} }


blackStaff.setIdNum(accountInfo.getIdNum()); blackStaff.setIdNum(accountInfo.getIdNum());
blackStaff.setIdType(accountInfo.getIdType()); blackStaff.setIdType(accountInfo.getIdType());
blackStaff.setStatus(1);//1-下黑,2-反白 blackStaff.setStatus(1);//1-下黑,2-反白
blackStaff.setReasonIn(dto.getReasonIn());
blackStaff.setReasonIn(dto.getRemark());
blackStaff.setStaffInTime(LocalDateTime.now()); blackStaff.setStaffInTime(LocalDateTime.now());
blackStaff.setCreateOpenId(findOpenIdByToken(dto.getAccessToken())); blackStaff.setCreateOpenId(findOpenIdByToken(dto.getAccessToken()));
blackStaff.setAgencyIdIn(staff.getAgencyId()); blackStaff.setAgencyIdIn(staff.getAgencyId());

+ 5
- 5
zhywpt-dps-iasq/src/main/java/cn/com/taiji/iasq/model/TaskInfo.java 查看文件

ORDER_REFUND_QUERY("微信、支付宝退费查询",TaskGroup.ATS, "orderRefundQuery", 3600 * 2, true, List.of(1, 2)), ORDER_REFUND_QUERY("微信、支付宝退费查询",TaskGroup.ATS, "orderRefundQuery", 3600 * 2, true, List.of(1, 2)),


//YGZ //YGZ
YGZ_DATA_SEND("营改增数据上传", TaskGroup.YGZ, "ygzDataSend", -1, true, List.of(1, 2)),
YGZ_DATA_SEND("营改增数据上传", TaskGroup.YGZ, "ygzDataSend", -1, false, List.of(1, 2)),
//BRZ //BRZ
BRZ_DATA_SEND("部认证数据上传", TaskGroup.BRZ, "brzDataSend", -1, true, List.of(1, 2)),
BRZ_DATA_SEND("部认证数据上传", TaskGroup.BRZ, "brzDataSend", -1, false, List.of(1, 2)),
// TRANSACTION 同步到老库 // TRANSACTION 同步到老库
TRANSACTION_HANDLE("同步到老库", TaskGroup.TRANSACTION, "transactionHandle", -1, true, List.of(1, 2)), TRANSACTION_HANDLE("同步到老库", TaskGroup.TRANSACTION, "transactionHandle", -1, true, List.of(1, 2)),


// DEPT_REFUND_CREATE_VERSION("部中心工单版本创建",TaskGroup.SYSTEM, "deptRefundCreateVersion", -1, true, List.of(1, 2)), // DEPT_REFUND_CREATE_VERSION("部中心工单版本创建",TaskGroup.SYSTEM, "deptRefundCreateVersion", -1, true, List.of(1, 2)),
// DEPT_REFUND_DOWN_LOAD("部中心工单下载",TaskGroup.YGZ, "deptRefundDownLoad", -1, true, List.of(1, 2)), // DEPT_REFUND_DOWN_LOAD("部中心工单下载",TaskGroup.YGZ, "deptRefundDownLoad", -1, true, List.of(1, 2)),
// DEPT_REFUND_DOWN_LOAD_5202("部中心工单5202下载",TaskGroup.YGZ, "deptRefundDownLoad5202", -1, true, List.of(1, 2)), // DEPT_REFUND_DOWN_LOAD_5202("部中心工单5202下载",TaskGroup.YGZ, "deptRefundDownLoad5202", -1, true, List.of(1, 2)),
CZK_SYSTEM_REFUND("储值卡系统退费",TaskGroup.SYSTEM, "czkSystemRefund", -1, true, List.of(1, 2)),
AUTO_SYSTEM_REFUND("自动退费",TaskGroup.SYSTEM, "autoSystemRefund", -1, true, List.of(1, 2)),
JZK_SYSTEM_REFUND("记账卡系统退费",TaskGroup.SYSTEM, "jzkSystemRefund", -1, true, List.of(1, 2)),
CZK_SYSTEM_REFUND("储值卡系统退费",TaskGroup.SYSTEM, "czkSystemRefund", -1, false, List.of(1, 2)),
AUTO_SYSTEM_REFUND("自动退费",TaskGroup.SYSTEM, "autoSystemRefund", -1, false, List.of(1, 2)),
JZK_SYSTEM_REFUND("记账卡系统退费",TaskGroup.SYSTEM, "jzkSystemRefund", -1, false, List.of(1, 2)),


; ;



+ 1
- 1
zhywpt-service-bls/src/test/java/cn/com/taiji/oqs/client/bls/TestBlackCardInManager.java 查看文件

public void cardQuery(){ public void cardQuery(){
CardQueryRequest cardQueryRequest = new CardQueryRequest(); CardQueryRequest cardQueryRequest = new CardQueryRequest();


cardQueryRequest.setCardId("52012223230230868396");
cardQueryRequest.setCardId("52012223230230868055");
try { try {
CardQueryResponse response = blackCardQueryManager.serviceHandle(cardQueryRequest); CardQueryResponse response = blackCardQueryManager.serviceHandle(cardQueryRequest);
System.out.println(response); System.out.println(response);

正在加载...
取消
保存