Merge remote-tracking branch 'origin/master'

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

@@ -290,7 +290,8 @@ public class NoCarServiceImpl implements NoCarService {
        if(noCarWayBillDb.getBillwayStatus() == 0){
             RespR<WaybillOriginEndResponse> responseRespR1 = sendOrgWayBillInfo(noCarWayBill);
             if(responseRespR1.getCode() == 1){
-                noCarWayBill.setFailReason(responseRespR1.getMsg());
+                noCarWayBill.setBillwayStatus(0);
+                noCarWayBill.setFailReason("ysyd:"+responseRespR1.getMsg());
                 insertOrUpdateBillStart(noCarWayBill);
                 return new RespR(false, responseRespR1.getMsg());
             }else{
@@ -311,7 +312,7 @@ public class NoCarServiceImpl implements NoCarService {
             insertOrUpdateBillStart(noCarWayBill);
             RespR<WaybillOriginEndResponse> responseRespR1 = sendOrgWayBillInfo(noCarWayBill);
             if(responseRespR1.getCode() == 1){
-                noCarWayBill.setFailReason(responseRespR1.getMsg());
+                noCarWayBill.setFailReason("ysyd:"+responseRespR1.getMsg());
                 insertOrUpdateBillStart(noCarWayBill);
                 return new RespR(false, responseRespR1.getMsg());
             }else{
@@ -557,7 +558,7 @@ public class NoCarServiceImpl implements NoCarService {
                     }
                     RespR<WaybillOriginEndResponse> responseRespR1 = sendOrgWayBillInfo(noCarWayBillClone);
                     if(responseRespR1.getCode() == 1){
-                        noCarWayBill.setFailReason(responseRespR1.getMsg());
+                        noCarWayBill.setFailReason("ysyd:"+responseRespR1.getMsg());
                         insertOrUpdateBillStart(noCarWayBill);
                         return new RespR(false, responseRespR1.getMsg());
                     }
@@ -580,7 +581,8 @@ public class NoCarServiceImpl implements NoCarService {
             if(noCarWayBillDb.getBillwayStatus() == 0){
                 RespR<WaybillOriginEndResponse> responseRespR1 = sendOrgWayBillInfo(noCarWayBill);
                 if(responseRespR1.getCode() == 1){
-                    noCarWayBill.setFailReason(responseRespR1.getMsg());
+                    noCarWayBill.setBillwayStatus(0);
+                    noCarWayBill.setFailReason("ysyd:"+responseRespR1.getMsg());
                     insertOrUpdateBillStart(noCarWayBill);
                     return new RespR(false, responseRespR1.getMsg());
                 }else{
@@ -607,7 +609,7 @@ public class NoCarServiceImpl implements NoCarService {
                 insertOrUpdateBillStart(noCarWayBill);
                 RespR<WaybillOriginEndResponse> responseRespR1 = sendOrgWayBillInfo(noCarWayBill);
                 if(responseRespR1.getCode() == 1){
-                    noCarWayBill.setFailReason(responseRespR1.getMsg());
+                    noCarWayBill.setFailReason("ysyd:"+responseRespR1.getMsg());
                     insertOrUpdateBillStart(noCarWayBill);
                     return new RespR(false, responseRespR1.getMsg());
                 }else{
@@ -620,6 +622,7 @@ public class NoCarServiceImpl implements NoCarService {
     }
     public RespR<WaybillOriginEndResponse> sendOrgWayBillInfo(NoCarWayBill noCarWayBill){
         WaybillOriginEndRequest waybillOriginEndRequest = new WaybillOriginEndRequest();
+        waybillOriginEndRequest.setNum(noCarWayBill.getBillNum());
         waybillOriginEndRequest.setCompanyNum(noCarWayBill.getCompanyNum());
         waybillOriginEndRequest.setBase64Str(noCarWayBill.getBase64Str());
         waybillOriginEndRequest.setWaybillFileName(noCarWayBill.getWaybillFileName());