|
@@ -14,6 +14,7 @@ import com.jkcredit.invoice.model.entity.customer.CustomerRec;
|
|
|
import com.jkcredit.invoice.model.entity.invoice.BillInvoice;
|
|
|
import com.jkcredit.invoice.model.entity.manager.Param;
|
|
|
import com.jkcredit.invoice.model.entity.waybill.NoCarWayBill;
|
|
|
+import com.jkcredit.invoice.model.entity.waybill.NoCarWayBillFileInfo;
|
|
|
import com.jkcredit.invoice.service.customer.CustomerRecService;
|
|
|
import com.jkcredit.invoice.service.lowerservice.NoCarService;
|
|
|
import com.jkcredit.invoice.service.lowerservice.vo.HcInvoiceQueryVo;
|
|
@@ -29,7 +30,7 @@ import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
-
|
|
|
+import com.jkcredit.invoice.service.nocar.WayBillFileService;
|
|
|
import static com.jkcredit.invoice.common.CommonConst.*;
|
|
|
import static java.util.stream.Collectors.toList;
|
|
|
|
|
@@ -58,6 +59,8 @@ public class NoCarInterServiceImpl implements NoCarInterService {
|
|
|
ParamService paramService;
|
|
|
@Autowired
|
|
|
private NoCarService noCarService;
|
|
|
+ @Autowired
|
|
|
+ private WayBillFileService wayBillFileService;
|
|
|
|
|
|
public static void main(String[] args) {
|
|
|
List<String> list1 = new ArrayList<String>();
|
|
@@ -311,9 +314,9 @@ public class NoCarInterServiceImpl implements NoCarInterService {
|
|
|
|| null == fee
|
|
|
|| null == titleType
|
|
|
|| StringUtils.isEmpty(taxplayerCode)
|
|
|
- || StringUtils.isEmpty(base64Str)
|
|
|
+ /*|| StringUtils.isEmpty(base64Str)
|
|
|
|| StringUtils.isEmpty(waybillFileName)
|
|
|
- || null == contractType
|
|
|
+ || null == contractType*/
|
|
|
|
|
|
) {
|
|
|
result.setMsg("必传参数有空值");
|
|
@@ -339,7 +342,18 @@ public class NoCarInterServiceImpl implements NoCarInterService {
|
|
|
noCarWayBill.setWaybillFileName(waybillFileName);
|
|
|
noCarWayBill.setBase64Str(base64Str);
|
|
|
noCarWayBill.setContractType(contractType);
|
|
|
- return getDataResult(appKey, data, costtimestart, result, customerRec, noCarWayBill);
|
|
|
+ DataResult dataResult = getDataResult(appKey, data, costtimestart, result, customerRec, noCarWayBill);
|
|
|
+ if(dataResult.getCode() == 0){
|
|
|
+ NoCarWayBillFileInfo noCarWayBillFileInfo = new NoCarWayBillFileInfo();
|
|
|
+ noCarWayBillFileInfo.setBase64Str(base64Str);
|
|
|
+ noCarWayBillFileInfo.setFileName(waybillFileName);
|
|
|
+ noCarWayBillFileInfo.setWayBillNum(num);
|
|
|
+ noCarWayBillFileInfo.setCustomerId(appKey);
|
|
|
+ noCarWayBillFileInfo.setCompanyName(noCarWayBill.getCompanyName());
|
|
|
+ noCarWayBillFileInfo.setUpdateTime(DateUtil.getCurrentDateStr());
|
|
|
+ wayBillFileService.insert(noCarWayBillFileInfo);
|
|
|
+ }
|
|
|
+ return dataResult;
|
|
|
} catch (Exception e) {
|
|
|
log.error("[-NoCarInterServiceImpl.noCarBillStart-] get httpclient exception is "
|
|
|
+ e + ", request is " + data);
|
|
@@ -518,9 +532,9 @@ public class NoCarInterServiceImpl implements NoCarInterService {
|
|
|
|| null == fee
|
|
|
|| null == titleType
|
|
|
|| StringUtils.isEmpty(taxplayerCode)
|
|
|
- || StringUtils.isEmpty(base64Str)
|
|
|
+ /*|| StringUtils.isEmpty(base64Str)
|
|
|
|| StringUtils.isEmpty(waybillFileName)
|
|
|
- || null == contractType
|
|
|
+ || null == contractType*/
|
|
|
) {
|
|
|
result.setMsg("有空的必填运单要素,请检查");
|
|
|
return result;
|
|
@@ -561,7 +575,20 @@ public class NoCarInterServiceImpl implements NoCarInterService {
|
|
|
if (checkCustomerCarRecQueryResult(result, noCarWayBill, customerCarRecs, customerCarRec)) {
|
|
|
return result;
|
|
|
}
|
|
|
- return getDataResultss(data, costtimestart, result, noCarService.noCarHisWaybillStart(noCarWayBill), "[-NoCarInterServiceImpl.noCarHisWaybillStart-] result is ");
|
|
|
+ RespR respR = noCarService.noCarHisWaybillStart(noCarWayBill);
|
|
|
+ if(respR.getCode() == 0){
|
|
|
+ //上传成功后文件入库
|
|
|
+ NoCarWayBillFileInfo noCarWayBillFileInfo = new NoCarWayBillFileInfo();
|
|
|
+ noCarWayBillFileInfo.setBase64Str(base64Str);
|
|
|
+ noCarWayBillFileInfo.setFileName(waybillFileName);
|
|
|
+ noCarWayBillFileInfo.setBatchNum("接口运单");
|
|
|
+ noCarWayBillFileInfo.setWayBillNum(num);
|
|
|
+ noCarWayBillFileInfo.setUpdateTime(DateUtil.getCurrentDateStr());
|
|
|
+ noCarWayBillFileInfo.setCustomerId(appKey);
|
|
|
+ noCarWayBillFileInfo.setCompanyName(noCarWayBill.getCompanyName());
|
|
|
+ wayBillFileService.insert(noCarWayBillFileInfo);
|
|
|
+ }
|
|
|
+ return getDataResultss(data, costtimestart, result, respR, "[-NoCarInterServiceImpl.noCarHisWaybillStart-] result is ");
|
|
|
} catch (Exception e) {
|
|
|
log.error("[-NoCarInterServiceImpl.noCarHisWaybillStart-] get httpclient exception is "
|
|
|
+ e + ", request is " + data);
|