结算单号查询详情

performance-web/src/main/java/com/clx/performance/controller/pc/breakcontract/carrier/CarrierBreakContractSettlementOwnerController.java

@@ -56,8 +56,8 @@ public class CarrierBreakContractSettlementOwnerController {
     @ApiOperation(value = "详情",notes = "<br>By:李瑞新")
     @GetMapping("/getCarrierBreakContractSettlementOwnerDetail")
     @UnitCovert(param = false)
-    public Result<CarrierBreakContractSettlementOwnerDetailVO> getCarrierBreakContractSettlementOwnerDetail(@NotNull(message = "id不能为空") Integer id) {
-        return Result.ok(breakContractSettlementOwnerService.getCarrierBreakContractSettlementOwnerDetail(id));
+    public Result<CarrierBreakContractSettlementOwnerDetailVO> getCarrierBreakContractSettlementOwnerDetail(@NotNull(message = "结算单号不能为空") String settlementNo) {
+        return Result.ok(breakContractSettlementOwnerService.getCarrierBreakContractSettlementOwnerDetail(settlementNo));
     }
 
     @ApiOperation(value = "上传结算凭证",notes = "<br>By:李瑞新")

performance-web/src/main/java/com/clx/performance/controller/pc/breakcontract/owner/OwnerBreakContractSettlementOwnerController.java

@@ -40,8 +40,8 @@ public class OwnerBreakContractSettlementOwnerController {
     @ApiOperation(value = "详情",notes = "<br>By:李瑞新")
     @GetMapping("/getOwnerBreakContractSettlementOwnerDetail")
     @UnitCovert(param = false)
-    public Result<CarrierBreakContractSettlementOwnerDetailVO> getOwnerBreakContractSettlementOwnerDetail(@NotNull(message = "id不能为空") Integer id) {
-        return Result.ok(breakContractSettlementOwnerService.getCarrierBreakContractSettlementOwnerDetail(id));
+    public Result<CarrierBreakContractSettlementOwnerDetailVO> getOwnerBreakContractSettlementOwnerDetail(@NotNull(message = "结算单号不能为空") String settlementNo) {
+        return Result.ok(breakContractSettlementOwnerService.getCarrierBreakContractSettlementOwnerDetail(settlementNo));
     }
 
     @ApiOperation(value = "列表",notes = "<br>By:李瑞新")

performance-web/src/main/java/com/clx/performance/dao/breakcontract/BreakContractSettlementOwnerDao.java

@@ -6,6 +6,7 @@ import com.clx.performance.mapper.breakcontract.BreakContractSettlementOwnerMapp
 import com.clx.performance.model.breakcontract.BreakContractSettlementOwner;
 import com.clx.performance.param.pc.breakcontract.carrier.CarrierBreakContractSavePayeeParam;
 import com.clx.performance.param.pc.breakcontract.carrier.PageCarrierBreakContractSettlementOwnerParam;
+import com.msl.common.base.Optional;
 import com.msl.common.dao.BaseDao;
 import org.apache.ibatis.annotations.Param;
 
@@ -24,4 +25,6 @@ public interface BreakContractSettlementOwnerDao extends BaseDao<BreakContractSe
 
     boolean saveCarrierBreakContractPayee(CarrierBreakContractSavePayeeParam param);
 
+    Optional<BreakContractSettlementOwner> getDetailBySettlementNo(@Param("settlementNo") String settlementNo);
+
 }

performance-web/src/main/java/com/clx/performance/dao/impl/breakcontract/BreakContractSettlementOwnerDaoImpl.java

@@ -10,6 +10,7 @@ import com.clx.performance.mapper.breakcontract.BreakContractSettlementOwnerMapp
 import com.clx.performance.model.breakcontract.BreakContractSettlementOwner;
 import com.clx.performance.param.pc.breakcontract.carrier.CarrierBreakContractSavePayeeParam;
 import com.clx.performance.param.pc.breakcontract.carrier.PageCarrierBreakContractSettlementOwnerParam;
+import com.msl.common.base.Optional;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Repository;
@@ -73,4 +74,11 @@ public class BreakContractSettlementOwnerDaoImpl extends BaseDaoImpl<BreakContra
                 .set(BreakContractSettlementOwner::getStatus, to)
         );
     }
+
+    @Override
+    public Optional<BreakContractSettlementOwner> getDetailBySettlementNo(String settlementNo) {
+        return Optional.of(lQrWrapper()
+                .eq(BreakContractSettlementOwner::getSettlementNo, settlementNo))
+                .map(super::getOne);
+    }
 }

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

@@ -20,7 +20,7 @@ public interface BreakContractSettlementOwnerService  {
 
     SXSSFWorkbook exportCarrierBreakContractSettlementOwnerList(PageCarrierBreakContractSettlementOwnerParam param);
 
-    CarrierBreakContractSettlementOwnerDetailVO getCarrierBreakContractSettlementOwnerDetail(Integer id);
+    CarrierBreakContractSettlementOwnerDetailVO getCarrierBreakContractSettlementOwnerDetail(String settlementNo);
 
     void uploadInvoiceImg(CarrierUploadInvoiceImgParam param);
 

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

@@ -308,7 +308,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChild.setSettlementAccountPeriod(orderGoods.getSettlementAccountPeriod());
 
         // 更新货单数据
-        updateOrderGoodsAmount(orderGoods, truckLoad);
+        updateOrderGoodsAmount(orderGoods, orderChild.getWeight());
 
         // 更新定向单状态
         updateOrderGoodsDirect(bind);

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

@@ -142,13 +142,12 @@ public class BreakContractSettlementOwnerServiceImpl  implements BreakContractSe
     }
 
     @Override
-    public CarrierBreakContractSettlementOwnerDetailVO getCarrierBreakContractSettlementOwnerDetail(Integer id) {
+    public CarrierBreakContractSettlementOwnerDetailVO getCarrierBreakContractSettlementOwnerDetail(String settlementNo) {
         //结算单详情
-        BreakContractSettlementOwner settlementOwner =breakContractSettlementOwnerDao.getEntityByKey(id).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        BreakContractSettlementOwner settlementOwner =breakContractSettlementOwnerDao.getDetailBySettlementNo(settlementNo).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
 
         CarrierBreakContractSettlementOwnerDetailVO detail = breakContractSettlementOwnerStruct.convertToDetail(settlementOwner);
 
-        String settlementNo = settlementOwner.getSettlementNo();
         List<BreakContractSettlementLog> settlementLogs = breakContractSettlementLogDao.getSettlementLogs(settlementNo);
 
         List<CarrierBreakContractSettlementLogVO> settlementLogVOS = breakContractSettlementLogStruct.covertToCarrierList(settlementLogs);