修改部分问题

WebRoot/WEB-INF/pages/fstzs/Fstzs_Yjh.jsp

@@ -48,6 +48,30 @@
 			search_fstzs();
         }
 
+		/**
+		 * 查询缴费状态
+		 */
+		function queryJfzt() {
+			$.ajax({
+				url : "${ctx}/jsp/fstzs/queryJfzt.action",
+				type: 'post',
+				dataType: 'json',
+				async : false,
+				error: function (data) {
+					$.messager.alert('错误', data.message);
+				},
+				success: function (data) {
+					if (data.result) {
+						$.messager.alert("提示",data.message)
+						reloadDate()
+					} else {
+						$.messager.alert('错误', '验证失败,'+data.message);
+						return;
+					}
+				}
+			});
+		}
+
         function search_fstzs(){
         	var queryParams = {
 				"fstzs.slbh": $("#slbh").val(),
@@ -86,8 +110,8 @@
 								}
 								return result;
 							}},
-				          	{field:'jkm',title:'缴款码',width:100},
-							{field:'bzrq',title:'编制日期',width:100},
+				          	{field:'jkm',title:'缴款码',width:200},
+							{field:'bzrq',title:'编制日期',width:180},
 							{field:'slbh',title:'受理编号',width:100},
 							{field:'jsdwmc',title:'建设单位名称',width:100},
 							{field:'gcxmmc',title:'工程项目名称',width:100},
@@ -105,7 +129,7 @@
 						text:'刷新缴费状态',
 						iconCls:'icon-ok',
 						handler:function(){
-							addNew();
+							queryJfzt();
 						}
 					}
 				]

WebRoot/WEB-INF/pages/fstzs/Fstzs_Yjk.jsp

@@ -92,10 +92,20 @@
                         data:{
                             id : id
                         },
-                        async : false
+                        async : false,
+                        error: function (data) {
+                            $.messager.alert('错误', data.message);
+                        },
+                        success: function (data) {
+                            if (data.result) {
+                                $.messager.alert("提示",data.message)
+                                reloadDate()
+                            } else {
+                                $.messager.alert('错误', data.message);
+                            }
+                        }
                     });
-                    $.messager.alert("提示","操作成功")
-                    reloadDate()
+
                 }
             });
         }

conf/jdbc.properties

@@ -47,7 +47,7 @@ db.driverClassName=oracle.jdbc.driver.OracleDriver
 #db.url = jdbc:oracle:thin:@202.102.101.92:1521:oradb
 #db.url = jdbc:oracle:thin:@10.1.163.147:1521/orcl
 
-# 2121测试 start -------------------------------------
+# 现场测试 start -------------------------------------
 #db.url = jdbc:oracle:thin:@192.168.1.244:1521/orcl
 #db.username = zsb1016
 #db.password = 123456

src/com/jshx/fstzs/conf/struts-fstzs.xml

@@ -90,5 +90,9 @@
 		<action name="kaipiao" class="com.jshx.fstzs.web.FstzsAction" method="kaipiao">
 		</action>
 
+		<!--查询缴费状态-->
+		<action name="queryJfzt" class="com.jshx.fstzs.web.FstzsAction" method="queryJfzt">
+		</action>
+
 	</package>
 </struts>

src/com/jshx/fstzs/fsutil/FsRequest.java

