修改BUG

performance-web/src/main/java/com/clx/performance/controller/pc/GoodsOrderController.java

@@ -95,11 +95,11 @@ public class GoodsOrderController {
             goodsOrderStrategyContext.strategyContext.get(truckDemand).saveGoodsOrder(orderGoodsParams, orderInfo, now, rabbitTemplate);
 
         } catch (Exception e) {
-            log.error(ExceptionUtils.getStackTrace(e));
+            log.info(e.getMessage());
             throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, e.getMessage());
         } finally {
             try {
-                if (rLock != null && rLock.isLocked()) {
+                if (rLock != null && rLock.isLocked() && rLock.isHeldByCurrentThread()) {
                     rLock.unlock();
                 }
                 log.info("锁释放完成");

performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java

@@ -310,9 +310,16 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
                 rollbackOrderWeightParam.setOwnResidueCarryWeight(BigDecimal.ZERO);
                 rollbackOrderWeightParam.setPlatformResidueCarryWeight(answer);
             }else if (oldOrderGoods.getTruckDemand().equals(TruckDemandEnum.TruckType.PLATFORM_ANY_CAR.getCode())) {
-                rollbackOrderWeightParam.setResidueWeight(answer);
-                rollbackOrderWeightParam.setOwnResidueCarryWeight(answer);
-                rollbackOrderWeightParam.setPlatformResidueCarryWeight(BigDecimal.ZERO);
+                if (orderGoodsParams.getVehicleUsage().equals(VehicleUsageEnum.Status.OWN.getCode())) {
+                    rollbackOrderWeightParam.setResidueWeight(answer);
+                    rollbackOrderWeightParam.setOwnResidueCarryWeight(answer);
+                    rollbackOrderWeightParam.setPlatformResidueCarryWeight(BigDecimal.ZERO);
+                } else {
+                    rollbackOrderWeightParam.setResidueWeight(answer);
+                    rollbackOrderWeightParam.setOwnResidueCarryWeight(BigDecimal.ZERO);
+                    rollbackOrderWeightParam.setPlatformResidueCarryWeight(answer);
+                }
+
             }
             log.info("回填吨数：{}", JSONUtil.parse(rollbackOrderWeightParam));
             orderFeign.rollbackOrderWeight(rollbackOrderWeightParam);