定点、到站回收订单业务功能开发v5

nxhs-common/src/main/java/cc/yunxi/common/utils/CommonUtil.java

@@ -89,7 +89,8 @@ public class CommonUtil {
         Class<?> clazz = obj.getClass();
         Field field = ReflectUtil.getField(clazz, fieldName);
         if (field != null) {
-            field.set(clazz, value);
+            field.setAccessible(true);
+            field.set(obj, value);
         }
     }
 
@@ -100,7 +101,8 @@ public class CommonUtil {
         if (field == null) {
             return null;
         }
-        return field.get(clazz);
+        field.setAccessible(true);
+        return field.get(obj);
     }
 
 

nxhs-service/src/main/java/cc/yunxi/controller/IndexController.java

@@ -42,7 +42,7 @@ public class IndexController {
     @ApiOperation("废品类目列表")
     @GetMapping("/products")
     public CommonResult<List<ProductSimpleVO>> queryProductList() {
-        List<Product> productList = priceProductService.queryProductList(Collections.emptyList());
+        List<Product> productList = priceProductService.queryProductList();
         List<ProductSimpleVO> productSimpleVOList = BeanUtils.copyList(productList, ProductSimpleVO.class);
         return CommonResult.success(productSimpleVOList);
     }

nxhs-service/src/main/java/cc/yunxi/controller/RecycleOrderController.java

@@ -244,7 +244,7 @@ public class RecycleOrderController {
                 LocationDTO location = (LocationDTO) CommonUtil.obtainField(orderRespVO, "location");
                 if (location != null) {
                     BigDecimal distance = CommonUtil.getDistance(longitude, latitude, location.getLongitude(), location.getLatitude());
-                    CommonUtil.assignField(orderRespVO, "distance2", distance);
+                    CommonUtil.assignField(orderRespVO, "distance2", distance.doubleValue());
                 }
             });
         }
@@ -262,7 +262,8 @@ public class RecycleOrderController {
         List<RecycleOrderDetailResponseVO> detailResponseVOList = BeanUtils.copyList(orderProducts, RecycleOrderDetailResponseVO.class);
         // 查询废品信息
         Set<String> productIds = detailResponseVOList.stream().map(RecycleOrderDetailResponseVO::getProductId).collect(Collectors.toSet());
-        List<Product> productList = priceProductService.queryProductList(productIds);
+        List<Product> productList = priceProductService.getProductListByIds(productIds);
+        if (CollUtils.isNotEmpty(productList)) {
             Map<String, Product> productMap = productList.stream().collect(Collectors.toMap(Product::getId, p -> p, (k1, k2) -> k1));
             for (RecycleOrderDetailResponseVO detailVO : detailResponseVOList) {
                 Product product = productMap.get(detailVO.getProductId());
@@ -274,6 +275,7 @@ public class RecycleOrderController {
                 CommonUtil.assignField(v, "orderDetails", orderProductsMap.get(v.getId()));
             });
         }
+    }
 
 
     /**
@@ -288,7 +290,8 @@ public class RecycleOrderController {
                     return Optional.ofNullable(clientAddressId).orElse("");
                 }, (k1, k2) -> k1));
         Set<String> addressIds = new HashSet<>(CollUtils.removeEmpty(orderAddressMap.values()));
-        List<ClientAddress> clientAddresses = clientAddressService.queryAddressList(addressIds);
+        List<ClientAddress> clientAddresses = clientAddressService.getAddressListByIds(addressIds);
+        if (CollUtils.isNotEmpty(clientAddresses)) {
             List<ClientAddressSimpleVO> addressSimpleVOList = BeanUtils.copyList(clientAddresses, ClientAddressSimpleVO.class);
             Map<String, ClientAddressSimpleVO> clientAddressMap = addressSimpleVOList.stream().collect(
                     Collectors.toMap(ClientAddressSimpleVO::getId, v -> v, (k1, k2) -> k1));
@@ -297,6 +300,7 @@ public class RecycleOrderController {
                 CommonUtil.assignField(v, "clientAddressId", clientAddressId);
             });
         }
+    }
 
 
     /**
@@ -309,6 +313,7 @@ public class RecycleOrderController {
                 RecycleOrderRespVO::getId, v -> Optional.ofNullable(v.getStaffsId()).orElse(""), (k1, k2) -> k1));
         Set<String> recyclerIds = new HashSet<>(CollUtils.removeEmpty(orderRecyclerMap.values()));
         List<Recycler> recyclerList = recyclerService.getRecyclerByIds(recyclerIds);
+        if (ObjectUtil.isNotEmpty(recyclerList)) {
             List<RecyclerSimpleVO> recyclerSimpleVOList = BeanUtils.copyList(recyclerList, RecyclerSimpleVO.class);
             Map<String, RecyclerSimpleVO> recyclerMap = recyclerSimpleVOList.stream().collect(
                     Collectors.toMap(RecyclerSimpleVO::getId, v -> v, (k1, k2) -> k1));
@@ -320,6 +325,7 @@ public class RecycleOrderController {
                 }
             });
         }
+    }
 
 
     /**
@@ -335,6 +341,7 @@ public class RecycleOrderController {
                 }, (k1, k2) -> k1));
         Set<String> housingEstateIds = new HashSet<>(CollUtils.removeEmpty(orderHousingEstateMap.values()));
         List<HousingEstate> housingEstateList = housingEstateService.getHousingListByIds(housingEstateIds);
+        if (CollUtils.isNotEmpty(housingEstateList)) {
             List<HousingEstateSimpleVO> housingSimpleVOList = BeanUtils.copyList(housingEstateList, HousingEstateSimpleVO.class);
             Map<String, HousingEstateSimpleVO> housingEstateMap = housingSimpleVOList.stream().collect(
                     Collectors.toMap(HousingEstateSimpleVO::getId, v -> v, (k1, k2) -> k1));
@@ -343,5 +350,6 @@ public class RecycleOrderController {
                 CommonUtil.assignField(v, "housingEstateInfo", housingEstateMap.get(housingEstateId));
             });
         }
+    }
 
 }

nxhs-service/src/main/java/cc/yunxi/service/IClientAddressService.java

@@ -34,7 +34,7 @@ public interface IClientAddressService extends IService<ClientAddress> {
      * @param addressIds
      * @return List<RecycleOrderProduct>
      */
