Ver Fonte

云燕2次提供最新代码

15810770710@163.com há 4 anos atrás
pai
commit
3389da305a

+ 2 - 1
src/main/java/info/aspirecn/cloud/yysj/commons/lang/BillItemResult.java

@@ -8,7 +8,8 @@ import java.util.Set;
 public class BillItemResult {
 public class BillItemResult {
     private String result;
     private String result;
     private ErrorResponse exceptionInformation;
     private ErrorResponse exceptionInformation;
-    private String resultMessage;
+    
+    private String detail;
     @Data
     @Data
     public static class ErrorResponse{
     public static class ErrorResponse{
         private int code;//1 数据源为空,2,3不一致,有明确项的和未查到的,4位系统异常
         private int code;//1 数据源为空,2,3不一致,有明确项的和未查到的,4位系统异常

+ 54 - 12
src/main/java/info/aspirecn/cloud/yysj/commons/lang/Constants.java

@@ -1,5 +1,6 @@
 package info.aspirecn.cloud.yysj.commons.lang;
 package info.aspirecn.cloud.yysj.commons.lang;
 
 
+import org.apache.commons.lang3.StringUtils;
 import org.omg.CORBA.portable.IDLEntity;
 import org.omg.CORBA.portable.IDLEntity;
 
 
 public class Constants {
 public class Constants {
@@ -58,8 +59,7 @@ public class Constants {
         public static String bill_driver_name="driverName";
         public static String bill_driver_name="driverName";
         public static String bill_driver_License="drivingLicense";
         public static String bill_driver_License="drivingLicense";
         public static String  bill_shipping_note_number = "shippingNoteNumber";
         public static String  bill_shipping_note_number = "shippingNoteNumber";
-        public static String bill_receipt_country_subdivision_code = "receiptCountrySubdivisionCode";
-        public static String bill_loading_country_subdivision_code = "loadingCountrySubdivisionCode";
+
         public static String req_id="reqID";
         public static String req_id="reqID";
         public static String appe_id_code="appeIdCode";
         public static String appe_id_code="appeIdCode";
         public static String  eid_voucher = "eidVoucher";
         public static String  eid_voucher = "eidVoucher";
@@ -69,7 +69,42 @@ public class Constants {
         public static String  shipping_note_number = "shippingNoteNumber";
         public static String  shipping_note_number = "shippingNoteNumber";
 
 
 
 
-
+        
+        
+        //车辆核验
+        
+        public static String carck_vehicleNumber="vehicleNumber";
+        public static String carck_colorCode="vehiclePlateColorCode";
+        public static String carck_vin="vin";
+        public static String carck_certificateNumber="roadTransportCertificateNumber";
+        
+   
+
+        	//人员核验
+        
+        public static String perck_driverName="driverName";
+        public static String perck_drivingLicense="drivingLicense";
+        public static String perck_certificate="qualificationCertificate";
+        public static String perck_provinceCode="provinceCode";
+        
+        //传给上游的参数
+        public static String up_driverName="nameOfPerson";
+        public static String up_certificate="qualificationCertificateNumber";
+        public static String up_drivingLicense="identityDocumentNumber";
+        public static String up_provinceCode="provinceCode";
+    	//企业核验
+        
+    public static String comck_name="entName";
+    public static String comck_permitNumber="permitNumber";
+    public static String comck_provinceCode="provinceCode";
+
+
+
+    //传给上游的参数
+    public static String up_name="entName";
+    public static String up_permitNumber="permitNumber";
+    public static String up_cprovinceCode="provinceCode";
+        
         public static String inconsistent_resp="1";//下游响应结果不一致
         public static String inconsistent_resp="1";//下游响应结果不一致
         public static String consistent_resp="0";//下游响应结果一致
         public static String consistent_resp="0";//下游响应结果一致
 
 
@@ -83,7 +118,7 @@ public class Constants {
 
 
         public static String errorInfo="系统异常,核验失败";
         public static String errorInfo="系统异常,核验失败";
         public static String weightOverInfo="车辆超载";
         public static String weightOverInfo="车辆超载";
-        public static String DATA_NULL = "数据源为空";
+    public static String moneyNotEnough="余额不足";
         //车辆行驶证接口参数
         //车辆行驶证接口参数
         public static String clxszyz_carNumber="carNumber";
         public static String clxszyz_carNumber="carNumber";
         public static String clxszyz_carType="carType";
         public static String clxszyz_carType="carType";
@@ -226,6 +261,19 @@ public class Constants {
                         return this.value;
                         return this.value;
                 }
                 }
         }
         }
+        
+        public enum RoadTransportUrl{
+        	CarRoadTransport("/info_check/carRoadTransport.do"),
+        	PersonRoadTransport("/info_check/personRoadTransport.do"),
+        	CompanyRoadTransport("/info_check/companyRoadTransport.do");
+        	 private String  value;
+        	 RoadTransportUrl(String value){
+                    this.value=value;
+            }
+            public String getValue() {
+                    return this.value;
+            }
+        }
 
 
         public enum ProductCheckUrl{
         public enum ProductCheckUrl{
                 BILLWAYURL("/detail/detail.do"),
                 BILLWAYURL("/detail/detail.do"),
@@ -244,7 +292,7 @@ public class Constants {
                 INCONSISTENT_ALL(3),
                 INCONSISTENT_ALL(3),
                 NULL(1),
                 NULL(1),
                 WEIGTHOVER(5),
                 WEIGTHOVER(5),
-                DATA_NULL(6);
+                MONEYNOTENOUGH(6);
                 private int  errorCode;
                 private int  errorCode;
                 ErrorCode(int errorCode){
                 ErrorCode(int errorCode){
                         this.errorCode=errorCode;
                         this.errorCode=errorCode;
@@ -254,13 +302,7 @@ public class Constants {
                 }
                 }
 
 
         }
         }
-        //装货,卸货
-        public static String zxh_vehicleNumber = "plateNumber";
-        public static String zxh_vehiclePlateColorCode = "plateColor";
-        public static String zxh_receiptCountrySubdivisionCode = "receiptCountrySubdivisionCode";
-        public static String zxh_goodsReceiptDateTime = "endTime";
-        public static String zxh_loadingCountrySubdivisionCode = "loadingCountrySubdivisionCode";
-        public static String zxh_despatchActualDateTime = "startTime";
+
 }
 }
 
 
 
 

+ 1 - 0
src/main/java/info/aspirecn/cloud/yysj/commons/lang/ProductCheckRequest.java

@@ -10,4 +10,5 @@ public class ProductCheckRequest {
     private String yysjProductId;
     private String yysjProductId;
     private List<String> sjjhProductId;
     private List<String> sjjhProductId;
     private Map<String,Object> customBody;
     private Map<String,Object> customBody;
+    private String productCode;
 }
 }