CloseAccountAction update

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CloseAccountAction.java

@@ -40,16 +40,18 @@ public class CloseAccountAction extends BaseBean implements Action, EsbServerles
     }
 
     public WeaResult<Map<String, Object>> execute(Map<String, Object> requestInfoMap) {
+        logger_ac56032a.info("CloseAccountAction start");
         Map<String, Object> weaverResultMap = new HashMap<>();
         Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1)));
         Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1)));
         RequestInfo request = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp);
-        logger_ac56032a.info("CloseAccountAction start");
         try {
             String requestId = request.getRequestid();
             String wfid = request.getWorkflowid();
-            BillFieldUtil bill = new BillFieldUtil();
-            String tablename = bill.getTablename(wfid);
+//            BillFieldUtil bill = new BillFieldUtil();
+//            String tablename = bill.getTablename(wfid);
+            String tablename = request.getRequestManager().getBillTableName();
+            logger_ac56032a.info("tablename--" + tablename);
             RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
             String status = "";
             String message = "";
@@ -116,6 +118,7 @@ public class CloseAccountAction extends BaseBean implements Action, EsbServerles
                     }
                 }
                 sql_error = "update " + tablename + " set status='" + status + "',message='" + message + "' where requestId=" + requestId;
+                logger_ac56032a.info("sql_error -- " + sql_error);
                 String poolname_1n = CONN_TYPE.workflow.getType();
                 // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
                 rs.executeSql(sql_error, poolname_1n);
@@ -126,18 +129,20 @@ public class CloseAccountAction extends BaseBean implements Action, EsbServerles
                 }
             } catch (Exception e) {
                 sql_error = "update " + tablename + " set status='E',message='" + e.toString() + "' where requestId=" + requestId;
+                logger_ac56032a.info("sql_error -- " + sql_error);
                 String poolname = CONN_TYPE.workflow.getType();
                 // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
                 rs.executeSql(sql_error, poolname);
                 logger_ac56032a.info(String.valueOf(requestId + "批量销户失败：" + e.toString()));
                 request.getRequestManager().setMessageid("ERROR");
                 request.getRequestManager().setMessagecontent("门户返回错误信息：" + e.toString());
+                return  WeaResult.fail(500, "出错啦", getResultMapForAction(weaverResultMap, "result", "", request.getRequestManager()));
             }
             return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager()));
         } catch (Exception e) {
             e.printStackTrace();
             logger_ac56032a.error("CloseAccountAction e: {}", e.getMessage());
-            return WeaResult.success(getResultMapForAction(weaverResultMap, "result", WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), request.getRequestManager())), request.getRequestManager()));
+            return  WeaResult.fail(500, "出错啦", getResultMapForAction(weaverResultMap, "result", "", request.getRequestManager()));
         }
     }