后端代码提交

src/main/java/com/jkcredit/invoice/controller/localBussiness/NoCarController.java

@@ -21,6 +21,7 @@ import com.jkcredit.invoice.util.ReadExcelUtil;
 import com.jkcredit.invoice.util.RespR;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.util.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ResourceUtils;
@@ -36,7 +37,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Base64;
 import java.util.List;
-
+@Slf4j
 @Api(tags = "无车操作")
 @RestController
 @RequestMapping(value = {"/noCar"})
@@ -247,6 +248,7 @@ public class NoCarController {
             params.setHeadRows(1);
             params.setKeyIndex(2);
             List<NoCarWayBill> list = ExcelImportUtil.importExcel(file.getInputStream(), NoCarWayBill.class,params);list.remove(0);
+            log.info("1111111111"+list.size());
             buildDate(list);
             RespR respR = noCarBillWayService.batchHsitoryBillWay(list,customerName);
             return respR;
@@ -272,6 +274,7 @@ public class NoCarController {
             params.setKeyIndex(2);
             List<NoCarWayBill> list = ExcelImportUtil.importExcel(file.getInputStream(), NoCarWayBill.class,params);
             buildDateEnd(list);
+            log.info("1111111111"+list.size());
             RespR respR = noCarBillWayService.batchBillWayEnd(list,customerName);
             return respR;
         }catch (Exception e){
@@ -280,7 +283,7 @@ public class NoCarController {
         }
     }
     public void buildDate(List<NoCarWayBill> list){
-        DateFormat format = new SimpleDateFormat("yyyy-MM-dd hh:MM:ss");
+        DateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         for(NoCarWayBill noCarWayBill:list){
             noCarWayBill.setStartTime(format.format(noCarWayBill.getStartTimeDate()));
             noCarWayBill.setPredictEndTime(format.format(noCarWayBill.getPredictEndTimeDate()));
@@ -288,7 +291,7 @@ public class NoCarController {
         }
     }
     public void buildDateEnd(List<NoCarWayBill> list){
-        DateFormat format = new SimpleDateFormat("yyyy-MM-dd hh:MM:ss");
+        DateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         for(NoCarWayBill noCarWayBill:list){
             noCarWayBill.setPredictEndTime(format.format(noCarWayBill.getActEndTimeDate()));
         }
@@ -345,7 +348,7 @@ public class NoCarController {
             OutputStream outputStream = null;
             InputStream inputStream = null;
             try {
-                File file = ResourceUtils.getFile("classpath:static/templates/excel/"+fileName);
+                File file = new File("/home/app/excel/"+fileName);
                 inputStream = new FileInputStream(file);
                 response.setHeader("Content-Disposition", "attachment;filename="+ URLEncoder.encode(fileName, "UTF-8"));
                 outputStream = response.getOutputStream();

src/main/java/com/jkcredit/invoice/controller/localBussiness/SelfCarController.java

@@ -184,7 +184,7 @@ public class SelfCarController {
             TradeRequestVo tradeRequestVo = new TradeRequestVo();
             tradeRequestVo.setCompanyName(tradeRequestCarNumVo.getCompanyName());
             tradeRequestVo.setCustomerName(tradeRequestCarNumVo.getCustomerName());
-            DateFormat format = new SimpleDateFormat("yyyy-MM-dd hh:MM:ss");
+            DateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             tradeRequestVo.setStartTime(format.format(new Date(Long.parseLong(tradeRequestCarNumVo.getStartTime()))));
             tradeRequestVo.setEndTime(format.format(new Date(Long.parseLong(tradeRequestCarNumVo.getEndTime()))));
             tradeRequestVo.setTradeStatus(1);
@@ -214,7 +214,7 @@ public class SelfCarController {
             TradeRequestVo tradeRequestVo = new TradeRequestVo();
             tradeRequestVo.setCompanyName(tradeRequestCarNumVo.getCompanyName());
             tradeRequestVo.setCustomerName(tradeRequestCarNumVo.getCustomerName());
-            DateFormat format = new SimpleDateFormat("yyyy-MM-dd hh:MM:ss");
+            DateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             tradeRequestVo.setStartTime(format.format(new Date(Long.parseLong(tradeRequestCarNumVo.getStartTime()))));
             tradeRequestVo.setEndTime(format.format(new Date(Long.parseLong(tradeRequestCarNumVo.getEndTime()))));
             tradeRequestVo.setTradeStatus(1);

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

@@ -29,6 +29,7 @@ import com.jkcredit.invoice.service.upService.NoCarInterface;
 import com.jkcredit.invoice.util.DateUtil;
 import com.jkcredit.invoice.util.MathUtil;
 import com.jkcredit.invoice.util.RespR;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
@@ -37,7 +38,7 @@ import org.springframework.util.StringUtils;
 
 import java.util.Date;
 import java.util.List;
-
+@Slf4j
 @Repository("noCarService")
 public class NoCarServiceImpl implements NoCarService{
     @Autowired
@@ -122,7 +123,7 @@ public class NoCarServiceImpl implements NoCarService{
                     vehicleRegisterRequest.setServiceOperation(customerCarRec.getServiceOperation());
                 }
                 vehicleRegisterRequest.setCompanyName(customerCarRec.getCompanyName());
-                vehicleRegisterRequest.setCompanyNum(customerRec.getCompanyNum());
+                vehicleRegisterRequest.setCompanyNum(companyNum);
                 vehicleRegisterRequest.setPlateColor(Integer.parseInt(customerCarRec.getCarColor()));
                 vehicleRegisterRequest.setPlateNum(customerCarRec.getCarNum());
                 RespR<VehicleRegisterResponse> respR = noCarInterface.vehicleRegister(vehicleRegisterRequest);
@@ -312,6 +313,11 @@ public class NoCarServiceImpl implements NoCarService{
 
     @Override
     public RespR noCarHisWaybillStart(NoCarWayBill noCarWayBill) {
+        NoCarWayBill noCarWayBill1 = noCarWaybillMapper.selectByBillNum(noCarWayBill.getBillNum());
+        //这个后边删掉 TODO
+        if(noCarWayBill1!=null && noCarWayBill1.getBillwayStatus() ==1){
+            return new RespR(true);
+        }
         if(DateUtil.getDistanceDays(noCarWayBill.getStartTime(),new Date())>-20){
             return new RespR(false,"必须是二十天前的运单");
         }
@@ -331,7 +337,7 @@ public class NoCarServiceImpl implements NoCarService{
             noCarWayBill.setBillwayStatus(1);
             noCarWaybillMapper.insert(noCarWayBill);
         }
-        return null;
+        return new RespR(true);
     }
 
     public WaybillHistoryStartRequest BuildNoCarHisWaybill(NoCarWayBill noCarWayBill){
@@ -343,6 +349,7 @@ public class NoCarServiceImpl implements NoCarService{
         waybillStartRequest.setPlateColor(Integer.parseInt(noCarWayBill.getPlateColor()));
         waybillStartRequest.setStartTime(DateUtil.dateFormate(noCarWayBill.getStartTime()));
         waybillStartRequest.setSourceAddr(noCarWayBill.getSourceAddr());
+        waybillStartRequest.setDestAddr(noCarWayBill.getDestAddr());
         waybillStartRequest.setPredictEndTime(DateUtil.dateFormate(noCarWayBill.getPredictEndTime()));
         waybillStartRequest.setFee(noCarWayBill.getFee());
         waybillStartRequest.setTitleType(noCarWayBill.getTitleType());
@@ -365,7 +372,8 @@ public class NoCarServiceImpl implements NoCarService{
             noCarWaybillMapper.updateByBillNum(noCarWayBill1);
             return new RespR(false,"运单已经超时，请拆分");
         }
-        if(noCarWayBill1 == null || noCarWayBill1.getBillwayStatus() !=1 || noCarWayBill.getHisFlag() ==0 ){
+
+        if(noCarWayBill1 == null || noCarWayBill1.getBillwayStatus() !=1 || noCarWayBill1.getHisFlag() ==0 ){
             return new RespR(false,"当前运单状态无法结束");
         }
         WaybillEndRequest waybillEndRequest = new WaybillEndRequest();
@@ -373,7 +381,7 @@ public class NoCarServiceImpl implements NoCarService{
         waybillEndRequest.setCompanyNum(companyNum);
         waybillEndRequest.setNum(noCarWayBill1.getBillNum());
         waybillEndRequest.setRealDestAddr(noCarWayBill1.getDestAddr());
-        waybillEndRequest.setEndTime(noCarWayBill1.getPredictEndTime());
+        waybillEndRequest.setEndTime(DateUtil.dateFormate(noCarWayBill1.getPredictEndTime()));
         RespR<WaybillEndResponse> waybillEndResponseRespR = noCarInterface.waybillEnd(waybillEndRequest);
         if(waybillEndResponseRespR.getCode() == 1){
             return new RespR(false,waybillEndResponseRespR.getMsg());

src/main/java/com/jkcredit/invoice/service/nocar/impl/NoCarBillWayServiceImpl.java

@@ -15,12 +15,14 @@ import com.jkcredit.invoice.service.lowerService.NoCarService;
 import com.jkcredit.invoice.service.nocar.NoCarBillWayService;
 import com.jkcredit.invoice.util.DateUtil;
 import com.jkcredit.invoice.util.RespR;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
+@Slf4j
 @Service
 public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCarWayBill> implements NoCarBillWayService{
     @Autowired
@@ -76,6 +78,7 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
                 customerCarRec.setCarColor(noCarWayBill.getPlateColor());
                 customerCarRec.setCustomerName(customerName);
                 customerCarRec.setBusinessType("2");
+                noCarWayBill.setTitleType(2);
                 customerCarRecs.add(customerCarRec);
                 RespR respR = noCarService.customerCarRec(customerCarRecs);
                 if(respR.getCode() ==1){
@@ -102,59 +105,71 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
         //保存批次号信息
         String batchNumber = customerOperService.saveCustomerOper(customerName,3);
         noCarWayBills.parallelStream().forEach(noCarWayBill -> {
-            //根据税号，查询备案企业
-            CustomerRec customerRec = new CustomerRec();
-            customerRec.setCustomerName(customerName);
-            customerRec.setCompanyReferencenum(noCarWayBill.getTaxplayerCode());
-            customerRec = customerRecMapper.selectByCustomerNameAndCompanyReference(customerRec);
-            if(customerRec == null || customerRec.getRecStatus()!=1){
-                stringBuffer.append("#").append(noCarWayBill.getBillNum()).append(":").append("企业税号未备案#");
-                return;
-            }
-            noCarWayBill.setCompanyName(customerRec.getCompanyName());
-            noCarWayBill.setCustomerName(customerName);
-            noCarWayBill.setBatchNum(batchNumber);
-            //1.查询是否有车辆备案
-            CustomerCarRec customerCarRec = customerCarRecMapper.selectByCarNum(noCarWayBill.getPlateColor());
-
-            //2.无车车辆备案时进行车辆备案
-            if(customerCarRec== null || customerCarRec.getRecStatus()!=1){
-                List<CustomerCarRec> customerCarRecs = new ArrayList<>();
-                customerCarRec = new CustomerCarRec();
-                customerCarRec.setCompanyName(noCarWayBill.getCompanyName());
-                customerCarRec.setCarNum(noCarWayBill.getPlateNum());
-                customerCarRec.setCarColor(noCarWayBill.getPlateColor());
-                customerCarRec.setCustomerName(customerName);
-                customerCarRec.setBusinessType("2");
-                customerCarRecs.add(customerCarRec);
-                RespR respR = noCarService.customerCarRec(customerCarRecs);
-                if(respR.getCode() ==1){
-                    stringBuffer.append("#").append(noCarWayBill.getBillNum()).append(":").append(respR.getMsg()).append("#");
+            try {
+                log.info("kai shi chu li li si yun dan"+noCarWayBill.getBillNum());
+                //根据税号，查询备案企业
+                CustomerRec customerRec = new CustomerRec();
+                customerRec.setCustomerName(customerName);
+                customerRec.setCompanyReferencenum(noCarWayBill.getTaxplayerCode());
+                customerRec = customerRecMapper.selectByCustomerNameAndCompanyReference(customerRec);
+                if(customerRec == null || customerRec.getRecStatus()!=1){
+                    stringBuffer.append("#").append(noCarWayBill.getBillNum()).append(":").append("企业税号未备案#");
                     return;
                 }
-            }
-
-            //3.kais指令上传
-            NoCarWayBill noCarWayBillClo = null;
-            try{
-                noCarWayBillClo = noCarWayBill.clone();
-            }catch (Exception e){
-               e.printStackTrace();
-                noCarWayBillClo = noCarWayBill;
-            }
+                noCarWayBill.setCompanyName(customerRec.getCompanyName());
+                noCarWayBill.setCustomerName(customerName);
+                noCarWayBill.setBatchNum(batchNumber);
+                noCarWayBill.setTitleType(2);
+                //1.查询是否有车辆备案
+                CustomerCarRec customerCarRec = customerCarRecMapper.selectByCarNum(noCarWayBill.getPlateNum());
+
+                //2.无车车辆备案时进行车辆备案
+                if(customerCarRec== null || customerCarRec.getRecStatus()!=1){
+                    List<CustomerCarRec> customerCarRecs = new ArrayList<>();
+                    customerCarRec = new CustomerCarRec();
+                    customerCarRec.setCompanyName(noCarWayBill.getCompanyName());
+                    customerCarRec.setCarNum(noCarWayBill.getPlateNum());
+                    customerCarRec.setCarColor(noCarWayBill.getPlateColor());
+                    customerCarRec.setCustomerName(customerName);
+                    customerCarRec.setBusinessType("2");
+                    customerCarRecs.add(customerCarRec);
+                    RespR respR = noCarService.customerCarRec(customerCarRecs);
+                    if(respR.getCode() ==1){
+                        stringBuffer.append("#").append(noCarWayBill.getBillNum()).append(":").append(respR.getMsg()).append("#");
+                        return;
+                    }
+                }
 
-            RespR respR = noCarService.noCarHisWaybillStart(noCarWayBill);
-            if (respR.getCode() == 1){
-                stringBuffer.append("#").append(noCarWayBill.getBillNum()).append(":").append(respR.getMsg()).append("#");
-            }else{
                 //3.kais指令上传
-                respR = noCarService.noCarHisWaybillEnd(noCarWayBillClo);
-                if(respR.getCode() == 1){
+                NoCarWayBill noCarWayBillClo = null;
+                try{
+                    noCarWayBillClo = noCarWayBill.clone();
+                }catch (Exception e){
+                    e.printStackTrace();
+                    noCarWayBillClo = noCarWayBill;
+                }
+
+                RespR respR = noCarService.noCarHisWaybillStart(noCarWayBill);
+                if (respR.getCode() == 1){
                     stringBuffer.append("#").append(noCarWayBill.getBillNum()).append(":").append(respR.getMsg()).append("#");
+                    log.info(noCarWayBill.getBillNum()+"#开始指令失败"+respR.getMsg());
                 }else{
-                    //取发票
-                    noCarService.getInvoiceByWayBillNumReal(noCarWayBill,true);
+                    log.info(noCarWayBill.getBillNum()+"#开始指令成功"+respR.getMsg());
+                    //3.kais指令上传
+                    respR = noCarService.noCarHisWaybillEnd(noCarWayBillClo);
+
+                    if(respR.getCode() == 1){
+                        log.info(noCarWayBill.getBillNum()+"#结束指令失败"+respR.getMsg());
+                        stringBuffer.append("#").append(noCarWayBill.getBillNum()).append(":").append(respR.getMsg()).append("#");
+                    }else{
+                        log.info(noCarWayBill.getBillNum()+"#结束指令成功"+respR.getMsg());
+                        //取发票
+                        noCarService.getInvoiceByWayBillNumReal(noCarWayBill,true);
+                    }
                 }
+                log.info("kai shi chu li li si yun dan"+noCarWayBill.getBillNum());
+            }catch (Exception e){
+                e.printStackTrace();
             }
 
 
@@ -171,11 +186,16 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
         //保存批次号信息
         String batchNumber = customerOperService.saveCustomerOper(customerName,2);
         noCarWayBills.parallelStream().forEach(noCarWayBill -> {
-            noCarWayBill.setBatchNumEnd(batchNumber);
-            RespR respR = noCarService.noCarWaybillEnd(noCarWayBill);
-            if (respR.getCode() == 1){
-                stringBuffer.append("#").append(noCarWayBill.getBillNum()).append(":").append(respR.getMsg()).append("#");
+            try {
+                noCarWayBill.setBatchNumEnd(batchNumber);
+                RespR respR = noCarService.noCarWaybillEnd(noCarWayBill);
+                if (respR.getCode() == 1){
+                    stringBuffer.append("#").append(noCarWayBill.getBillNum()).append(":").append(respR.getMsg()).append("#");
+                }
+            }catch (Exception e){
+                e.printStackTrace();
             }
+
         });
         if(!StringUtils.isEmpty(stringBuffer.toString())){
             return new RespR(false,stringBuffer.toString());

src/main/java/com/jkcredit/invoice/service/upService/impl/NoCarInterfaceImpl.java

@@ -50,6 +50,7 @@ public class NoCarInterfaceImpl implements NoCarInterface {
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
             apie.printStackTrace();
+            log.info("NoCarInterfaceImpl.vehicleQuery上游请求参数：{}", vehicleQueryRequest.toString());
             return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
         }
     }

src/main/resources/mapper/waybill/NoCarWaybillMapper.xml

@@ -14,6 +14,8 @@
         <result column="destAddr" property="destAddr"/>
         <result column="predictEndTime" property="predictEndTime"/>
         <result column="fee" property="fee"/>
+        <result column="hisFlag" property="hisFlag"></result>
+        <result column="billwayStatus" property="billwayStatus"></result>
         <result column="titleType" property="titleType"/>
         <result column="taxplayerCode" property="taxplayerCode"/>
         <result column="intfaceStartTime" property="intfaceStartTime"/>
@@ -62,6 +64,9 @@
             <if test="noCarWayBill.taxplayerCode != null and noCarWayBill.taxplayerCode != ''">
                 and taxplayerCode = #{noCarWayBill.taxplayerCode}
             </if>
+            <if test="noCarWayBill.billwayStatus != null and noCarWayBill.billwayStatus != ''">
+                and billwayStatus = #{noCarWayBill.billwayStatus}
+            </if>
             <if test="noCarWayBill.startBegin != null and noCarWayBill.startBegin != ''">
                 and intfaceStartTime BETWEEN #{noCarWayBill.startBegin} and #{noCarWayBill.startEnd}
             </if>