Explorar el Código

验真暂时屏蔽

dudm hace 3 años
padre
commit
92740d0a85

+ 4 - 10
sc-service/src/main/java/com/huyi/service/bill/controller/OwnBillController.java

@@ -255,7 +255,7 @@ public class OwnBillController extends BaseController {
             //附件
             String ziiFile = CommonUtil.objToString(file.get("ziiFile"));
             if (!"1".equals(ziiCheckStt)) {
-                return R.fail(500,"存在未验真或验真未通过发票,不可进行账款关联");
+//                return R.fail(500,"存在未验真或验真未通过发票,不可进行账款关联");
             }
             //贸易日期前一个月
             Calendar startDate = Calendar.getInstance();
@@ -436,7 +436,7 @@ public class OwnBillController extends BaseController {
             //附件
             String ziiFile = CommonUtil.objToString(file.get("ziiFile"));
             if (!"1".equals(ziiCheckStt)) {
-                return R.fail(500,"存在未验真或验真未通过发票,不可进行账款关联");
+//                return R.fail(500,"存在未验真或验真未通过发票,不可进行账款关联");
             }
             //贸易日期前一个月
             Calendar startDate = Calendar.getInstance();
@@ -734,6 +734,7 @@ public class OwnBillController extends BaseController {
             //发票状态
             queryWrapper.eq(ZcInvoiceInf::getZiiStatus,"00");
             List<ZcInvoiceInf> list = iZcInvoiceInfService.findZcInvoiceInfs(queryWrapper);
+            params.put("zbiName",null);
             //不重复则储存发票并上传
             if(list.size() == 0){
                 if(i != 0 && i != (jsonArray.size() - 1) && i != checkNum){
@@ -741,16 +742,11 @@ public class OwnBillController extends BaseController {
                     params.put("ziiCheckStt","1");
                 }else{
                     //验真发票
-                    params = iOwnBillService.invoiceVerification(params);
+//                    params = iOwnBillService.invoiceVerification(params);
                 }
             }else{
                 if(!CHECK_SUCCESS.equals(ziiCheckStt)){
                     params.put("ziiCheckStt","3");
-                }
-            }
-            //将发票对象转换成Map集合重新组合
-            if (params != null) {
-                if("3".equals(params.get("ziiCheckStt"))){
                     //如果是重复状态查询关联往来账款
                     LambdaQueryWrapper<ZcBillInvoiceRel> relQueryWrapper = new LambdaQueryWrapper<>();
                     //发票代码
@@ -759,8 +755,6 @@ public class OwnBillController extends BaseController {
                     //查询往来账款名称返回前台展示
                     ZcBillInf zcBillInf = iZcBillInfService.getById(relList.get(0).getZbirBillId());
                     params.put("zbiName",zcBillInf.getZbiName());
-                }else {
-                    params.put("zbiName",null);
                 }
             }
             zcInvoiceInfs.add(params);

+ 1 - 1
sc-service/src/main/java/com/huyi/service/bill/service/impl/OwnBillServiceImpl.java

@@ -170,7 +170,7 @@ public class OwnBillServiceImpl implements IOwnBillService {
         String amount = zcInvoiceInf.get("ziiExcludedAmount");
         System.out.println("发票验真参数==========>:{token:" + getToken() +
                                                     ",no:" + no +
-                                                    ",number" + number +
+                                                    ",number:" + number +
                                                     ",date:" + date +
                                                     ",checkCode:" + checkCode +
                                                     ",type:" + type +