修复BUG

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

@@ -69,6 +69,9 @@ public class MerchantServiceImpl extends ServiceImpl<MerchantMapper, Merchant> i
     @Override
     public List<MerchantDTO> listNearbyMerchants(@NonNull LocationQueryParam param, int size) {
         List<MerchantDTO> list = this.baseMapper.listNearbyMerchants(param, size);
+        if(CollectionUtils.isEmpty(list)){
+            return new ArrayList<>();
+        }
         list.forEach(item ->{
             item.setMainBusinessName(this.categoryService.getById(item.getMainBusiness()).getName());
         });
@@ -82,12 +85,18 @@ public class MerchantServiceImpl extends ServiceImpl<MerchantMapper, Merchant> i
         iPage.setSize(param.getPaging().getSize());
         if (0 == param.getQueryType()){
             Page<MerchantDTO> list = this.baseMapper.listNearbyMerchantPaging(iPage,param);
+            if (list.getRecords().isEmpty() && list.getRecords().size() < 1){
+                return null;
+            }
             list.getRecords().forEach(item ->{
                 item.setMainBusinessName(this.categoryService.getById(item.getMainBusiness()).getName());
             });
             return DatabaseContextHolder.pagination(list);
         }else{
             Page<MerchantDTO> page = this.baseMapper.listRecommendMerchantPaging(iPage,param);
+            if (page.getRecords().isEmpty() && page.getRecords().size() < 1){
+                return null;
+            }
             page.getRecords().forEach(item ->{
                 item.setMainBusinessName(this.categoryService.getById(item.getMainBusiness()).getName());
             });
@@ -110,6 +119,9 @@ public class MerchantServiceImpl extends ServiceImpl<MerchantMapper, Merchant> i
     @Override
     public List<MerchantDTO> listSimpleMerchants(@NonNull MerchantQueryParam param) {
         List<MerchantDTO> list = this.baseMapper.listSimpleMerchants(param);
+        if(CollectionUtils.isEmpty(list)){
+            return new ArrayList<>();
+        }
         list.forEach(item ->{
             item.setMainBusinessName(this.categoryService.getById(item.getMainBusiness()).getName());
         });
@@ -122,6 +134,9 @@ public class MerchantServiceImpl extends ServiceImpl<MerchantMapper, Merchant> i
         iPage.setCurrent(param.getPaging().getNumber());
         iPage.setSize(param.getPaging().getSize());
         Page<MerchantDTO> page = this.baseMapper.merchantPagingList(iPage,param);
+        if(CollectionUtils.isEmpty(page.getRecords())){
+            return null;
+        }
         page.getRecords().forEach(item ->{
             item.setMainBusinessName(this.categoryService.getById(item.getMainBusiness()).getName());
         });

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

@@ -1023,7 +1023,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
             return;
         }
         String requestId = responseData.getString("requestId");
-        OmsOrder omsOrder = baseMapper.selectById(requestId);
+        OmsOrder omsOrder = this.baseMapper.selectById(requestId);
         if(omsOrder == null){
             //订单不存在
             return;

vehicle-server/src/main/resources/mapper/MerchantMapper.xml

@@ -61,9 +61,9 @@
             <if test="param.keyword != null and !param.keyword.isEmpty()">
                 and (mt.name like concat('%', #{param.keyword}, '%')
                 or mt.id in (select gds.merchant_id from goods gds where gds.name like concat('%', #{param.keyword}, '%')
-                or gds.description like concat('%', #{keyword}, '%')
+                or gds.description like concat('%', #{param.keyword}, '%')
                 )
-                or c.name like concat('%', #{keyword}, '%')
+                or c.name like concat('%', #{param.keyword}, '%')
                 )
             </if>
             <if test="param.categoryId != null">