1

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

@@ -7,7 +7,7 @@ spring:
   datasource:
     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://106.14.75.12:3306/wlhy?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/service/impl/HyFreightSettlementInfoServiceImpl.java

@@ -562,8 +562,8 @@ public class HyFreightSettlementInfoServiceImpl extends ServiceImpl<HyFreightSet
                                 String result = EntityAnalyse.uploadFlowSheet(hyFreightSettlementInfo1);
                                 if ("数据上报成功,数据完整，等待系统校验".equals(result)){
                                     //更改上报状态
-                                    hyFreightSettlementInfo1.setEscalationStatusKey(StatusEnum.UNDER_REVIEW.getFlag());
-                                    hyFreightSettlementInfo1.setEscalationStatus(StatusEnum.UNDER_REVIEW.getName());
+                                    hyFreightSettlementInfo1.setEscalationStatusKey(StatusEnum.ADOPTED.getFlag());
+                                    hyFreightSettlementInfo1.setEscalationStatus(StatusEnum.ADOPTED.getName());
                                     hyFreightSettlementInfoService.updateById(hyFreightSettlementInfo1);
                                 }else {
                                     //更改上报状态

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

@@ -444,6 +444,8 @@ public class EntityAnalyse {
         String url = "http://116.182.4.67:50065/platform/api/v1/money";
         SimpleDateFormat f = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式
         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");//设置日期格式
+        DecimalFormat df1 = new DecimalFormat("0");
+
         CloseableHttpClient httpClient = HttpClients.createDefault();
         // 模拟登陆，按实际服务器端要求选用 Post 或 Get 请求方式
         HttpPost httpPost = new HttpPost(url);
@@ -463,7 +465,7 @@ public class EntityAnalyse {
         JSONObject shippingNote = new JSONObject();
         shippingNote.put("shippingNoteNumber", hyFreightSettlementInfo.getOrderNo());
         shippingNote.put("serialNumber", "0000");
-        shippingNote.put("totalMonetaryAmount", Integer.parseInt(String.valueOf(hyFreightSettlementInfo.getAmountMoney() * 1000)));
+        shippingNote.put("totalMonetaryAmount", Integer.valueOf(df1.format(hyFreightSettlementInfo.getAmountMoney() * 1000)));
         shippingNote.put("fuelAmount", 0);
         shippingNoteList.add(shippingNote);
         params.put("shippingNoteList", shippingNoteList);
@@ -494,7 +496,6 @@ public class EntityAnalyse {
         financial.put("bankCode", hyFreightSettlementInfo.getBankKey());
         financial.put("networkName", hyFreightSettlementInfo.getBankDepositBranch());
         financial.put("sequenceCode", hyFreightSettlementInfo.getSerialNumber());
-        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);