修改园区上报

winsea-haixin-platform-backend/src/main/resources/application-local.yml

@@ -8,7 +8,6 @@ spring:
     driver-class-name: com.mysql.jdbc.Driver
     password: Ccj841968545
     url: jdbc:mysql://47.100.3.209:3306/wlhy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=Asia/Shanghai
-#    url: jdbc:mysql://47.100.3.209:3306/ylyy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=Asia/Shanghai
     username: root
   redis:
     database: 0

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/util/EntityAnalyse.java

@@ -213,9 +213,9 @@ public class EntityAnalyse {
         JSONObject params = new JSONObject();
         params.put("vehicleNumber", hyDriverCarInfo.getCarNumber());
         if ("黄色".equals(hyDriverCarInfo.getCarNumberColour())) {
-            params.put("vehiclePlateColorCode", 2);
+            params.put("vehiclePlateColorCode", "2");
         } else if ("蓝色".equals(hyDriverCarInfo.getCarNumberColour())) {
-            params.put("vehiclePlateColorCode", 1);
+            params.put("vehiclePlateColorCode", "1");
         }
         params.put("vehicleType", hyDriverCarInfo.getVehicleTypeKey());
         params.put("owner", hyDriverCarInfo.getOwner());
@@ -240,7 +240,7 @@ public class EntityAnalyse {
         } else if ("增程式".equals(hyDriverCarInfo.getEnergyType())) {
             params.put("vehicleEnergyType", "Z");
         }
-        DecimalFormat df = new DecimalFormat("0.00");
+        DecimalFormat df = new DecimalFormat("0");
         if ("非挂车".equals(hyDriverCarInfo.getCarCategory())) {
             String approvedWeight = df.format(hyDriverCarInfo.getCarApprovedWeight());
             Double doubleValue = Double.parseDouble(approvedWeight) / 10;
@@ -306,8 +306,8 @@ public class EntityAnalyse {
      */
     public static String uploadWaybill(OrderInfo orderInfo) throws IOException {
         SimpleDateFormat f = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式
-        DecimalFormat df = new DecimalFormat("0.000");
-        DecimalFormat df1 = new DecimalFormat("0.0000");
+        DecimalFormat df = new DecimalFormat("0");
+        DecimalFormat df1 = new DecimalFormat("0");
 
         String url = "http://116.182.4.67:50065/platform/api/v1/transport";
         CloseableHttpClient httpClient = HttpClients.createDefault();
@@ -317,14 +317,14 @@ public class EntityAnalyse {
         params.put("originalDocumentNumber", orderInfo.getOrderNo());
         params.put("shippingNoteNumber", orderInfo.getOrderNo());
         params.put("serialNumber", "0000");
-        params.put("vehicleAmount", "1");
-        params.put("transportTypeCode", "1");
+        params.put("vehicleAmount", 1);
+        params.put("transportTypeCode", 1);
         params.put("sendToProDateTime", f.format(new Date()));
         params.put("carrier", "黑龙江畅运通物流供应链有限公司");
         params.put("unifiedSocialCreditIdentifier", "91230229MABPEWQX94");
         params.put("permitNumber", "230229200940");
         params.put("consignmentDateTime", f.format(orderInfo.getCreateDate()));
-        params.put("businessTypeCode", orderInfo.getBusinessTypeCode());
+        params.put("businessTypeCode", Integer.valueOf(orderInfo.getBusinessTypeCode()));
         params.put("despatchActualDateTime", f.format(orderInfo.getDeliveryTime()));
         params.put("goodsReceiptDateTime", f.format(orderInfo.getReceivingTime()));
 
@@ -342,7 +342,7 @@ public class EntityAnalyse {
         consigneeInfoQuery.put("consigneeId", orderInfo.getShipToID());
         consigneeInfoQuery.put("goodsReceiptPlace", orderInfo.getUnloadPrivate() + orderInfo.getUnloadCity() + orderInfo.getUnloadArea() + orderInfo.getUnloadDetailedAddress());
         consigneeInfoQuery.put("countrySubdivisionCode", orderInfo.getShipToNationalCode());
-        consigneeInfoQuery.put("totalMonetaryAmount", df.format(orderInfo.getActualFreight() * 1000));
+        consigneeInfoQuery.put("totalMonetaryAmount", Integer.valueOf(df.format(orderInfo.getActualFreight() * 1000)));
         params.put("consigneeInfoQuery", consigneeInfoQuery);
 
         //车辆信息
@@ -359,30 +359,34 @@ public class EntityAnalyse {
         vehicleInfoQuery.put("loadingCountrySubdivisionCode", orderInfo.getNationalCode());
         vehicleInfoQuery.put("goodsReceiptPlace", orderInfo.getUnloadPrivate() + orderInfo.getUnloadCity() + orderInfo.getUnloadArea() + orderInfo.getUnloadDetailedAddress());
         vehicleInfoQuery.put("receiptCountrySubdivisionCode", orderInfo.getShipToNationalCode());
-        vehicleInfoQuery.put("driverLoadDateTime", orderInfo.getLoadingDate());
+        vehicleInfoQuery.put("driverLoadDateTime", f.format(orderInfo.getLoadingDate()));
         vehicleInfoQuery.put("driverLoadLonlat", orderInfo.getLoadingLonLat());
-        vehicleInfoQuery.put("driverUnloadDateTime", orderInfo.getUnloadingDate());
+        vehicleInfoQuery.put("driverUnloadDateTime", f.format(orderInfo.getUnloadingDate()));
         vehicleInfoQuery.put("driverUnloadLonlat", orderInfo.getUnloadingLonLat());
         params.put("vehicleInfoQuery", vehicleInfoQuery);
 
         //司机信息
-        JSONObject drivers = new JSONObject();
-        drivers.put("driverName", orderInfo.getDriverName());
-        drivers.put("drivingLicense", orderInfo.getDriverIdCard());
+        JSONArray drivers = new JSONArray();
+        JSONObject driver = new JSONObject();
+        driver.put("driverName", orderInfo.getDriverName());
+        driver.put("drivingLicense", orderInfo.getDriverIdCard());
+        drivers.add(driver);
         params.put("drivers", drivers);
 
         //货物信息
-        JSONObject goodsInfos = new JSONObject();
-        goodsInfos.put("descriptionOfGoods", orderInfo.getGoodsType());
-        goodsInfos.put("cargoTypeClassificationCode", orderInfo.getGoodsTypeKey());
-        goodsInfos.put("goodsItemGrossWeight", df.format(orderInfo.getGrossWeight() * 1000000));
+        JSONArray goodsInfos = new JSONArray();
+        JSONObject goodsInfo = new JSONObject();
+        goodsInfo.put("descriptionOfGoods", orderInfo.getGoodsType());
+        goodsInfo.put("cargoTypeClassificationCode", orderInfo.getGoodsTypeKey());
+        goodsInfo.put("goodsItemGrossWeight", Integer.valueOf(df.format(orderInfo.getGrossWeight() * 1000000)));
         //todo 体积，件数
-        if (orderInfo.getVolume() != null){
-            goodsInfos.put("cube", df1.format(orderInfo.getVolume() * 10000));
+        if (orderInfo.getVolume() != null) {
+            goodsInfo.put("cube", Integer.valueOf(df1.format(orderInfo.getVolume() * 10000)));
         }
         if (orderInfo.getPackageNumber() != null) {
-            goodsInfos.put("totalNumberOfPackages", String.valueOf(orderInfo.getPackageNumber()));
+            goodsInfo.put("totalNumberOfPackages", Integer.valueOf(orderInfo.getPackageNumber()));
         }
+        goodsInfos.add(goodsInfo);
         params.put("goodsInfos", goodsInfos);
 
         //实际承运人信息
@@ -399,11 +403,14 @@ public class EntityAnalyse {
         params.put("insuranceInformation", insuranceInformation);
 
         params.put("remark", orderInfo.getRemark() != null ? orderInfo.getRemark() : "");
-        params.put("file", EntityAnalyse.uploadImage(EntityAnalyse.urlToFile(new URL(orderInfo.getDriverContractUrl())), orderInfo.getToken()));
-        params.put("ownersContractFile", EntityAnalyse.uploadImage(EntityAnalyse.urlToFile(new URL(orderInfo.getOwnerContractUrl())), orderInfo.getToken()));
-        params.put("backDocumentImages", EntityAnalyse.uploadImage(EntityAnalyse.urlToFile(new URL(orderInfo.getReceiptImg())), orderInfo.getToken()));
-
+        String[] file1 = {EntityAnalyse.uploadImage(EntityAnalyse.urlToFile(new URL(orderInfo.getDriverContractUrl())), orderInfo.getToken())};
+        params.put("file", file1);
+        String[] ownersContractFile = {EntityAnalyse.uploadImage(EntityAnalyse.urlToFile(new URL(orderInfo.getOwnerContractUrl())), orderInfo.getToken())};
+        params.put("ownersContractFile", ownersContractFile);
+        String[] backDocumentImages = {EntityAnalyse.uploadImage(EntityAnalyse.urlToFile(new URL(orderInfo.getReceiptImg())), orderInfo.getToken())};
+        params.put("backDocumentImages", backDocumentImages);
 
+        System.out.println("[" + params.toString() + "]");
         httpPost.setEntity(new StringEntity("[" + params.toString() + "]", StandardCharsets.UTF_8));
         // 设置header信息
         httpPost.setHeader("Content-type", "application/json");
@@ -447,16 +454,16 @@ public class EntityAnalyse {
         params.put("actualCarrierId", hyFreightSettlementInfo.getPayeeIdCard());
         params.put("vehicleNumber", hyFreightSettlementInfo.getCarNumber());
         if ("黄色".equals(hyFreightSettlementInfo.getCarNumberColour())) {
-            params.put("vehiclePlateColorCode", 2);
+            params.put("vehiclePlateColorCode", "2");
         } else if ("蓝色".equals(hyFreightSettlementInfo.getCarNumberColour())) {
-            params.put("vehiclePlateColorCode", 1);
+            params.put("vehiclePlateColorCode", "1");
         }
         //运单列表
         JSONArray shippingNoteList = new JSONArray();
         JSONObject shippingNote = new JSONObject();
         shippingNote.put("shippingNoteNumber", hyFreightSettlementInfo.getOrderNo());
         shippingNote.put("serialNumber", "0000");
-        shippingNote.put("totalMonetaryAmount", hyFreightSettlementInfo.getAmountMoney() * 1000);
+        shippingNote.put("totalMonetaryAmount", Integer.parseInt(String.valueOf(hyFreightSettlementInfo.getAmountMoney() * 1000)));
         shippingNote.put("fuelAmount", 0);
         shippingNoteList.add(shippingNote);
         params.put("shippingNoteList", shippingNoteList);
@@ -487,7 +494,7 @@ public class EntityAnalyse {
         financial.put("bankCode", hyFreightSettlementInfo.getBankKey());
         financial.put("networkName", hyFreightSettlementInfo.getBankDepositBranch());
         financial.put("sequenceCode", hyFreightSettlementInfo.getSerialNumber());
-        DecimalFormat df1 = new DecimalFormat("0.000");
+        DecimalFormat df1 = new DecimalFormat("0");
 //        String str = String.valueOf(Double.valueOf(df1.format(hyFreightSettlementInfo.getAmountMoney())) * 1000);
         int intValue1 = (int) (Double.valueOf(df1.format(hyFreightSettlementInfo.getAmountMoney())) * 1000);
         financial.put("monetaryAmount", intValue1);