修改

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/DriverCarInfoServiceImpl.java

@@ -23,6 +23,7 @@ import com.yh.saas.plugin.yiliangyiyun.util.EntityAnalyse;
 import com.yh.saas.plugin.yiliangyiyun.util.MonitoringSystemReporting;
 import net.sf.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -53,7 +54,8 @@ public class DriverCarInfoServiceImpl extends ServiceImpl<DriverCarInfoMapper, H
     private INewsInfoService newsInfoService;
     @Autowired
     private IDriverCarInfoService driverCarInfoService;
-
+    @Value("${com.changyuntong.env}")
+    private String ENV;
 
     /**
      * 后台管理车辆列表
@@ -199,12 +201,12 @@ public class DriverCarInfoServiceImpl extends ServiceImpl<DriverCarInfoMapper, H
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public HyDriverCarInfo getDriverCarInfo(HyDriverCarInfo hyDriverCarInfo){
+    public HyDriverCarInfo getDriverCarInfo(HyDriverCarInfo hyDriverCarInfo) {
         //查询车辆信息
         HyDriverCarInfo hyDriverCarInfo1 = this.selectById(hyDriverCarInfo.getId());
         //查询司机信息
         HyDriverInfo hyDriverInfo = driverInfoService.selectById(hyDriverCarInfo1.getDriverId());
-        if (hyDriverInfo != null){
+        if (hyDriverInfo != null) {
             hyDriverCarInfo1.setHyDriverInfo(hyDriverInfo);
         }
         return hyDriverCarInfo1;
@@ -279,6 +281,7 @@ public class DriverCarInfoServiceImpl extends ServiceImpl<DriverCarInfoMapper, H
 
     /**
      * 园区批量上报
+     *
      * @param hyDriverCarInfo
      * @return
      * @throws IOException
@@ -286,39 +289,43 @@ public class DriverCarInfoServiceImpl extends ServiceImpl<DriverCarInfoMapper, H
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String batchSubmission (HyDriverCarInfo hyDriverCarInfo) throws IOException , ParseException {
-        //获取token
-        String token = EntityAnalyse.GetJTToken();
-        if (!CollectionUtils.isEmpty(hyDriverCarInfo.getHyDriverCarInfoList())){
-            for (HyDriverCarInfo hyDriverCarInfo1 : hyDriverCarInfo.getHyDriverCarInfoList()){
-                //查询车辆类型key值
-                HyCommonSysParameter hyCommonSysParameter = commonSysParameterService.selectOne(new EntityWrapper<HyCommonSysParameter>()
-                        .eq("const_id", "CAR1").eq("const_value", hyDriverCarInfo1.getVehicleType()));
-                hyDriverCarInfo1.setVehicleTypeKey(hyCommonSysParameter.getConstKey());
-                //园区上报
-                hyDriverCarInfo1.setToken(token);
-                new Thread(new Runnable() {
-                    @Override
-                    public void run() {
-                        try{
-                            EntityAnalyse.uploadDriverCarInfo(hyDriverCarInfo1);
-                        }catch (Exception e){
-                            e.printStackTrace();
+    public String batchSubmission(HyDriverCarInfo hyDriverCarInfo) throws IOException, ParseException {
+        if ("3".equals(ENV)) {
+            //获取token
+            String token = EntityAnalyse.GetJTToken();
+            if (!CollectionUtils.isEmpty(hyDriverCarInfo.getHyDriverCarInfoList())) {
+                for (HyDriverCarInfo hyDriverCarInfo1 : hyDriverCarInfo.getHyDriverCarInfoList()) {
+                    //查询车辆类型key值
+                    HyCommonSysParameter hyCommonSysParameter = commonSysParameterService.selectOne(new EntityWrapper<HyCommonSysParameter>()
+                            .eq("const_id", "CAR1").eq("const_value", hyDriverCarInfo1.getVehicleType()));
+                    hyDriverCarInfo1.setVehicleTypeKey(hyCommonSysParameter.getConstKey());
+                    //园区上报
+                    hyDriverCarInfo1.setToken(token);
+                    new Thread(new Runnable() {
+                        @Override
+                        public void run() {
+                            try {
+                                EntityAnalyse.uploadDriverCarInfo(hyDriverCarInfo1);
+                            } catch (Exception e) {
+                                e.printStackTrace();
+                            }
                         }
-                    }
-                }).start();
-                //更改上报状态
-                hyDriverCarInfo1.setEscalationDate(new Date());
-                hyDriverCarInfo1.setEscalationStatusKey(StatusEnum.PARK_UNDER_REVIEW.getFlag());
-                hyDriverCarInfo1.setEscalationStatus(StatusEnum.PARK_UNDER_REVIEW.getName());
-                this.updateById(hyDriverCarInfo1);
+                    }).start();
+                    //更改上报状态
+                    hyDriverCarInfo1.setEscalationDate(new Date());
+                    hyDriverCarInfo1.setEscalationStatusKey(StatusEnum.PARK_UNDER_REVIEW.getFlag());
+                    hyDriverCarInfo1.setEscalationStatus(StatusEnum.PARK_UNDER_REVIEW.getName());
+                    this.updateById(hyDriverCarInfo1);
+                }
             }
+            return "ok";
         }
-        return "ok";
+        return "ng";
     }
 
     /**
      * 交管监测系统上报
+     *
      * @param hyDriverCarInfo
      * @return
      * @throws IOException
@@ -326,40 +333,43 @@ public class DriverCarInfoServiceImpl extends ServiceImpl<DriverCarInfoMapper, H
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String trafficManagementReport (HyDriverCarInfo hyDriverCarInfo) throws Exception {
-        if (!CollectionUtils.isEmpty(hyDriverCarInfo.getHyDriverCarInfoList())) {
-            for (HyDriverCarInfo hyDriverCarInfo1 : hyDriverCarInfo.getHyDriverCarInfoList()) {
-                //查询车辆类型key值
-                HyCommonSysParameter hyCommonSysParameter = commonSysParameterService.selectOne(new EntityWrapper<HyCommonSysParameter>()
-                        .eq("const_id", "CAR1").eq("const_value", hyDriverCarInfo1.getVehicleType()));
-                hyDriverCarInfo1.setVehicleTypeKey(hyCommonSysParameter.getConstKey());
-                //交管监测系统上报
-                new Thread(new Runnable() {
-                    @Override
-                    public void run() {
-                        try{
-                            String result = MonitoringSystemReporting.testVehicleRoot(hyDriverCarInfo1);
-                            JSONObject jsonObject = JSONObject.fromObject(result);
-                            //发送成功
-                            if ("1001".equals(jsonObject.getString("code"))){
-                                hyDriverCarInfo1.setReportedStatusKey(StatusEnum.REPORTED_SUCESS.getFlag());
-                                hyDriverCarInfo1.setReportedStatus(StatusEnum.REPORTED_SUCESS.getName());
-                            }
-                            //发送失败
-                            else if ("3003".equals(jsonObject.getString("code"))){
-                                hyDriverCarInfo1.setReportedStatusKey(StatusEnum.REPORTED_FAIL.getFlag());
-                                hyDriverCarInfo1.setReportedStatus(StatusEnum.REPORTED_FAIL.getName());
-                                hyDriverCarInfo1.setReportedFailureReason(jsonObject.getString("data"));
+    public String trafficManagementReport(HyDriverCarInfo hyDriverCarInfo) throws Exception {
+        if ("3".equals(ENV)) {
+            if (!CollectionUtils.isEmpty(hyDriverCarInfo.getHyDriverCarInfoList())) {
+                for (HyDriverCarInfo hyDriverCarInfo1 : hyDriverCarInfo.getHyDriverCarInfoList()) {
+                    //查询车辆类型key值
+                    HyCommonSysParameter hyCommonSysParameter = commonSysParameterService.selectOne(new EntityWrapper<HyCommonSysParameter>()
+                            .eq("const_id", "CAR1").eq("const_value", hyDriverCarInfo1.getVehicleType()));
+                    hyDriverCarInfo1.setVehicleTypeKey(hyCommonSysParameter.getConstKey());
+                    //交管监测系统上报
+                    new Thread(new Runnable() {
+                        @Override
+                        public void run() {
+                            try {
+                                String result = MonitoringSystemReporting.testVehicleRoot(hyDriverCarInfo1);
+                                JSONObject jsonObject = JSONObject.fromObject(result);
+                                //发送成功
+                                if ("1001".equals(jsonObject.getString("code"))) {
+                                    hyDriverCarInfo1.setReportedStatusKey(StatusEnum.REPORTED_SUCESS.getFlag());
+                                    hyDriverCarInfo1.setReportedStatus(StatusEnum.REPORTED_SUCESS.getName());
+                                }
+                                //发送失败
+                                else if ("3003".equals(jsonObject.getString("code"))) {
+                                    hyDriverCarInfo1.setReportedStatusKey(StatusEnum.REPORTED_FAIL.getFlag());
+                                    hyDriverCarInfo1.setReportedStatus(StatusEnum.REPORTED_FAIL.getName());
+                                    hyDriverCarInfo1.setReportedFailureReason(jsonObject.getString("data"));
+                                }
+                                driverCarInfoService.updateById(hyDriverCarInfo1);
+                            } catch (Exception e) {
+                                e.printStackTrace();
                             }
-                            driverCarInfoService.updateById(hyDriverCarInfo1);
-                        }catch (Exception e){
-                            e.printStackTrace();
                         }
-                    }
-                }).start();
+                    }).start();
+                }
             }
+            return "ok";
         }
-        return "ok";
+        return "NG";
     }
 
 
@@ -370,7 +380,7 @@ public class DriverCarInfoServiceImpl extends ServiceImpl<DriverCarInfoMapper, H
      * @return
      */
     @Override
