修改部分问题

conf/system.properties

@@ -150,4 +150,4 @@ fs-sfxmbh:10304240101
 #fs-sfxmbh:103015601
 
 #非税开票
-EInvoiceContent:<Header><EInvoiceTag>CZ-EI-32</EInvoiceTag><EInvoiceID>0986189200-02101023</EInvoiceID><Version>1.1.0</Version></Header><EInvoiceData><Main><EInvoiceName>\u6c5f\u82cf\u7701\u975e\u7a0e\u6536\u5165\u7edf\u4e00\u7968\u636e\uff08\u7535\u5b50\uff09</EInvoiceName><EInvoiceCode>{{EInvoiceCode}}</EInvoiceCode><EInvoiceNumber>{{EInvoiceNumber}}</EInvoiceNumber><RandomNumber>{{random}}</RandomNumber><EInvoiceSpecimenCode>3201012010</EInvoiceSpecimenCode><SupervisorAreaCode>320100</SupervisorAreaCode><TotalAmount>{{yjje}}</TotalAmount><IssueDate>{{kprq}}</IssueDate><IssueTime>{{kpsj}}</IssueTime><InvoicingParty><InvoicingPartyCode>708002</InvoicingPartyCode><InvoicingPartyName>\u5357\u4eac\u5e02\u57ce\u5e02\u5efa\u8bbe\u8d39\u7528\u5f81\u6536\u670d\u52a1\u4e2d\u5fc3</InvoicingPartyName><RecName>\u5357\u4eac\u5e02\u57ce\u5e02\u5efa\u8bbe\u8d39\u7528\u5f81\u6536\u670d\u52a1\u4e2d\u5fc3</RecName><RecAcct>10105901040000062</RecAcct><RecOpBk>\u5357\u4eac\u519c\u884c\u9f13\u697c\u652f\u884c</RecOpBk></InvoicingParty><PayerParty><PayerPartyType>2</PayerPartyType><PayerPartyCode/><PayerPartyName>{{jkr}}</PayerPartyName><PayerAcct/><PayerOpBk/></PayerParty><PayMode/><BizCode>{{lsh}}</BizCode><CurrencyType/><ExchangeRate/><Remark>{{beizhu}}</Remark><HandlingPerson>\u5357\u4eac\u5e02\u57ce\u5e02\u5efa\u8bbe\u8d39\u7528\u5f81\u6536\u670d\u52a1\u4e2d\u5fc3</HandlingPerson><Checker/><SupervisorRemark/><InvoicingPartySeal><SealId>f2ae8a477d7247148adf2e5cd48630e6</SealId><SealName/><SealHash/></InvoicingPartySeal><SupervisorPartySeal><SealId>f2ae8a477d7247148adf2e5cd48630e6</SealId><SealName/><SealHash/></SupervisorPartySeal><MainExt><RelatedInvoiceCode/><RelatedInvoiceNumber/><PayCode>{{jkm}}</PayCode><BusinessNumber/><BusinessDate/><Gender/><Age/><Address/><School/><Faculty/><Major/><Classes/><StudentID/><MedicalType/><MedicalDate/><CaseNumber/><PatientNumber/><HospitalizationNumber/><DepartmentName/><InHospitalDate/><OutHospitalDate/><PrepayAmount/><RechargeAmount/><RefundAmount/><OrgType/><MedicalInsuranceType/><MedicalInsuranceID/><FundPayAmount/><OtherPayAmount/><AccountPayAmount/><OwnPayAmount/><SelfpaymentAmount/><SelfpaymentCost/><Custom1/><Custom2/><Custom3/><Custom4/><Custom5/><Custom6/><Custom7/><Custom8/><Custom9/><Custom10/><Custom11/><Custom12/></MainExt></Main><Details><Item><ItemCode>{{itemCode}}</ItemCode><ItemName>\u57ce\u5e02\u57fa\u7840\u8bbe\u65bd\u914d\u5957\u8d39-\u57ce\u533a</ItemName><ItemQuantity>{{yjmj}}</ItemQuantity><ItemUnit>\u5143</ItemUnit><ItemStd>150.00</ItemStd><ItemAmount>{{yjje}}</ItemAmount><ItemRemark/><ItemExt><ItemDetailName/></ItemExt></Item></Details></EInvoiceData>
+EInvoiceContent:<Header><EInvoiceTag>CZ-EI-32</EInvoiceTag><EInvoiceID>{{EInvoiceID}}</EInvoiceID><Version>1.1.0</Version></Header><EInvoiceData><Main><EInvoiceName>\u6c5f\u82cf\u7701\u975e\u7a0e\u6536\u5165\u7edf\u4e00\u7968\u636e\uff08\u7535\u5b50\uff09</EInvoiceName><EInvoiceCode>{{EInvoiceCode}}</EInvoiceCode><EInvoiceNumber>{{EInvoiceNumber}}</EInvoiceNumber><RandomNumber>{{random}}</RandomNumber><EInvoiceSpecimenCode>3201012010</EInvoiceSpecimenCode><SupervisorAreaCode>320100</SupervisorAreaCode><TotalAmount>{{yjje}}</TotalAmount><IssueDate>{{kprq}}</IssueDate><IssueTime>{{kpsj}}</IssueTime><InvoicingParty><InvoicingPartyCode>708002</InvoicingPartyCode><InvoicingPartyName>\u5357\u4eac\u5e02\u57ce\u5e02\u5efa\u8bbe\u8d39\u7528\u5f81\u6536\u670d\u52a1\u4e2d\u5fc3</InvoicingPartyName><RecName>\u5357\u4eac\u5e02\u57ce\u5e02\u5efa\u8bbe\u8d39\u7528\u5f81\u6536\u670d\u52a1\u4e2d\u5fc3</RecName><RecAcct>10105901040000062</RecAcct><RecOpBk>\u5357\u4eac\u519c\u884c\u9f13\u697c\u652f\u884c</RecOpBk></InvoicingParty><PayerParty><PayerPartyType>2</PayerPartyType><PayerPartyCode/><PayerPartyName>{{jkr}}</PayerPartyName><PayerAcct/><PayerOpBk/></PayerParty><PayMode/><BizCode>{{lsh}}</BizCode><CurrencyType/><ExchangeRate/><Remark>{{beizhu}}</Remark><HandlingPerson>\u5357\u4eac\u5e02\u57ce\u5e02\u5efa\u8bbe\u8d39\u7528\u5f81\u6536\u670d\u52a1\u4e2d\u5fc3</HandlingPerson><Checker/><SupervisorRemark/><InvoicingPartySeal><SealId>f2ae8a477d7247148adf2e5cd48630e6</SealId><SealName/><SealHash/></InvoicingPartySeal><SupervisorPartySeal><SealId>f2ae8a477d7247148adf2e5cd48630e6</SealId><SealName/><SealHash/></SupervisorPartySeal><MainExt><RelatedInvoiceCode/><RelatedInvoiceNumber/><PayCode>{{jkm}}</PayCode><BusinessNumber/><BusinessDate/><Gender/><Age/><Address/><School/><Faculty/><Major/><Classes/><StudentID/><MedicalType/><MedicalDate/><CaseNumber/><PatientNumber/><HospitalizationNumber/><DepartmentName/><InHospitalDate/><OutHospitalDate/><PrepayAmount/><RechargeAmount/><RefundAmount/><OrgType/><MedicalInsuranceType/><MedicalInsuranceID/><FundPayAmount/><OtherPayAmount/><AccountPayAmount/><OwnPayAmount/><SelfpaymentAmount/><SelfpaymentCost/><Custom1/><Custom2/><Custom3/><Custom4/><Custom5/><Custom6/><Custom7/><Custom8/><Custom9/><Custom10/><Custom11/><Custom12/></MainExt></Main><Details><Item><ItemCode>{{itemCode}}</ItemCode><ItemName>\u57ce\u5e02\u57fa\u7840\u8bbe\u65bd\u914d\u5957\u8d39-\u57ce\u533a</ItemName><ItemQuantity>{{yjmj}}</ItemQuantity><ItemUnit>\u5143</ItemUnit><ItemStd>150.00</ItemStd><ItemAmount>{{yjje}}</ItemAmount><ItemRemark/><ItemExt><ItemDetailName/></ItemExt></Item></Details></EInvoiceData>
\ No newline at end of file

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