@@ -24,11 +24,16 @@ public class FsRequest {
         return SysPropertiesUtil.getProperty(key);
     }
     private static String request(String method,Map<String, Object> data) {
+        System.out.println("method：" + method);
+        System.out.println("param：" + new Gson().toJson(data));
         Map<String, String> params = ParamsUtil.getParams(method, data);
         try {
             String post = HttpclientUtil.post(getProp("fs-url"), params);
+
             if(post != null) {
-                return new String(CodeUtil.base64Decode(post));
+                String resp = new String(CodeUtil.base64Decode(post));
+                System.out.println("resp：" + resp);
+                return resp;
             }
             return post;
         } catch (Exception e) {
@@ -83,10 +88,11 @@ public class FsRequest {
             String request = request("paybook.e.issue.do", map);
             FsResp<KjjksResp> resp = new Gson().fromJson(request, new TypeToken<FsResp<KjjksResp>>() {
             }.getType());
-
             return resp.message;
         } catch (Exception e) {
+            System.out.println("激活请求异常！！");
             return null;
+
         }
 
     }
@@ -107,9 +113,8 @@ public class FsRequest {
     /**
      * 查询缴款书状态，是否已缴款
      * @param fstzs
-     * @param service
      */
-    public static void jiaokuanzt(Fstzs fstzs,FstzsService service) {
+    public static void jiaokuanzt(Fstzs fstzs) {
         Map<String,Object> map = new HashMap<>();
         map.put("pay_code",fstzs.getJkm());
         String request = request("paybook.confirm.get", map);
@@ -121,7 +126,6 @@ public class FsRequest {
             fstzs.setIsJk(1);
             fstzs.setJkTime(resp.message.confirmDate);
             fstzs.setJkqd(resp.message.paymentChannel);
-            service.update(fstzs);
         }
     }
 
@@ -134,7 +138,9 @@ public class FsRequest {
         FsResp<KaipiaoResp> respPh = new Gson().fromJson(requestPh, new TypeToken<FsResp<KaipiaoResp>>() {
         }.getType());
         //2,通过电子票号 开票
-
+        if(respPh.message == null) {
+            return false;
+        }
         Map<String,Object> map = new HashMap<>();
         map.put("serial_number",System.currentTimeMillis() + "");//业务流水号，不能重复
         map.put("place_code",getProp("fs-kpdbm"));//开票点编码

src/com/jshx/fstzs/web/FstzsAction.java

@@ -88,8 +88,8 @@ public class FstzsAction extends BaseAction {
         if(status != null) {
             statusList.add(status);
         } else {
-            statusList.add(1);//待复核
-            statusList.add(2);//待激活
+            statusList.add(1);//已激活
+            statusList.add(2);//已作废
 
         }
         paraMap.put("status",statusList);
@@ -417,23 +417,40 @@ public class FstzsAction extends BaseAction {
         if(result) {
             list.stream().forEach(i-> {
                 // 需要调用财政系统，作废接口
-                boolean r = FsRequest.zuofei(i);
-                if(r) {
-                    fstzs.setStatus(2);//已作废
-                    fstzsService.update(fstzs);
+                boolean r = true;
+                if(i.getStatus() != 2) {//已作废的不再重复作废
+                    r = FsRequest.zuofei(i);
+                    if(r) {
+                        i.setStatus(2);//已作废
+                        fstzsService.update(i);
+                    }
                 }
+
             });
-            xm.setStatus(4);//已作废
-            fstzsXmService.update(xm);
+
+            //获取未作废成功的数据
+            List<Fstzs> failList = list.stream().filter(i -> i.getStatus() != 2).collect(Collectors.toList());
+            if(failList == null || failList.size() == 0) {//都作废成功，才修改项目状态
+                xm.setStatus(4);//已作废
+                fstzsXmService.update(xm);
+            } else {
+                result = false;
+                message = "请重新操作！";
+            }
+
+            this.getResponse().getWriter().println("{\"result\":"+result+",\"message\":\"" + message + "!"+"\"}");
         }
 
-        this.getResponse().getWriter().println("{\"result\":"+result+",\"message\":\"" + message + "!"+"\"}");
+
     }
 
     /**
      * 开票
      */
-    public void kaipiao() {
+    public void kaipiao() throws IOException {
+        boolean result = true;
+        String message = "OK";
+
         Fstzs fstzs = fstzsService.getById(id);
         FstzsXm xm = fstzsXmService.getBySlbh(fstzs.getSlbh());
         String jbr = this.getLoginUser().getDisplayName();
@@ -444,8 +461,13 @@ public class FstzsAction extends BaseAction {
             fstzs.setKpJbr(jbr);
             fstzs.setKpTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
             fstzsService.update(fstzs);
+        } else {
+            result = false;
+            message = "开票失败";
         }
 
+        this.getResponse().getWriter().println("{\"result\":"+result+",\"message\":\"" + message + "!"+"\"}");
+
     }
 
     /**
@@ -470,6 +492,31 @@ public class FstzsAction extends BaseAction {
         return RELOAD;
     }
 
+    /**
+     * 缴费状态查询
+     */
+    public void queryJfzt() throws IOException {
+        Map<String, Object> paraMap = new HashMap<String, Object>();
+        paraMap.put("status",new ArrayList<Integer>(){{
+            add(1);//已激活
+        }});
+
+        /**
+         * 先返回，在请求接口
+         */
+        this.getResponse().getWriter().println("{\"result\":"+true+",\"message\":\"更新中，请稍后刷新列表!"+"\"}");
+
+        //1，查询全部未激活的信息
+        List<Fstzs> list = fstzsService.findList(paraMap);
+        list.stream().map(i-> {
+            //2，循环接口请求缴费状态
+            FsRequest.jiaokuanzt(i);
+            return i;
+        }).forEach(i-> fstzsService.update(i));
+
+
+    }
+
     public Pagination getPagination() {
         return pagination;
     }