查询优化

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/dto/MerchantDTO.java

@@ -90,12 +90,12 @@ public class MerchantDTO implements Serializable {
     /**
      * 经度
      */
-//    private Double longitude;
+    private Double longitude;
 
     /**
      * 纬度
      */
-//    private Double latitude;
+    private Double latitude;
 
     /**
      * 是否推荐

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/param/HelpPagingParam.java

@@ -28,5 +28,9 @@ public class HelpPagingParam implements Serializable {
      * 标题
      */
     private String title;
+    /**
+     * 分类id
+     */
+    private Long typeId;
 
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/HelpServiceImpl.java

@@ -114,6 +114,7 @@ public class HelpServiceImpl extends ServiceImpl<HelpMapper, Help> implements
     public Pagination<HelpDTO> getHelpPaging(HelpPagingParam param) {
         Page<Help> page = this.lambdaQuery()
                 .like(StringUtils.notEmpty(param.getTitle()), Help::getTitle, param.getTitle())
+                .eq(StringUtils.notEmpty(param.getTypeId()), Help::getCategoryId, param.getTypeId())
                 .orderByDesc(Help::getShowStatus)
                 .page(DatabaseContextHolder.page(param.getPaging()));
         Pagination<HelpDTO> pagination = DatabaseContextHolder.pagination(page, HelpCopier.INSTANCE::copying);

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/OmsOrderReturnApplyServiceImpl.java

@@ -69,7 +69,9 @@ public class OmsOrderReturnApplyServiceImpl extends ServiceImpl<OmsOrderReturnAp
     public OrderReturnApplyDTO selectOmsOrderReturnApplyById(@NonNull Long id)
     {
         OmsOrderReturnApply omsOrderReturnApply = this.getById(id);
-        return OrderReturnApplyCopier.INSTANCE.copying(omsOrderReturnApply);
+        OrderReturnApplyDTO orderReturnApplyDTO = OrderReturnApplyCopier.INSTANCE.copying(omsOrderReturnApply);
+        orderReturnApplyDTO.setGoodsList(this.omsOrderItemService.getOrderItemByOrderId(orderReturnApplyDTO.getOrderId()));
+        return orderReturnApplyDTO;
     }
 
     /**