20220327_1后端日志更新代码_红冲发票查询接口

src/main/java/com/jkcredit/invoice/credit/interserver/NoCarInterServiceImpl.java

@@ -1,6 +1,7 @@
 package com.jkcredit.invoice.credit.interserver;
 
 import cn.com.taiji.sdk.model.comm.protocol.tts.vehicle.VehicleQueryResponse;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.jkcredit.invoice.common.DataResult;
 import com.jkcredit.invoice.mapper.binvoce.BillInvoiceMapper;
@@ -847,50 +848,62 @@ public class NoCarInterServiceImpl implements NoCarInterService {
         try {
             log.info("[-NoCarInterServiceImpl.redInkInvoiceQuery-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data+ " ,requestid=" +requestid);
             JSONObject jsonObject = JSONObject.parseObject(data);
-            String companyNum =  jsonObject.getString("companyNum");//企业编号 必输
+            String taxplayerCode =  jsonObject.getString("taxplayerCode");//企业税号 必输
             String month = jsonObject.getString("month");//开票月份 样例：yyyy-MM   必输
             if(StringUtils.isEmpty(data)|| null == jsonObject){
                 return  result;
             }
-            if( StringUtils.isEmpty(companyNum) || StringUtils.isEmpty(month)
-                    ){
+            if(StringUtils.isEmpty(taxplayerCode) || StringUtils.isEmpty(month)){
                 return  result;
             }
 
 
-            if (  null == DateUtil.parseDate(month)){
+            if (null == DateUtil.parseDate(month)){
                 result.setMsg("日期格式不正确！");
                 return  result;
             }
-            CustomerRec customerRec2 = new CustomerRec();
-            customerRec2.setCustomerName(appKey);
-            customerRec2.setCompanyNum(companyNum);
-            CustomerRec customerRec1 = customerRecMapper.selectByCustomerNameAndCompanyNum(customerRec2);
-            if (null == customerRec1 || customerRec1.getRecStatus() != 1){
-                result.setMsg("企业还未备案成功！");
-                return result;
-            }
-
+            String companyNum = paramService.getParamsByParamName("REQUEST_COMPANY_NUM").getParamValue();
             HCInvoiceQueryVo hcInvoiceQueryVo = new HCInvoiceQueryVo();
-            hcInvoiceQueryVo.setCustomerName(appKey);
             hcInvoiceQueryVo.setCompanyNum(companyNum);
-            hcInvoiceQueryVo.setCompanyName(customerRec1.getCompanyName());
             hcInvoiceQueryVo.setMonth(month);
             RespR rs = noCarService.hCInvoiceQuery(hcInvoiceQueryVo);
-
             long costtimeend = System.currentTimeMillis();
             log.info("[-NoCarInterServiceImpl.redInkInvoiceQuery-] result is "
                     + rs.toString() + ", request is " + data + " ,costtime="
                     + (costtimeend - costtimestart));
             if(null != rs && rs.getCode() == 0){
+                JSONObject jb = JSONObject.parseObject(rs.getData().toString());
+                if ("成功".equals(jb.getString("info"))){
+                    com.alibaba.fastjson.JSONArray ja = jb.getJSONArray("result");
+                 int  zero= 0 ;
+                  for ( int  i= 0 ;i<ja.size();i++){
+                      if (!ja.getJSONObject(i).getString("buyerTaxpayerCode").equals(taxplayerCode)){
+                          zero++;
+                      }
+                  }
+                 com.alibaba.fastjson.JSONArray jc = new com.alibaba.fastjson.JSONArray(ja.size()-zero);
+                 int  j= 0 ;
+                  for ( int  i= 0 ;i<ja.size();i++){
+                      if (ja.getJSONObject(i).getString("buyerTaxpayerCode").equals(taxplayerCode)){
+                          jc.add(j,ja.get(i));
+                          j++;
+                      }
+                  }
+                  jb.put("result",jc);
+                }else{
+                    result.setData(3);
+                    result.setCode(200);
+                    result.setMsg("查询失败");
+                    return result;
+                }
                 result.setData(1);
                 result.setCode(200);
-                result.setMsg(rs.getData().toString());
+                result.setMsg(jb.toString());
                 return result;
             } else {
                 result.setData(3);
                 result.setCode(200);
-                result.setMsg(rs.getMsg());
+                result.setMsg("查询失败");
                 return result;
             }
         } catch (Exception e) {

src/main/java/com/jkcredit/invoice/service/lowerservice/impl/NoCarServiceImpl.java

@@ -692,8 +692,8 @@ public class NoCarServiceImpl implements NoCarService{
     public RespR hCInvoiceQuery(HCInvoiceQueryVo hcInvoiceQueryVo) {
         log.info("取红冲票啦：NoCarServiceImpl.hCInvoiceQuery{}",hcInvoiceQueryVo);
         WaybillInvoiceRedQueryRequest redQueryRequest = new WaybillInvoiceRedQueryRequest();
-        //String companyNum = paramService.getParamsByParamName("REQUEST_COMPANY_NUM").getParamValue();
-        redQueryRequest.setCompanyNum(hcInvoiceQueryVo.getCompanyNum());
+        String companyNum = paramService.getParamsByParamName("REQUEST_COMPANY_NUM").getParamValue();
+        redQueryRequest.setCompanyNum(companyNum);
         redQueryRequest.setMonth(hcInvoiceQueryVo.getMonth());
 
         RespR<WaybillInvoiceRedQueryResponse> respR = noCarInterface.waybillInvoiceRedQuery(redQueryRequest);

src/main/java/com/jkcredit/invoice/util/DateUtil.java

@@ -301,9 +301,38 @@ public class DateUtil {
         return format.format(now.getTime());
 
     }
+    /**
+     * 判断给定时间与给定时间相差多少小时
+     * @param date
+     * @return
+     */
+    public static long getDistanceHoursTwo(String date,String data2) {
+        DateTimeFormatter format = DateTimeFormat .forPattern("yyyy-MM-dd HH:mm:ss");
+        DateTime dateTime = DateTime.parse(date, format);
+
+        DateTime dateTime2 = DateTime.parse(data2, format);
 
+        long hours = 0;
+        try {
+            //String转Date
+            Date time = dateTime.toDate();
+            Date timeTwo = dateTime2.toDate();
+
+            long time1 = time.getTime();
+            long time2 = timeTwo.getTime();
+            long diff = time1 - time2;
+            hours = diff / (60 * 60*1000 );
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        //正数表示在当前时间之后，负数表示在当前时间之前
+        return hours;
+    }
     public static void main(String [] args){
-        System.out.print(getDateAfterDays("2021-10-31",1));;
+       // System.out.print(getDateAfterDays("2021-10-31",1));;
+
+        System.out.println(DateUtil.getDistanceHoursTwo("2022-02-26 09:02:26","2022-03-01 09:02:58"));
     }
 
 
@@ -345,3 +374,5 @@ public class DateUtil {
 
 
 }
+
+