-    List<ClientAddress> queryAddressList(Collection<String> addressIds);
+    List<ClientAddress> getAddressListByIds(Collection<String> addressIds);
 
 
 

nxhs-service/src/main/java/cc/yunxi/service/IPriceProductService.java

@@ -22,7 +22,12 @@ public interface IPriceProductService extends IService<PriceProduct> {
      * 获取废品类目
      * @return List<Product>
      */
-    List<Product> queryProductList(Collection<String> productIds);
+    List<Product> queryProductList();
 
 
+    /**
+     * 通过id集获取废品类目
+     * @return List<Product>
+     */
+    List<Product> getProductListByIds(Collection<String> productIds);
 }

nxhs-service/src/main/java/cc/yunxi/service/impl/ClientAddressServiceImpl.java

@@ -48,8 +48,11 @@ public class ClientAddressServiceImpl extends ServiceImpl<ClientAddressMapper, C
 
 
     @Override
-    public List<ClientAddress> queryAddressList(Collection<String> addressIds) {
+    public List<ClientAddress> getAddressListByIds(Collection<String> addressIds) {
         LambdaQueryWrapperX<ClientAddress> wrapperX = new LambdaQueryWrapperX<>();
+        if (CollUtils.isEmpty(addressIds)) {
+            return CollUtils.emptyList();
+        }
         wrapperX.in(ClientAddress::getId, addressIds);
         return list(wrapperX);
     }

nxhs-service/src/main/java/cc/yunxi/service/impl/HousingEstateServiceImpl.java

@@ -1,6 +1,7 @@
 package cc.yunxi.service.impl;
 
 import cc.yunxi.common.exception.BizIllegalException;
+import cc.yunxi.common.utils.CollUtils;
 import cc.yunxi.domain.dto.LocationDTO;
 import cc.yunxi.domain.po.HousingEstate;
 import cc.yunxi.domain.po.Recycler;
@@ -48,6 +49,9 @@ public class HousingEstateServiceImpl extends ServiceImpl<HousingEstateMapper, H
     @Override
     public List<HousingEstate> getHousingListByIds(Collection<String> housingIds) {
         LambdaQueryWrapper<HousingEstate> wrapper = new LambdaQueryWrapper<>();
+        if (CollUtils.isEmpty(housingIds)) {
+            return CollUtils.emptyList();
+        }
         wrapper.in(HousingEstate::getId, housingIds);
         return this.list(wrapper);
     }

nxhs-service/src/main/java/cc/yunxi/service/impl/PriceProductServiceImpl.java

@@ -31,13 +31,20 @@ public class PriceProductServiceImpl extends ServiceImpl<PriceProductMapper, Pri
     @Resource
     private ProductMapper productMapper;
 
+    @Override
+    public List<Product> queryProductList() {
+        LambdaQueryWrapperX<Product> wrapperX = new LambdaQueryWrapperX<>();
+        return productMapper.selectList(wrapperX);
+    }
+
 
     @Override
-    public List<Product> queryProductList(Collection<String> productIds) {
+    public List<Product> getProductListByIds(Collection<String> productIds) {
         LambdaQueryWrapperX<Product> wrapperX = new LambdaQueryWrapperX<>();
-        if (CollUtils.isNotEmpty(productIds)) {
+        if (CollUtils.isEmpty(productIds)) {
-            wrapperX.inIfPresent(Product::getId, productIds);
+           return CollUtils.emptyList();
         }
+        wrapperX.in(Product::getId, productIds);
         return productMapper.selectList(wrapperX);
     }
 }

nxhs-service/src/main/java/cc/yunxi/service/impl/RecyclerServiceImpl.java

@@ -5,6 +5,7 @@ import cc.yunxi.common.domain.LambdaUpdateWrapperX;
 import cc.yunxi.common.exception.BizIllegalException;
 import cc.yunxi.common.exception.DbException;
 import cc.yunxi.common.utils.BeanUtils;
+import cc.yunxi.common.utils.CollUtils;
 import cc.yunxi.domain.po.Client;
 import cc.yunxi.domain.po.ClientAccountDetail;
 import cc.yunxi.domain.po.ClientAddress;
@@ -73,6 +74,9 @@ public class RecyclerServiceImpl extends ServiceImpl<RecyclerMapper, Recycler> i
     @Override
     public List<Recycler> getRecyclerByIds(Collection<String> recyclerIds) {
         LambdaQueryWrapperX<Recycler> wrapperX = new LambdaQueryWrapperX<>();
+        if (CollUtils.isEmpty(recyclerIds)) {
+            return CollUtils.emptyList();
+        }
         wrapperX.in(Recycler::getId, recyclerIds);
         return list(wrapperX);
     }