2024-05-23-4提交

yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/service/customer/CustomerServiceImpl.java

@@ -1326,7 +1326,6 @@ public class CustomerServiceImpl extends AbstractService<CustomerMapper, Custome
     @Override
     public PageResult<CustomerDO> getWaitToConfirmCustomerPage(CustomerPageReqVO pageReqVO) {
 
-
         IPage<CustomerDO> mpPage = MyBatisUtils.buildPage(pageReqVO);
 
         LambdaQueryWrapper<CustomerDO> customerDOLambdaQueryWrapperX = new LambdaQueryWrapperX<CustomerDO>()

yudao-module-customer/yudao-module-customer-rest/src/main/java/cn/iocoder/yudao/module/customer/controller/admin/customer/CustomerController.java

@@ -362,10 +362,11 @@ public class CustomerController {
     @ApiOperation("获得待接收列表")
 //    @PreAuthorize("@ss.hasPermission('ecw:customer:query')")
     public CommonResult<PageResult<CustomerRespVO>> getWaitConfirmList(@Valid CustomerPageReqVO customerPageReqVO) {
-
+        //lanbm 2024-05-26 添加注释
         customerPageReqVO.setCustomerService(WebFrameworkUtils.getLoginUserId());
 
-        PageResult<CustomerDO> pageResult = customerService.getWaitToConfirmCustomerPage(customerPageReqVO);
+        PageResult<CustomerDO> pageResult =
+                customerService.getWaitToConfirmCustomerPage(customerPageReqVO);
         return success(CustomerConvert.INSTANCE.convertPage(pageResult));
     }
 
@@ -395,8 +396,9 @@ public class CustomerController {
     @ApiOperation("获得待分配客户列表")
 //    @PreAuthorize("@ss.hasPermission('ecw:customer:query')")
     public CommonResult<PageResult<CustomerRespVO>> getWaitForDistributionList(@Valid CustomerPageReqVO customerPageReqVO) {
-
-        PageResult<CustomerDO> pageResult = customerService.getWaitToAssignedCustomerPage(customerPageReqVO);
+        //lanbm 2024-05-26 添加注释
+        PageResult<CustomerDO> pageResult =
+                customerService.getWaitToAssignedCustomerPage(customerPageReqVO);
         return success(CustomerConvert.INSTANCE.convertPage(pageResult));
     }
 

yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/listener/CalculateOrderVValueListener.java

@@ -58,7 +58,7 @@ public class CalculateOrderVValueListener {
             if (orderDO.getTransportId() == 1) {
                 //海运计算V值
                 temp = ecwVzService.getOne(new LambdaQueryWrapperX<EcwVz>()
-                        .eqIfPresent(EcwVz::getTitleZh, "M3"));
+                        .eqIfPresent(EcwVz::getFuhao, "M3"));
                 if (temp == null) {
                     throw exception(VCONFIG_NOT_EXISTS);
                 }
@@ -66,7 +66,7 @@ public class CalculateOrderVValueListener {
             } else if (orderDO.getTransportId() == 3) {
                 //空运计算V值
                 temp = ecwVzService.getOne(new LambdaQueryWrapperX<EcwVz>()
-                        .eqIfPresent(EcwVz::getTitleZh, "KG"));
+                        .eqIfPresent(EcwVz::getFuhao, "KG"));
                 if (temp == null) {
                     throw exception(VCONFIG_NOT_EXISTS);
                 }