Merge branch 'v5.7_break_contract_reverse_20231020' into test

performance-web/src/main/java/com/clx/performance/controller/app/AppGoodsOrderController.java

@@ -63,8 +63,7 @@ public class AppGoodsOrderController {
 
     @ApiOperation(value = "司机端无接单位置上报", notes = "<br>By:胡宇帆")
     @GetMapping("/getCancelOrderGoods")
-    public Result<List<OrderGoods>> getCancelOrderGoods() {
-        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
-        return Result.ok(orderGoodsTruckBindService.getCancelOrderGoods(loginUserInfo.getUserNo()));
+    public Result<List<OrderGoods>> getCancelOrderGoods(@RequestParam(value = "userNo") Long userNo) {
+        return Result.ok(orderGoodsTruckBindService.getCancelOrderGoods(userNo));
     }
 }

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

@@ -358,7 +358,7 @@ public class BreakContractSettlementOwnerServiceImpl  implements BreakContractSe
                 BigDecimal deliveredWeight = BigDecimal.ZERO;//已拉运的重量
                 BigDecimal deliveredFreight = BigDecimal.ZERO;//已拉运的费用
                 for(OrderChild orderChild : orderChilds){
-                    if(orderChild.getLoadNet() != null){
+                    if(orderChild.getLoadNet() == null){
                         deliveredWeight = deliveredWeight.add(orderChild.getWeight()) ;
                         deliveredFreight = deliveredFreight.add(orderChild.getOrderFreightPrice().multiply(orderChild.getWeight()));
                     }else{
@@ -461,7 +461,7 @@ public class BreakContractSettlementOwnerServiceImpl  implements BreakContractSe
                 BigDecimal deliveredFreight = BigDecimal.ZERO;//已拉运的费用
                 BigDecimal seconds = BigDecimal.ZERO;//总毫秒数
                 for(OrderChild orderChild : orderChilds){
-                    if(orderChild.getLoadNet() != null){
+                    if(orderChild.getLoadNet() == null){
                         deliveredWeight = deliveredWeight.add(orderChild.getWeight()) ;
                         deliveredFreight = deliveredFreight.add(orderChild.getOrderFreightPrice().multiply(orderChild.getWeight()));
                     }else{