Merge remote-tracking branch 'origin/ht' into ht

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

@@ -129,7 +129,7 @@ public class ARSPaymentRecepitAction extends BaseBean implements Action, EsbServ
                 obj.put("BUSINESSUNIT", map.get("GZGSBM"));
                 obj.put("OAID", workflowid);
 
-                logger_c29b3679.error(" operate " + operate);
+//                logger_c29b3679.error(" operate " + operate);
                 obj.put("OPERATETYPE", 1);
                 logger_c29b3679.error(" obj " + obj.toJSONString());
                 HttpClient client = new DefaultHttpClient();
@@ -164,7 +164,7 @@ public class ARSPaymentRecepitAction extends BaseBean implements Action, EsbServ
                         return  WeaResult.fail(500, "ARS接口返回信息:"+ ret.get("message"), getResultMapForAction(weaverResultMap, "result", ret.get("message"), requestInfo.getRequestManager()));
 
                     } else {
-                        if ("2".equals(operate)) {
+                        if ("2".equals(newoperate)) {
                             // 正式formtable_main_2714,测试formtable_main_2252，formtable_main_2401
                             boolean billingno = rs.execute("update e10_core_business.dbo.formtable_main_2401 set hkdh='" + ret.get("billingno") + "' where id=" + requestid);
                             logger_c29b3679.error("billingno　＝　" +billingno);