优化代码提交

src/main/java/com/jkcredit/invoice/credit/custInterface/SelfCarInterServiceImpl.java

@@ -507,14 +507,11 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
             String cardId =  jsonObject.getString("cardId");//卡号 必输
             JSONArray tradeIdModel = jsonObject.getJSONArray("tradeIdModel");//交易ID集合 必输
 
-            String startExTime =  jsonObject.getString("startExTime");//开始时间 必输
-            String endExTime =  jsonObject.getString("endExTime");//结束时间 必输
+            /*String startExTime =  jsonObject.getString("startExTime");//开始时间 必输
+            String endExTime =  jsonObject.getString("endExTime");//结束时间 必输*/
             if(StringUtils.isEmpty(data)|| null == jsonObject || StringUtils.isEmpty(companyNum)
                     || StringUtils.isEmpty(cardId)
                     || null == tradeIdModel
-                    || StringUtils.isEmpty(startExTime)
-                    || StringUtils.isEmpty(endExTime)
-
             ){
                 result.setCode(2);
                 result.setMsg("必传参数有为空情况，请核实后再试");

src/main/java/com/jkcredit/invoice/service/lowerService/impl/CustomerLowerServiceImpl.java

@@ -141,6 +141,10 @@ public class CustomerLowerServiceImpl implements CustomeLowerService {
                     }
                 }
                 customerRec.setId(customerRec1.getId());
+                customerRec.setContractSuc(customerRec1.getContractSuc());
+                customerRec.setContrantNum(customerRec1.getContrantNum());
+                customerRec.setContractFileName(customerRec.getContractFileName()==null?customerRec1.getContractFileName():customerRec.getContractFileName());
+                customerRec.setBase64Str(customerRec.getBase64Str()==null?customerRec1.getBase64Str():customerRec.getBase64Str());
                 customerRecMapper.updateByPrimaryKey(customerRec);
             }
 

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

@@ -144,7 +144,7 @@ public class NoCarServiceImpl implements NoCarService{
                     customerCarRec.setFailReason(respR.getMsg());
                     customerCarRec.setFailTime(DateUtil.getCurrentDateStr());
                 } else {
-                    respRResult = respR.getData();//车辆备案成功
+                    respRResult = respR.getData().toString();//车辆备案成功
                     customerCarRec.setRecStatus(CommonConstants.REC_STATUS_SUC);
                     customerCarRec.setSuccTime(DateUtil.getCurrentDateStr());
                 }
@@ -546,9 +546,8 @@ public class NoCarServiceImpl implements NoCarService{
                     if(noCarCalculateInfor!=null){
                         billInvoice.setCalculateTime(noCarCalculateInfor.getCalculateTime());
                     }else{
-                        if(carCalculateInfors.add(calculateInfor)){
-                            billInvoice.setCalculateTime(calculateInfor.getCalculateTime());
-                        }
+                        carCalculateInfors.add(calculateInfor);
+                        billInvoice.setCalculateTime(calculateInfor.getCalculateTime());
                     }
 
                     billInvoiceMapper.insert(billInvoice);