diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ARSPaymentRecepitAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ARSPaymentRecepitAction.java index e3aa2a7..ba27193 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ARSPaymentRecepitAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ARSPaymentRecepitAction.java @@ -44,10 +44,7 @@ public class ARSPaymentRecepitAction extends BaseBean implements Action, EsbServ @Override public WeaResult> execute(Map requestInfoMap) { - logger_c29b3679.info(String.valueOf("ARSPaymentRecepitAction--start--" + requestInfoMap)); Map weaverResultMap = new HashMap<>(); - logger_c29b3679.info(String.valueOf("requestIdTemp -- " + requestInfoMap.getOrDefault("requestid", -1))); - logger_c29b3679.info(String.valueOf("userid -- " + requestInfoMap.getOrDefault("userid", -1))); Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1))); Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1))); @@ -57,13 +54,18 @@ public class ARSPaymentRecepitAction extends BaseBean implements Action, EsbServ logger_c29b3679.info(String.valueOf("ARSPaymentRecepitAction--start--" + requestid)); try { String workflowid = requestInfo.getWorkflowid(); + logger_c29b3679.info( "workflowid--" + workflowid) ; Map map = new HashMap(); + Property[] properties = requestInfo.getMainTableInfo().getProperty(); for (int i = 0; i < properties.length; i++) { String name = properties[i].getName().toUpperCase(); String value = Util.null2String(properties[i].getValue()); map.put(name, value); } + + + int hklx = 0; if ("0".equals(map.get("HKLX"))) { hklx = 5; @@ -81,14 +83,19 @@ public class ARSPaymentRecepitAction extends BaseBean implements Action, EsbServ hklx = 21; } JSONObject obj = new JSONObject(); + logger_c29b3679.info( "map--" + map) ; ResourceComInfo hrm = I18nContextUtil.getBean(ResourceComInfo.class); + logger_c29b3679.info( "hrm--" + hrm.toString()) ; + RecordSet rs = I18nContextUtil.getBean(RecordSet.class); + logger_c29b3679.info( "rs--" + rs.toString()) ; String currencyCode = ""; - String poolname = CONN_TYPE.workflow.getType(); + String poolname = CONN_TYPE.ebuilder.getType(); // TODO E10执行sql方法第二参数必须指定源,默认使用流程源,单体客户无需修改,微服务/组合客户需根据查询表所属服务切换源,或使用外部数据源 - rs.executeSql("select e10_common.dbo.currencyCode from uf_eas_currency where id=" + map.get("BZ"), poolname); + rs.executeSql("select currencyCode e10_common.dbo.from uf_eas_currency where id=" + map.get("BZ"), poolname); while (rs.next()) { currencyCode = rs.getString("currencyCode"); + logger_c29b3679.info( "currencyCode--" + currencyCode) ; } obj.put("ITFID", "ARSOA01"); obj.put("SYSID", "SYS006"); @@ -112,6 +119,7 @@ public class ARSPaymentRecepitAction extends BaseBean implements Action, EsbServ obj.put("OPERATETYPE", operate); logger_c29b3679.info(" obj " + obj.toJSONString()); HttpClient client = new DefaultHttpClient(); + // String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htcrmoasync.CreateBilling")).trim(); // String appkey = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htcrmoasync.appkey")).trim(); String url = configProp.getCreateBilling(); @@ -150,6 +158,7 @@ public class ARSPaymentRecepitAction extends BaseBean implements Action, EsbServ logger_c29b3679.info(String.valueOf("ARSPaymentRecepitAction--error--" + requestid + "|" + e.toString())); requestInfo.getRequestManager().setMessageid("ERROR"); requestInfo.getRequestManager().setMessagecontent("调用ARS接口出错" + e.toString()); + logger_c29b3679.error("ARSPaymentRecepitAction e: {}", e.getMessage()); e.printStackTrace(); return WeaResult.fail(500, "出错啦", getResultMapForAction(weaverResultMap, "result", e.getMessage(), requestInfo.getRequestManager())); } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/AddVenMatExtsToSrmAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/AddVenMatExtsToSrmAction.java index fd06633..ed60a21 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/AddVenMatExtsToSrmAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/AddVenMatExtsToSrmAction.java @@ -51,8 +51,6 @@ public class AddVenMatExtsToSrmAction extends BaseBean implements Action, EsbSer logger_336cd654.info("requestIdTemp"+requestIdTemp); logger_336cd654.info("userIdTemp"+userIdTemp); - String lastoperator = request.getLastoperator(); - logger_336cd654.info("lastoperator"+lastoperator); try { // 流程请求ID String requestId = request.getRequestid(); @@ -123,7 +121,7 @@ public class AddVenMatExtsToSrmAction extends BaseBean implements Action, EsbSer // handleType = "1"; // } } - checkUser = hr.getResourcename(request.getLastoperator()); + checkUser = hr.getResourcename(String.valueOf(userIdTemp)); logger_336cd654.info("checkUser==="+ checkUser); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/AddVenMatExtsToSrmCheckAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/AddVenMatExtsToSrmCheckAction.java index 44a49e4..d2328da 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/AddVenMatExtsToSrmCheckAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/AddVenMatExtsToSrmCheckAction.java @@ -112,7 +112,10 @@ public class AddVenMatExtsToSrmCheckAction extends BaseBean implements Action, E // handleType = "1"; // } } - checkUser = hr.getResourcename(request.getLastoperator()); + //TODO custom edit +// checkUser = hr.getResourcename(request.getLastoperator()); + checkUser = hr.getResourcename(String.valueOf(userIdTemp)); + oainputvendor.setRequestId(requestId); oainputvendor.setCompanyCode(companyCode); oainputvendor.setCompanyName(companyName);