调整

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/system/StaffBlackRequestDTO.java

@@ -21,5 +21,5 @@ public class StaffBlackRequestDTO extends AbstractBizRequestDTO {
     @NotNull(message = "员工状态不能为空")
     private Integer status;
     @NotBlank(message = "下黑原因不能为空")
-    private String reasonIn;
+    private String remark;
 }

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/manager/system/StaffManagerImpl.java

@@ -245,7 +245,7 @@ public class StaffManagerImpl extends AbstractUserwManager implements StaffManag
         createStaffBlack(staff, dto);
         //删除openId缓存
         deleteTokenByOpenId(staff.getOpenId());
-        saveStaffChangeLog(staff.getStaffId(), "下黑原因："+dto.getReasonIn(), openId, StaffChangeType.STATUS);
+        saveStaffChangeLog(staff.getStaffId(), "下黑原因："+dto.getRemark(), openId, StaffChangeType.STATUS);
         return staff.getId();
     }
 
@@ -258,7 +258,7 @@ public class StaffManagerImpl extends AbstractUserwManager implements StaffManag
         blackStaff.setIdNum(accountInfo.getIdNum());
         blackStaff.setIdType(accountInfo.getIdType());
         blackStaff.setStatus(1);//1-下黑，2-反白
-        blackStaff.setReasonIn(dto.getReasonIn());
+        blackStaff.setReasonIn(dto.getRemark());
         blackStaff.setStaffInTime(LocalDateTime.now());
         blackStaff.setCreateOpenId(findOpenIdByToken(dto.getAccessToken()));
         blackStaff.setAgencyIdIn(staff.getAgencyId());

zhywpt-dps-iasq/src/main/java/cn/com/taiji/iasq/model/TaskInfo.java

@@ -35,9 +35,9 @@ public enum TaskInfo implements PriorityTaskDefinition {
     ORDER_REFUND_QUERY("微信、支付宝退费查询",TaskGroup.ATS, "orderRefundQuery", 3600 * 2, true, List.of(1, 2)),
 
     //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_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_HANDLE("同步到老库", TaskGroup.TRANSACTION, "transactionHandle", -1, true, List.of(1, 2)),
 
@@ -48,9 +48,9 @@ public enum TaskInfo implements PriorityTaskDefinition {
 //    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_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)),
 
     ;
 

zhywpt-service-bls/src/test/java/cn/com/taiji/oqs/client/bls/TestBlackCardInManager.java

@@ -68,7 +68,7 @@ public class TestBlackCardInManager extends AbstractCommManager {
     public void cardQuery(){
         CardQueryRequest cardQueryRequest = new CardQueryRequest();
 
-        cardQueryRequest.setCardId("52012223230230868396");
+        cardQueryRequest.setCardId("52012223230230868055");
         try {
             CardQueryResponse response = blackCardQueryManager.serviceHandle(cardQueryRequest);
             System.out.println(response);