Explorar o código

历史运单开始结束bug

xusonglin %!s(int64=5) %!d(string=hai) anos
pai
achega
4db82e6ab6

+ 0 - 4
src/main/java/com/jkcredit/invoice/hub/model/dto/carFreeCarrierBillEnd/CarFreeCarrierBillEndDto.java

@@ -30,10 +30,6 @@ public class CarFreeCarrierBillEndDto implements Serializable {
     @NotBlank(message = "结束时间不能为空")
     private String endTime;
 
-    // 开票时长
-    @NotNull(message = "开票时长不能为空")
-    private Integer invoiceTime;
-
     // 是否为历史运单
     private Integer isHistory;
 

+ 1 - 1
src/main/java/com/jkcredit/invoice/hub/model/dto/carFreeCarrierBillStart/CarFreeCarrierBillStartDto.java

@@ -53,5 +53,5 @@ public class CarFreeCarrierBillStartDto implements Serializable {
     // 是否为历史运单
     private Integer isHistory;
     // 用户id
-    private Integer userId;
+    private Long userId;
 }

+ 0 - 3
src/main/java/com/jkcredit/invoice/hub/model/po/carFreeCarrierBillEnd/CarFreeCarrierBillEndPo.java

@@ -36,9 +36,6 @@ public class CarFreeCarrierBillEndPo implements Serializable {
     // 结束时间
     private String endTime;
 
-    // 开票时长
-    private Integer invoiceTime;
-
     // 是否为历史运单
     private Integer isHistory;
 

+ 2 - 3
src/main/java/com/jkcredit/invoice/hub/service/apiCarFree/ApiCarFreeServiceImpl.java

@@ -252,7 +252,6 @@ public class ApiCarFreeServiceImpl extends BaseService implements ApiCarFreeServ
 
             // 调用upload 发送数据
             WaybillHistoryStartResponse response = ETCCommHelper.upload(fileName, request, WaybillHistoryStartResponse.class);
-
             dto.setIsHistory(CommonConstant.HISTORY_WAY_BILL);
             wayBillStartService.saveBillStart(dto);
 
@@ -271,7 +270,7 @@ public class ApiCarFreeServiceImpl extends BaseService implements ApiCarFreeServ
             log.error("[-wayBillHistoryStart-] 错误信息:" + se.getMessage());
             throw new ServiceException(se.getMessage());
         }
-        return analyzeApiResultItems(result);
+        return ApiResponseData.success(ApiResponseCodeEnum.CODE_200.getValue(), result);
     }
 
     @Override
@@ -312,7 +311,7 @@ public class ApiCarFreeServiceImpl extends BaseService implements ApiCarFreeServ
             log.error("[-wayBillHistoryEnd-] 错误信息:" + se.getMessage());
             throw new ServiceException(se.getMessage());
         }
-        return analyzeApiResultItems(result);
+        return ApiResponseData.success(ApiResponseCodeEnum.CODE_200.getValue(), result);
     }
 
     @Override