-    public Page<HyDriverCarInfo> selectCarInfoSubmission(HyDriverCarInfo hyDriverCarInfo){
+    public Page<HyDriverCarInfo> selectCarInfoSubmission(HyDriverCarInfo hyDriverCarInfo) {
         Map<String, Object> pageView = new HashMap<>(9);
         pageView.put("startRecord", (hyDriverCarInfo.getCurrentPage() - 1)
                 * hyDriverCarInfo.getPageSize());

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/DriverInfoServiceImpl.java

@@ -24,6 +24,7 @@ import org.json.JSONString;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -59,6 +60,8 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, HyDrive
     private IOrderInfoService orderInfoService;
     @Autowired
     private IDriverInfoService driverInfoService;
+    @Value("${com.changyuntong.env}")
+    private String ENV;
 
     /**
      * 查询上报结果（每分钟执行一次）
@@ -192,7 +195,7 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, HyDrive
             HyDriverInfo hyDriverInfo1 = new HyDriverInfo();
             hyDriverInfo1.setAuthenticationStatus("未认证");
             return hyDriverInfo1;
-        }else {
+        } else {
             //查询银行卡信息
             List<HyDriverPayeeInfo> hyDriverPayeeInfos = driverPayeeInfoService.selectList(new EntityWrapper<HyDriverPayeeInfo>().eq("driver_id", hyDriverInfo.getId())
                     .eq("delete_flag", "0"));
@@ -515,30 +518,33 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, HyDrive
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String batchSubmission(HyDriverInfo hyDriverInfo) throws IOException, ParseException, Exception {
-        //园区上报
-        //获取token
-        String token = EntityAnalyse.GetJTToken();
-        hyDriverInfo.setToken(token);
-        new Thread(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    EntityAnalyse.uploadDriverInfo(hyDriverInfo);
-                } catch (Exception e) {
-                    e.printStackTrace();
+        if ("3".equals(ENV)) {
+            //园区上报
+            //获取token
+            String token = EntityAnalyse.GetJTToken();
+            hyDriverInfo.setToken(token);
+            new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    try {
+                        EntityAnalyse.uploadDriverInfo(hyDriverInfo);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            }).start();
+            if (!CollectionUtils.isEmpty(hyDriverInfo.getHyDriverInfoList())) {
+                for (HyDriverInfo hyDriverInfo1 : hyDriverInfo.getHyDriverInfoList()) {
+                    //更改上报状态
+                    hyDriverInfo1.setEscalationDate(new Date());
+                    hyDriverInfo1.setEscalationStatusKey(StatusEnum.PARK_UNDER_REVIEW.getFlag());
+                    hyDriverInfo1.setEscalationStatus(StatusEnum.PARK_UNDER_REVIEW.getName());
+                    this.updateById(hyDriverInfo1);
                 }
             }
-        }).start();
-        if (!CollectionUtils.isEmpty(hyDriverInfo.getHyDriverInfoList())) {
-            for (HyDriverInfo hyDriverInfo1 : hyDriverInfo.getHyDriverInfoList()) {
-                //更改上报状态
-                hyDriverInfo1.setEscalationDate(new Date());
-                hyDriverInfo1.setEscalationStatusKey(StatusEnum.PARK_UNDER_REVIEW.getFlag());
-                hyDriverInfo1.setEscalationStatus(StatusEnum.PARK_UNDER_REVIEW.getName());
-                this.updateById(hyDriverInfo1);
-            }
+            return "ok";
         }
-        return "ok";
+        return "ng";
     }
 
     /**
@@ -550,39 +556,42 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, HyDrive
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String administrationReport(HyDriverInfo hyDriverInfo) throws Exception {
-        if (!CollectionUtils.isEmpty(hyDriverInfo.getHyDriverInfoList())) {
-            for (HyDriverInfo hyDriverInfo1 : hyDriverInfo.getHyDriverInfoList()) {
-                //监测系统上报
-                new Thread(new Runnable() {
-                    @Override
-                    public void run() {
-                        try {
-                            String result = MonitoringSystemReporting.testDriverRoot(hyDriverInfo1);
-                            JSONObject jsonObject = JSONObject.fromObject(result);
-                            //发送成功
-                            if ("1001".equals(jsonObject.getString("code"))) {
-                                hyDriverInfo1.setReportedStatusKey(StatusEnum.REPORTED_SUCESS.getFlag());
-                                hyDriverInfo1.setReportedStatus(StatusEnum.REPORTED_SUCESS.getName());
-                            }
-                            //发送失败
-                            else if ("3003".equals(jsonObject.getString("code"))) {
-                                hyDriverInfo1.setReportedStatusKey(StatusEnum.REPORTED_FAIL.getFlag());
-                                hyDriverInfo1.setReportedStatus(StatusEnum.REPORTED_FAIL.getName());
-                                hyDriverInfo1.setReportedFailureReason(jsonObject.getString("data"));
+        if ("3".equals(ENV)) {
+            if (!CollectionUtils.isEmpty(hyDriverInfo.getHyDriverInfoList())) {
+                for (HyDriverInfo hyDriverInfo1 : hyDriverInfo.getHyDriverInfoList()) {
+                    //监测系统上报
+                    new Thread(new Runnable() {
+                        @Override
+                        public void run() {
+                            try {
+                                String result = MonitoringSystemReporting.testDriverRoot(hyDriverInfo1);
+                                JSONObject jsonObject = JSONObject.fromObject(result);
+                                //发送成功
+                                if ("1001".equals(jsonObject.getString("code"))) {
+                                    hyDriverInfo1.setReportedStatusKey(StatusEnum.REPORTED_SUCESS.getFlag());
+                                    hyDriverInfo1.setReportedStatus(StatusEnum.REPORTED_SUCESS.getName());
+                                }
+                                //发送失败
+                                else if ("3003".equals(jsonObject.getString("code"))) {
+                                    hyDriverInfo1.setReportedStatusKey(StatusEnum.REPORTED_FAIL.getFlag());
+                                    hyDriverInfo1.setReportedStatus(StatusEnum.REPORTED_FAIL.getName());
+                                    hyDriverInfo1.setReportedFailureReason(jsonObject.getString("data"));
 //                                String str = jsonObject.getString("data");
 //                                String reg = "[^(0-9\\u4e00-\\u9fa5)]";
 //                                String str1 = str.replaceAll(reg, " ").trim();
 //                                str = str1.replaceAll(" +","，");
+                                }
+                                driverInfoService.updateById(hyDriverInfo1);
+                            } catch (Exception e) {
+                                e.printStackTrace();
                             }
-                            driverInfoService.updateById(hyDriverInfo1);
-                        } catch (Exception e) {
-                            e.printStackTrace();
                         }
-                    }
-                }).start();
+                    }).start();
+                }
             }
+            return "ok";
         }
-        return "ok";
+        return "NG";
     }
 
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/HyFreightSettlementInfoServiceImpl.java

@@ -16,6 +16,7 @@ import com.yh.saas.plugin.yiliangyiyun.util.MonitoringSystemReporting;
 import net.sf.json.JSONObject;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -59,7 +60,8 @@ public class HyFreightSettlementInfoServiceImpl extends ServiceImpl<HyFreightSet
     private IHyDriverCapitalInfoService hyDriverCapitalInfoService;
     @Autowired
     private IHyFreightSettlementInfoService hyFreightSettlementInfoService;
-
+    @Value("${com.changyuntong.env}")
+    private String ENV;
 
     /**
      * 后台管理司机运费结算列表
@@ -203,9 +205,9 @@ public class HyFreightSettlementInfoServiceImpl extends ServiceImpl<HyFreightSet
                     } else {
                         //查询是否支付预付款
                         HyFreightSettlementInfo hyFreightSettlementInfo2 = this.selectOne(new EntityWrapper<HyFreightSettlementInfo>()
-                                .eq("order_id",hyFreightSettlementInfo1.getOrderId()).eq("payment_type","预付款")
-                                .eq("status_key","7").eq("delete_flag","0"));
-                        if (hyFreightSettlementInfo2 == null){
+                                .eq("order_id", hyFreightSettlementInfo1.getOrderId()).eq("payment_type", "预付款")
+                                .eq("status_key", "7").eq("delete_flag", "0"));
+                        if (hyFreightSettlementInfo2 == null) {
                             throw new YException(YExceptionEnum.PAY_ADVANCE_PAYMENT);
                         }
                         //尾款
@@ -266,7 +268,7 @@ public class HyFreightSettlementInfoServiceImpl extends ServiceImpl<HyFreightSet
                         hyDriverCapitalInfoService.insert(hyDriverCapitalInfo);
                         //修改还款信息
                         RepaymentInfo repaymentInfo = repaymentInfoService.selectOne(new EntityWrapper<RepaymentInfo>()
-                                .eq("order_id",orderInfo1.getId()).eq("delete_flag","0"));
+                                .eq("order_id", orderInfo1.getId()).eq("delete_flag", "0"));
                         repaymentInfo.setFreight(freightInfo.getActualFreight());
                         repaymentInfo.setServiceCharge(freightInfo.getOwnerServiceCharge());
                         repaymentInfo.setTotalRepayable(freightInfo.getReceivableFreight());
@@ -333,12 +335,12 @@ public class HyFreightSettlementInfoServiceImpl extends ServiceImpl<HyFreightSet
                     } else {
                         //查询是否有预付款
                         HyFreightSettlementInfo hyFreightSettlementInfo3 = this.selectOne(new EntityWrapper<HyFreightSettlementInfo>()
-                                .eq("order_id",hyFreightSettlementInfo1.getOrderId()).eq("payment_type","预付款")
-                                .eq("delete_flag","0"));
+                                .eq("order_id", hyFreightSettlementInfo1.getOrderId()).eq("payment_type", "预付款")
+                                .eq("delete_flag", "0"));
                         //有预付款
-                        if (hyFreightSettlementInfo3 != null){
+                        if (hyFreightSettlementInfo3 != null) {
                             //查询是否支付预付款
-                            if (!"7".equals(hyFreightSettlementInfo3.getStatusKey())){
+                            if (!"7".equals(hyFreightSettlementInfo3.getStatusKey())) {
                                 throw new YException(YExceptionEnum.PAY_ADVANCE_PAYMENT);
                             }
                         }
@@ -350,7 +352,7 @@ public class HyFreightSettlementInfoServiceImpl extends ServiceImpl<HyFreightSet
                         Double d = freightInfo.getPayabledFreight();
                         freightInfo.setPayabledFreight(d + hyFreightSettlementInfo1.getAmountMoney());
                         freightInfo.setNopayableFreight(freightInfo.getPayableFreight() - freightInfo.getPayabledFreight());
-                        freightInfo.setProfit(freightInfo.getReceivableFreight()-freightInfo.getPayableFreight());
+                        freightInfo.setProfit(freightInfo.getReceivableFreight() - freightInfo.getPayableFreight());
                         freightInfo.setProfitDate(new Date());
                         //修改订单运费
                         if (orderInfo1 != null) {
@@ -499,6 +501,7 @@ public class HyFreightSettlementInfoServiceImpl extends ServiceImpl<HyFreightSet
 
     /**
      * 流水单批量上报
+     *
      * @param hyFreightSettlementInfo
      * @return
      * @throws IOException
@@ -507,57 +510,61 @@ public class HyFreightSettlementInfoServiceImpl extends ServiceImpl<HyFreightSet
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String batchSubmission(HyFreightSettlementInfo hyFreightSettlementInfo) throws IOException, ParseException {
-        //获取token
-        String token = EntityAnalyse.GetJTToken();
-        if (CollectionUtils.isNotEmpty(hyFreightSettlementInfo.getHyFreightSettlementInfos())){
-            for (HyFreightSettlementInfo hyFreightSettlementInfo1 : hyFreightSettlementInfo.getHyFreightSettlementInfos()){
-                //查询上报所需信息
-                //查询订单
-                OrderInfo orderInfo1 = orderInfoService.selectById(hyFreightSettlementInfo1.getOrderId());
-                //司机信息
-                HyDriverInfo hyDriverInfo = driverInfoService.selectOne(new EntityWrapper<HyDriverInfo>()
-                        .eq("common_id",hyFreightSettlementInfo1.getCommonId()).eq("delete_flag","0"));
-                hyFreightSettlementInfo1.setDriverIdCard(hyDriverInfo.getNumberCard());
-                hyFreightSettlementInfo1.setDriverSex(hyDriverInfo.getDriverSex());
-                hyFreightSettlementInfo1.setDriverBirthday(hyDriverInfo.getDriverBirthday());
-                hyFreightSettlementInfo1.setDriverPhone(hyDriverInfo.getDriverPhone());
-                hyFreightSettlementInfo1.setDriverAddress(hyDriverInfo.getCardAddress());
-                //车辆信息
-                HyDriverCarInfo hyDriverCarInfo = driverCarInfoService.selectOne(new EntityWrapper<HyDriverCarInfo>()
-                        .eq("car_number",orderInfo1.getCarNumber()).eq("delete_flag","0"));
-                hyFreightSettlementInfo1.setCarNumber(hyDriverCarInfo.getCarNumber());
-                hyFreightSettlementInfo1.setCarNumberColour(hyDriverCarInfo.getCarNumberColour());
-                //查询银行key值
-                HyCommonSysParameter hyCommonSysParameter = commonSysParameterService.selectOne(new EntityWrapper<HyCommonSysParameter>()
-                        .eq("const_id", "BANK1").eq("const_value", orderInfo1.getBankDeposit()));
-                if (hyCommonSysParameter == null){
-                    hyFreightSettlementInfo1.setBankKey("9999");
-                }else {
-                    hyFreightSettlementInfo1.setBankKey(hyCommonSysParameter.getConstKey());
-                }
-                //园区上报
-                hyFreightSettlementInfo1.setToken(token);
-                new Thread(new Runnable() {
-                    @Override
-                    public void run() {
-                        try{
-                            EntityAnalyse.uploadFlowSheet(hyFreightSettlementInfo1);
-                        }catch (Exception e){
-                            e.printStackTrace();
-                        }
+        if ("3".equals(ENV)) {
+            //获取token
+            String token = EntityAnalyse.GetJTToken();
+            if (CollectionUtils.isNotEmpty(hyFreightSettlementInfo.getHyFreightSettlementInfos())) {
+                for (HyFreightSettlementInfo hyFreightSettlementInfo1 : hyFreightSettlementInfo.getHyFreightSettlementInfos()) {
+                    //查询上报所需信息
+                    //查询订单
+                    OrderInfo orderInfo1 = orderInfoService.selectById(hyFreightSettlementInfo1.getOrderId());
+                    //司机信息
+                    HyDriverInfo hyDriverInfo = driverInfoService.selectOne(new EntityWrapper<HyDriverInfo>()
+                            .eq("common_id", hyFreightSettlementInfo1.getCommonId()).eq("delete_flag", "0"));
+                    hyFreightSettlementInfo1.setDriverIdCard(hyDriverInfo.getNumberCard());
+                    hyFreightSettlementInfo1.setDriverSex(hyDriverInfo.getDriverSex());
+                    hyFreightSettlementInfo1.setDriverBirthday(hyDriverInfo.getDriverBirthday());
+                    hyFreightSettlementInfo1.setDriverPhone(hyDriverInfo.getDriverPhone());
+                    hyFreightSettlementInfo1.setDriverAddress(hyDriverInfo.getCardAddress());
+                    //车辆信息
+                    HyDriverCarInfo hyDriverCarInfo = driverCarInfoService.selectOne(new EntityWrapper<HyDriverCarInfo>()
+                            .eq("car_number", orderInfo1.getCarNumber()).eq("delete_flag", "0"));
+                    hyFreightSettlementInfo1.setCarNumber(hyDriverCarInfo.getCarNumber());
+                    hyFreightSettlementInfo1.setCarNumberColour(hyDriverCarInfo.getCarNumberColour());
+                    //查询银行key值
+                    HyCommonSysParameter hyCommonSysParameter = commonSysParameterService.selectOne(new EntityWrapper<HyCommonSysParameter>()
+                            .eq("const_id", "BANK1").eq("const_value", orderInfo1.getBankDeposit()));
+                    if (hyCommonSysParameter == null) {
+                        hyFreightSettlementInfo1.setBankKey("9999");
+                    } else {
+                        hyFreightSettlementInfo1.setBankKey(hyCommonSysParameter.getConstKey());
                     }
-                }).start();
-                //更改上报状态
-                hyFreightSettlementInfo1.setEscalationStatusKey(StatusEnum.UNDER_REVIEW.getFlag());
-                hyFreightSettlementInfo1.setEscalationStatus(StatusEnum.UNDER_REVIEW.getName());
-                this.updateById(hyFreightSettlementInfo1);
+                    //园区上报
+                    hyFreightSettlementInfo1.setToken(token);
+                    new Thread(new Runnable() {
+                        @Override
+                        public void run() {
+                            try {
+                                EntityAnalyse.uploadFlowSheet(hyFreightSettlementInfo1);
+                            } catch (Exception e) {
+                                e.printStackTrace();
+                            }
+                        }
+                    }).start();
+                    //更改上报状态
+                    hyFreightSettlementInfo1.setEscalationStatusKey(StatusEnum.UNDER_REVIEW.getFlag());
+                    hyFreightSettlementInfo1.setEscalationStatus(StatusEnum.UNDER_REVIEW.getName());
+                    this.updateById(hyFreightSettlementInfo1);
+                }
             }
+            return "ok";
         }
-        return "ok";
+        return "NG";
     }
 
     /**
      * 流水单交管监测系统批量上报
+     *
      * @param hyFreightSettlementInfo
      * @return
      * @throws IOException
@@ -566,60 +573,64 @@ public class HyFreightSettlementInfoServiceImpl extends ServiceImpl<HyFreightSet
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String trafficManagementReport(HyFreightSettlementInfo hyFreightSettlementInfo) throws Exception {
-        if (CollectionUtils.isNotEmpty(hyFreightSettlementInfo.getHyFreightSettlementInfos())) {
-            for (HyFreightSettlementInfo hyFreightSettlementInfo1 : hyFreightSettlementInfo.getHyFreightSettlementInfos()) {
-                //查询上报所需信息
-                //查询订单
-                OrderInfo orderInfo1 = orderInfoService.selectById(hyFreightSettlementInfo1.getOrderId());
-                //司机信息
+        if ("3".equals(ENV)) {
+            if (CollectionUtils.isNotEmpty(hyFreightSettlementInfo.getHyFreightSettlementInfos())) {
+                for (HyFreightSettlementInfo hyFreightSettlementInfo1 : hyFreightSettlementInfo.getHyFreightSettlementInfos()) {
+                    //查询上报所需信息
+                    //查询订单
+                    OrderInfo orderInfo1 = orderInfoService.selectById(hyFreightSettlementInfo1.getOrderId());
+                    //司机信息
 //                HyDriverInfo hyDriverInfo = driverInfoService.selectOne(new EntityWrapper<HyDriverInfo>()
 //                        .eq("common_id",hyFreightSettlementInfo1.getCommonId()).eq("delete_flag","0"));
 //                hyFreightSettlementInfo1.setDriverIdCard(hyDriverInfo.getNumberCard());
-                //车辆信息
-                HyDriverCarInfo hyDriverCarInfo = driverCarInfoService.selectOne(new EntityWrapper<HyDriverCarInfo>()
-                        .eq("car_number",orderInfo1.getCarNumber()).eq("delete_flag","0"));
-                hyFreightSettlementInfo1.setCarNumber(hyDriverCarInfo.getCarNumber());
-                hyFreightSettlementInfo1.setCarNumberColour(hyDriverCarInfo.getCarNumberColour());
-                //查询银行key值
-                HyCommonSysParameter hyCommonSysParameter = commonSysParameterService.selectOne(new EntityWrapper<HyCommonSysParameter>()
-                        .eq("const_id", "BANK1").eq("const_value", orderInfo1.getBankDeposit()));
-                if (hyCommonSysParameter == null){
-                    hyFreightSettlementInfo1.setBankKey("9999");
-                }else {
-                    hyFreightSettlementInfo1.setBankKey(hyCommonSysParameter.getConstKey());
-                }
-                //监测系统上报
-                new Thread(new Runnable() {
-                    @Override
-                    public void run() {
-                        try{
-                            String result = MonitoringSystemReporting.getFinancialRoot(hyFreightSettlementInfo1);
-                            JSONObject jsonObject = JSONObject.fromObject(result);
-                            //发送成功
-                            if ("1001".equals(jsonObject.getString("code"))){
-                                hyFreightSettlementInfo1.setReportedStatusKey(StatusEnum.REPORTED_SUCESS.getFlag());
-                                hyFreightSettlementInfo1.setReportedStatus(StatusEnum.REPORTED_SUCESS.getName());
-                            }
-                            //发送失败
-                            else if ("3003".equals(jsonObject.getString("code"))){
-                                hyFreightSettlementInfo1.setReportedStatusKey(StatusEnum.REPORTED_FAIL.getFlag());
-                                hyFreightSettlementInfo1.setReportedStatus(StatusEnum.REPORTED_FAIL.getName());
-                                hyFreightSettlementInfo1.setReportedFailureReason(jsonObject.getString("data"));
+                    //车辆信息
+                    HyDriverCarInfo hyDriverCarInfo = driverCarInfoService.selectOne(new EntityWrapper<HyDriverCarInfo>()
+                            .eq("car_number", orderInfo1.getCarNumber()).eq("delete_flag", "0"));
+                    hyFreightSettlementInfo1.setCarNumber(hyDriverCarInfo.getCarNumber());
+                    hyFreightSettlementInfo1.setCarNumberColour(hyDriverCarInfo.getCarNumberColour());
+                    //查询银行key值
+                    HyCommonSysParameter hyCommonSysParameter = commonSysParameterService.selectOne(new EntityWrapper<HyCommonSysParameter>()
+                            .eq("const_id", "BANK1").eq("const_value", orderInfo1.getBankDeposit()));
+                    if (hyCommonSysParameter == null) {
+                        hyFreightSettlementInfo1.setBankKey("9999");
+                    } else {
+                        hyFreightSettlementInfo1.setBankKey(hyCommonSysParameter.getConstKey());
+                    }
+                    //监测系统上报
+                    new Thread(new Runnable() {
+                        @Override
+                        public void run() {
+                            try {
+                                String result = MonitoringSystemReporting.getFinancialRoot(hyFreightSettlementInfo1);
+                                JSONObject jsonObject = JSONObject.fromObject(result);
+                                //发送成功
+                                if ("1001".equals(jsonObject.getString("code"))) {
+                                    hyFreightSettlementInfo1.setReportedStatusKey(StatusEnum.REPORTED_SUCESS.getFlag());
+                                    hyFreightSettlementInfo1.setReportedStatus(StatusEnum.REPORTED_SUCESS.getName());
+                                }
+                                //发送失败
+                                else if ("3003".equals(jsonObject.getString("code"))) {
+                                    hyFreightSettlementInfo1.setReportedStatusKey(StatusEnum.REPORTED_FAIL.getFlag());
+                                    hyFreightSettlementInfo1.setReportedStatus(StatusEnum.REPORTED_FAIL.getName());
+                                    hyFreightSettlementInfo1.setReportedFailureReason(jsonObject.getString("data"));
+                                }
+                                hyFreightSettlementInfoService.updateById(hyFreightSettlementInfo1);
+                            } catch (Exception e) {
+                                e.printStackTrace();
                             }
-                            hyFreightSettlementInfoService.updateById(hyFreightSettlementInfo1);
-                        }catch (Exception e){
-                            e.printStackTrace();
                         }
-                    }
-                }).start();
+                    }).start();
+                }
             }
+            return "ok";
         }
-        return "ok";
+        return "NG";
     }
 
 
     /**
      * 流水单查看
+     *
      * @param hyFreightSettlementInfo
      * @return
      * @throws IOException
@@ -627,14 +638,14 @@ public class HyFreightSettlementInfoServiceImpl extends ServiceImpl<HyFreightSet
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public HyFreightSettlementInfo getHyFreightSettlementInfo(HyFreightSettlementInfo hyFreightSettlementInfo){
+    public HyFreightSettlementInfo getHyFreightSettlementInfo(HyFreightSettlementInfo hyFreightSettlementInfo) {
         //查询流水单信息
         HyFreightSettlementInfo hyFreightSettlementInfo1 = this.selectById(hyFreightSettlementInfo.getId());
         //查询订单
         OrderInfo orderInfo1 = orderInfoService.selectById(hyFreightSettlementInfo1.getOrderId());
         //司机信息
         HyDriverInfo hyDriverInfo = driverInfoService.selectOne(new EntityWrapper<HyDriverInfo>()
-                .eq("common_id",hyFreightSettlementInfo1.getCommonId()).eq("delete_flag","0"));
+                .eq("common_id", hyFreightSettlementInfo1.getCommonId()).eq("delete_flag", "0"));
         hyFreightSettlementInfo1.setDriverIdCard(hyDriverInfo.getNumberCard());
         hyFreightSettlementInfo1.setDriverSex(hyDriverInfo.getDriverSex());
         hyFreightSettlementInfo1.setDriverBirthday(hyDriverInfo.getDriverBirthday());
@@ -642,8 +653,8 @@ public class HyFreightSettlementInfoServiceImpl extends ServiceImpl<HyFreightSet
         hyFreightSettlementInfo1.setDriverAddress(hyDriverInfo.getCardAddress());
         //车辆信息
         HyDriverCarInfo hyDriverCarInfo = driverCarInfoService.selectOne(new EntityWrapper<HyDriverCarInfo>()
-                .eq("car_number",orderInfo1.getCarNumber()).eq("delete_flag","0"));
-        if (hyDriverCarInfo != null){
+                .eq("car_number", orderInfo1.getCarNumber()).eq("delete_flag", "0"));
+        if (hyDriverCarInfo != null) {
             hyFreightSettlementInfo1.setCarNumber(hyDriverCarInfo.getCarNumber());
             hyFreightSettlementInfo1.setCarNumberColour(hyDriverCarInfo.getCarNumberColour());
         }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/OrderInfoServiceImpl.java

@@ -117,6 +117,8 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
     private String bucket;
     @Autowired
     private OSSClient ossClient;
+    @Value("${com.changyuntong.env}")
+    private String ENV;
 
 
     /**
@@ -891,30 +893,33 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String batchSubmission(OrderInfo orderInfo) throws IOException {
-        //获取token
-        String token = EntityAnalyse.GetJTToken();
-        if (CollectionUtils.isNotEmpty(orderInfo.getOrderInfoList())) {
-            for (OrderInfo orderInfo1 : orderInfo.getOrderInfoList()) {
-
-                //园区上报
-                orderInfo1.setToken(token);
-                new Thread(new Runnable() {
-                    @Override
-                    public void run() {
-                        try {
-                            EntityAnalyse.uploadWaybill(orderInfo1);
-                        } catch (Exception e) {
-                            e.printStackTrace();
+        if ("3".equals(ENV)) {
+            //获取token
+            String token = EntityAnalyse.GetJTToken();
+            if (CollectionUtils.isNotEmpty(orderInfo.getOrderInfoList())) {
+                for (OrderInfo orderInfo1 : orderInfo.getOrderInfoList()) {
+
+                    //园区上报
+                    orderInfo1.setToken(token);
+                    new Thread(new Runnable() {
+                        @Override
+                        public void run() {
+                            try {
+                                EntityAnalyse.uploadWaybill(orderInfo1);
+                            } catch (Exception e) {
+                                e.printStackTrace();
+                            }
                         }
-                    }
-                }).start();
-                //更改上报状态
-                orderInfo1.setEscalationStatusKey(StatusEnum.UNDER_REVIEW.getFlag());
-                orderInfo1.setEscalationStatus(StatusEnum.UNDER_REVIEW.getName());
-                this.updateById(orderInfo1);
+                    }).start();
+                    //更改上报状态
+                    orderInfo1.setEscalationStatusKey(StatusEnum.UNDER_REVIEW.getFlag());
+                    orderInfo1.setEscalationStatus(StatusEnum.UNDER_REVIEW.getName());
+                    this.updateById(orderInfo1);
+                }
             }
+            return "ok";
         }
-        return "ok";
+        return "NG";
     }
 
     /**
@@ -927,98 +932,101 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String waybillAdministrationReport(OrderInfo orderInfo)  throws Exception  {
-        if (CollectionUtils.isNotEmpty(orderInfo.getOrderInfoList())) {
-            for (OrderInfo orderInfo1 : orderInfo.getOrderInfoList()) {
-                //1.查询任务,获取业务类型代码
-                PublishTaskInfo publishTaskInfo = publishTaskInfoService.selectById(orderInfo1.getTaskId());
-                if (publishTaskInfo != null) {
-                    orderInfo1.setBusinessTypeCode(publishTaskInfo.getBusinessTypeKey());
-                    orderInfo1.setShipToName(publishTaskInfo.getReceiver());
-                    if (publishTaskInfo.getReceiverIdcard() == null && publishTaskInfo.getReceiverIdcard().isEmpty()) {
-                        orderInfo1.setShipToID(publishTaskInfo.getReceiverCreditCode());
-                    } else {
-                        orderInfo1.setShipToID(publishTaskInfo.getReceiverIdcard());
-                    }
-                    if (!"个人货主".equals(publishTaskInfo.getCargoOwner()) && publishTaskInfo.getCompId() != null) {
-                        //查询公司社会信用代码
-                        HyCompanyInfo hyCompanyInfo = companyInfoService.selectById(publishTaskInfo.getCompId());
-                        if (hyCompanyInfo != null) {
-                            orderInfo1.setConsignorID(hyCompanyInfo.getUnifiedSocialCreditCode());
+    public String waybillAdministrationReport(OrderInfo orderInfo) throws Exception {
+        if ("3".equals(ENV)) {
+            if (CollectionUtils.isNotEmpty(orderInfo.getOrderInfoList())) {
+                for (OrderInfo orderInfo1 : orderInfo.getOrderInfoList()) {
+                    //1.查询任务,获取业务类型代码
+                    PublishTaskInfo publishTaskInfo = publishTaskInfoService.selectById(orderInfo1.getTaskId());
+                    if (publishTaskInfo != null) {
+                        orderInfo1.setBusinessTypeCode(publishTaskInfo.getBusinessTypeKey());
+                        orderInfo1.setShipToName(publishTaskInfo.getReceiver());
+                        if (publishTaskInfo.getReceiverIdcard() == null && publishTaskInfo.getReceiverIdcard().isEmpty()) {
+                            orderInfo1.setShipToID(publishTaskInfo.getReceiverCreditCode());
+                        } else {
+                            orderInfo1.setShipToID(publishTaskInfo.getReceiverIdcard());
+                        }
+                        if (!"个人货主".equals(publishTaskInfo.getCargoOwner()) && publishTaskInfo.getCompId() != null) {
+                            //查询公司社会信用代码
+                            HyCompanyInfo hyCompanyInfo = companyInfoService.selectById(publishTaskInfo.getCompId());
+                            if (hyCompanyInfo != null) {
+                                orderInfo1.setConsignorID(hyCompanyInfo.getUnifiedSocialCreditCode());
+                            }
                         }
                     }
-                }
-                //2.查询承运表，装卸货时间
-                HyCarrierInfo hyCarrierInfo = carrierInfoService.selectOne(new EntityWrapper<HyCarrierInfo>().eq("order_id", orderInfo1.getId())
-                        .eq("delete_flag", "0"));
-                if (hyCarrierInfo != null) {
-                    orderInfo1.setDeliveryTime(hyCarrierInfo.getLoadingDate());
-                    orderInfo1.setReceivingTime(hyCarrierInfo.getUnloadingDate());
-                    orderInfo1.setGrossWeight(hyCarrierInfo.getLoadingGrossWeight());
-                }
-                //3.查询托运人信息
-                HyCargoOwnerInfo hyCargoOwnerInfo = cargoOwnerInfoService.selectOne(new EntityWrapper<HyCargoOwnerInfo>()
-                        .eq("common_id", orderInfo1.getCargoCommonId()).eq("delete_flag", "0"));
-                if (hyCargoOwnerInfo != null) {
-                    orderInfo1.setConsignorName(hyCargoOwnerInfo.getName());
-                    if ("个人货主".equals(publishTaskInfo.getCargoOwner())) {
-                        //查询托运人身份证号
-                        orderInfo1.setConsignorID(hyCargoOwnerInfo.getCardNumber());
+                    //2.查询承运表，装卸货时间
+                    HyCarrierInfo hyCarrierInfo = carrierInfoService.selectOne(new EntityWrapper<HyCarrierInfo>().eq("order_id", orderInfo1.getId())
+                            .eq("delete_flag", "0"));
+                    if (hyCarrierInfo != null) {
+                        orderInfo1.setDeliveryTime(hyCarrierInfo.getLoadingDate());
+                        orderInfo1.setReceivingTime(hyCarrierInfo.getUnloadingDate());
+                        orderInfo1.setGrossWeight(hyCarrierInfo.getLoadingGrossWeight());
                     }
-                }
-                //查询发货地区行政区划代码
-                HyCommonSysParameter hyCommonSysParameter = commonSysParameterService.selectOne(new EntityWrapper<HyCommonSysParameter>()
-                        .eq("const_id", "REGION1").eq("const_value", orderInfo1.getSendArea()));
-                orderInfo1.setNationalCode(hyCommonSysParameter.getConstKey());
-                //查询收货地区行政区划代码
-                HyCommonSysParameter hyCommonSysParameter1 = commonSysParameterService.selectOne(new EntityWrapper<HyCommonSysParameter>()
-                        .eq("const_id", "REGION1").eq("const_value", orderInfo1.getUnloadArea()));
-                orderInfo1.setShipToNationalCode(hyCommonSysParameter1.getConstKey());
-                //判断该司机是否有车队长
-                if(orderInfo1.getCarCaptainCommonId() != null && !orderInfo1.getCarCaptainCommonId().isEmpty()){
-                    //有车队长
-                    //查询车队长信息
-                    HyCarCaptainInfo hyCarCaptainInfo = hyCarCaptainInfoService.selectOne(new EntityWrapper<HyCarCaptainInfo>()
-                            .eq("common_id", orderInfo1.getCarCaptainCommonId()).eq("delete_flag", "0"));
-                    if (hyCarCaptainInfo != null) {
-                        orderInfo1.setRoadTransportBusinessLicenseNo(hyCarCaptainInfo.getRoadTransportOperationLicenseNo());
+                    //3.查询托运人信息
+                    HyCargoOwnerInfo hyCargoOwnerInfo = cargoOwnerInfoService.selectOne(new EntityWrapper<HyCargoOwnerInfo>()
+                            .eq("common_id", orderInfo1.getCargoCommonId()).eq("delete_flag", "0"));
+                    if (hyCargoOwnerInfo != null) {
+                        orderInfo1.setConsignorName(hyCargoOwnerInfo.getName());
+                        if ("个人货主".equals(publishTaskInfo.getCargoOwner())) {
+                            //查询托运人身份证号
+                            orderInfo1.setConsignorID(hyCargoOwnerInfo.getCardNumber());
+                        }
                     }
-                }else {
-                    //查询司机信息
-                    HyDriverInfo hyDriverInfo = driverInfoService.selectOne(new EntityWrapper<HyDriverInfo>()
-                            .eq("common_id", orderInfo1.getCommonId()).eq("delete_flag", "0"));
-                    if (hyDriverInfo != null) {
-                        orderInfo1.setRoadTransportBusinessLicenseNo(hyDriverInfo.getActualCarrierBusinessLicense());
+                    //查询发货地区行政区划代码
+                    HyCommonSysParameter hyCommonSysParameter = commonSysParameterService.selectOne(new EntityWrapper<HyCommonSysParameter>()
+                            .eq("const_id", "REGION1").eq("const_value", orderInfo1.getSendArea()));
+                    orderInfo1.setNationalCode(hyCommonSysParameter.getConstKey());
+                    //查询收货地区行政区划代码
+                    HyCommonSysParameter hyCommonSysParameter1 = commonSysParameterService.selectOne(new EntityWrapper<HyCommonSysParameter>()
+                            .eq("const_id", "REGION1").eq("const_value", orderInfo1.getUnloadArea()));
+                    orderInfo1.setShipToNationalCode(hyCommonSysParameter1.getConstKey());
+                    //判断该司机是否有车队长
+                    if (orderInfo1.getCarCaptainCommonId() != null && !orderInfo1.getCarCaptainCommonId().isEmpty()) {
+                        //有车队长
+                        //查询车队长信息
+                        HyCarCaptainInfo hyCarCaptainInfo = hyCarCaptainInfoService.selectOne(new EntityWrapper<HyCarCaptainInfo>()
+                                .eq("common_id", orderInfo1.getCarCaptainCommonId()).eq("delete_flag", "0"));
+                        if (hyCarCaptainInfo != null) {
+                            orderInfo1.setRoadTransportBusinessLicenseNo(hyCarCaptainInfo.getRoadTransportOperationLicenseNo());
+                        }
+                    } else {
+                        //查询司机信息
+                        HyDriverInfo hyDriverInfo = driverInfoService.selectOne(new EntityWrapper<HyDriverInfo>()
+                                .eq("common_id", orderInfo1.getCommonId()).eq("delete_flag", "0"));
+                        if (hyDriverInfo != null) {
+                            orderInfo1.setRoadTransportBusinessLicenseNo(hyDriverInfo.getActualCarrierBusinessLicense());
+                        }
                     }
-                }
 
-                //监测系统上报
-                new Thread(new Runnable() {
-                    @Override
-                    public void run() {
-                        try {
-                            String result = MonitoringSystemReporting.testDispatch(orderInfo1);
-                            JSONObject jsonObject = JSONObject.fromObject(result);
-                            //发送成功
-                            if ("1001".equals(jsonObject.getString("code"))){
-                                orderInfo1.setReportedStatusKey(StatusEnum.REPORTED_SUCESS.getFlag());
-                                orderInfo1.setReportedStatus(StatusEnum.REPORTED_SUCESS.getName());
+                    //监测系统上报
+                    new Thread(new Runnable() {
+                        @Override
+                        public void run() {
+                            try {
+                                String result = MonitoringSystemReporting.testDispatch(orderInfo1);
+                                JSONObject jsonObject = JSONObject.fromObject(result);
+                                //发送成功
+                                if ("1001".equals(jsonObject.getString("code"))) {
+                                    orderInfo1.setReportedStatusKey(StatusEnum.REPORTED_SUCESS.getFlag());
+                                    orderInfo1.setReportedStatus(StatusEnum.REPORTED_SUCESS.getName());
+                                }
+                                //发送失败
+                                else if ("3003".equals(jsonObject.getString("code"))) {
+                                    orderInfo1.setReportedStatusKey(StatusEnum.REPORTED_FAIL.getFlag());
+                                    orderInfo1.setReportedStatus(StatusEnum.REPORTED_FAIL.getName());
+                                    orderInfo1.setReportedFailureReason(jsonObject.getString("data"));
+                                }
+                                orderInfoService.updateById(orderInfo1);
+                            } catch (Exception e) {
+                                e.printStackTrace();
                             }
-                            //发送失败
-                            else if ("3003".equals(jsonObject.getString("code"))){
-                                orderInfo1.setReportedStatusKey(StatusEnum.REPORTED_FAIL.getFlag());
-                                orderInfo1.setReportedStatus(StatusEnum.REPORTED_FAIL.getName());
-                                orderInfo1.setReportedFailureReason(jsonObject.getString("data"));
-                            }
-                            orderInfoService.updateById(orderInfo1);
-                        } catch (Exception e) {
-                            e.printStackTrace();
                         }
-                    }
-                }).start();
+                    }).start();
+                }
             }
+            return "ok";
         }
-        return "ok";
+        return "NG";
     }
 
 
@@ -1429,11 +1437,11 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 }
                 //查询车辆核定载重量
                 if ("挂车".equals(hyDriverCarInfo.getCarCategory())) {
-                    if (Double.valueOf(orderInfo.getWeight()) > (hyDriverCarInfo.getGuaCarApprovedWeight() / 1000)) {
+                    if (orderInfo.getGrossWeight() >= (hyDriverCarInfo.getGuaCarApprovedWeight() / 1000)) {
                         throw new YException(YExceptionEnum.LOADING_NETWEIGHT_OVERLOAD);
                     }
                 } else {
-                    if (Double.valueOf(orderInfo.getWeight()) > (hyDriverCarInfo.getCarApprovedWeight() / 1000)) {
+                    if (orderInfo.getGrossWeight() >= (hyDriverCarInfo.getCarApprovedWeight() / 1000)) {
                         throw new YException(YExceptionEnum.LOADING_NETWEIGHT_OVERLOAD);
                     }
                 }
@@ -1453,10 +1461,10 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 orderInfo1.setDriverContractUrl(pdfUrl);
                 orderInfo1.setDriverAutograph(orderInfo.getDriverAutograph());
                 orderInfo1.setContractNo(orderInfo1.getOrderNo().replace("CY", "CYHT"));
-                if(orderInfo.getBankCard() != null){
+                if (orderInfo.getBankCard() != null) {
                     orderInfo1.setBankCard(orderInfo.getBankCard());
                 }
-                if(orderInfo.getBankDeposit() != null){
+                if (orderInfo.getBankDeposit() != null) {
                     orderInfo1.setBankDeposit(orderInfo.getBankDeposit());
                 }
                 if (orderInfo.getBankDepositBranch() != null) {