@@ -125,18 +125,26 @@ public class FsRequest {
      * 查询缴款书状态，是否已缴款
      * @param fstzs
      */
-    public static void jiaokuanzt(Fstzs fstzs) {
+    public static FsResult<JkztResp> jiaokuanzt(Fstzs fstzs) {
         Map<String,Object> map = new HashMap<>();
         map.put("pay_code",fstzs.getJkm());
         String request = request("paybook.confirm.get", map);
+
+        try {
+            if(TextUtils.isEmpty(request)) {
+                return FsResult.fail("网络异常,请重试！");
+            }
             FsResp<JkztResp> resp = new Gson().fromJson(request, new TypeToken<FsResp<JkztResp>>() {
             }.getType());
 
-        if(resp.message != null) {
-            fstzs.setStatus(3);//已缴款
-            fstzs.setIsJk(1);
-            fstzs.setJkTime(resp.message.confirmDate);
-            fstzs.setJkqd(resp.message.paymentChannel);
+            if(resp.errorMessage != null) {
+                return FsResult.fail(resp.errorMessage.errorMsg);
+            }
+            return new FsResult<>(resp.message);
+        } catch (Exception e) {
+            System.out.println("激活请求异常！！");
+            return FsResult.fail("激活请求异常！！" + e.getMessage());
+
         }
     }
 
@@ -176,6 +184,8 @@ public class FsRequest {
         payCodeInfo.add(payCodeInfoMap);
         map.put("pay_code_info",payCodeInfo);// 多张缴款书缴款完成后，开具电子票据需要传1张对应的缴款码
         String xml = getProp("EInvoiceContent");
+        String eInvoiceID = new StringBuffer(respPh.message.billBatchCode + "-" + respPh.message.billNo).reverse().toString();
+        xml = xml.replaceAll("\\{\\{EInvoiceID}}",eInvoiceID);
         xml = xml.replaceAll("\\{\\{EInvoiceCode}}",respPh.message.billBatchCode);
         xml = xml.replaceAll("\\{\\{EInvoiceNumber}}",respPh.message.billNo);
         xml = xml.replaceAll("\\{\\{random}}",new Random().nextInt(100000) + "");

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

@@ -10,6 +10,7 @@ import com.jshx.core.json.DateJsonValueProcessor;
 import com.jshx.fstzs.entity.Fstzs;
 import com.jshx.fstzs.entity.FstzsXm;
 import com.jshx.fstzs.fsutil.bean.FsResult;
+import com.jshx.fstzs.fsutil.bean.JkztResp;
 import com.jshx.fstzs.fsutil.bean.KjjksResp;
 import com.jshx.fstzs.fsutil.bean.KpResp;
 import com.jshx.fstzs.service.FstzsService;
@@ -519,7 +520,19 @@ public class FstzsAction extends BaseAction {
         List<Fstzs> list = fstzsService.findList(paraMap);
         list.stream().map(i-> {
             //2，循环接口请求缴费状态
-            FsRequest.jiaokuanzt(i);
+            FsResult<JkztResp> jiaokuanzt = FsRequest.jiaokuanzt(i);
+            if(jiaokuanzt.success) {
+                i.setStatus(3);//已缴款
+                i.setIsJk(1);
+                i.setJkTime(jiaokuanzt.data.confirmDate);
+                i.setJkqd(jiaokuanzt.data.paymentChannel);
+            } else {
+                try {
+                    FstzsAction.this.getResponse().getWriter().println("{\"result\":"+false+",\"message\":\"" + jiaokuanzt.msg + "!"+"\"}");
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
             return i;
         }).forEach(i-> fstzsService.update(i));
     }

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

@@ -5,6 +5,8 @@ import com.jshx.core.base.vo.Pagination;
 import com.jshx.core.utils.SysPropertiesUtil;
 import com.jshx.fstzs.entity.Fstzs;
 import com.jshx.fstzs.fsutil.FsRequest;
+import com.jshx.fstzs.fsutil.bean.FsResult;
+import com.jshx.fstzs.fsutil.bean.JkztResp;
 import com.jshx.fstzs.service.FstzsService;
 import com.jshx.jkfsjlb.entity.Jkfsjlb;
 import com.jshx.jkfsjlb.service.JkfsjlbService;
@@ -37,7 +39,15 @@ public class FstzsDsrw {
         List<Fstzs> list = fstzsService.findList(paraMap);
         list.stream().map(i-> {
             //2，循环接口请求缴费状态
-            FsRequest.jiaokuanzt(i);
+            FsResult<JkztResp> jiaokuanzt = FsRequest.jiaokuanzt(i);
+            if(jiaokuanzt.success) {
+                i.setStatus(3);//已缴款
+                i.setIsJk(1);
+                i.setJkTime(jiaokuanzt.data.confirmDate);
+                i.setJkqd(jiaokuanzt.data.paymentChannel);
+            } else {
+
+            }
             return i;
         }).forEach(i-> fstzsService.update(i));
     }