update

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/merchant/utils/MerchantRedisUtil.java

@@ -23,6 +23,9 @@ public class MerchantRedisUtil {
 
     // 【场地】获取详情
     public MerchantFieldsVo getFieldsVoByFieldId(String fieldId) {
+        if (null == fieldId || fieldId.isEmpty()) {
+            return null;
+        }
         String key = MerchantRedisConst.INFO_FIELD.concat(fieldId);
         long s = System.currentTimeMillis();
         MerchantFieldsVo vo = (MerchantFieldsVo) redisUtil.get(key);
@@ -42,6 +45,9 @@ public class MerchantRedisUtil {
 
     // 【场地申请】我的列表
     public List<MerchantFieldAppliesVo> getFieldAppliesVosByUid(String uid) {
+        if (null == uid || uid.isEmpty()) {
+            return null;
+        }
         String key = MerchantRedisConst.INFO_FIELD_APPLIES.concat(uid);
         long s = System.currentTimeMillis();
         List<MerchantFieldAppliesVo> vos = (List<MerchantFieldAppliesVo>) redisUtil.get(key);
@@ -121,6 +127,9 @@ public class MerchantRedisUtil {
 
     // 【主办】详情
     public MerchantSponsorsVo getSponsorsVoBySponsorId(String sponsorId) {
+        if (null == sponsorId || sponsorId.isEmpty()) {
+            return null;
+        }
         String key = MerchantRedisConst.INFO_SPONSOR.concat(sponsorId);
         long s = System.currentTimeMillis();
         MerchantSponsorsVo vo = (MerchantSponsorsVo) redisUtil.get(key);
@@ -139,6 +148,9 @@ public class MerchantRedisUtil {
 
     // 【主办申请】我的列表
     public List<MerchantSponsorAppliesVo> getSponsorAppliesVosByUid(String uid) {
+        if (null == uid || uid.isEmpty()) {
+            return null;
+        }
         String key = MerchantRedisConst.INFO_SPONSOR_APPLIES.concat(uid);
         long s = System.currentTimeMillis();
         List<MerchantSponsorAppliesVo> vos = (List<MerchantSponsorAppliesVo>) redisUtil.get(key);

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/service/MerchantRdmService.java

@@ -23,6 +23,9 @@ public class MerchantRdmService {
 
     // 【场地】获取详情
     public MerchantFieldsVo getFieldsVoByFieldId(String fieldId) {
+        if (null == fieldId || fieldId.isEmpty()) {
+            return null;
+        }
         String key = MerchantRedisConst.INFO_FIELD.concat(fieldId);
         long s = System.currentTimeMillis();
         MerchantFieldsVo vo = (MerchantFieldsVo) redisUtil.get(key);
@@ -42,6 +45,9 @@ public class MerchantRdmService {
 
     // 【场地申请】我的列表
     public List<MerchantFieldAppliesVo> getFieldAppliesVosByUid(String uid) {
+        if (null == uid || uid.isEmpty()) {
+            return null;
+        }
         String key = MerchantRedisConst.INFO_FIELD_APPLIES.concat(uid);
         long s = System.currentTimeMillis();
         List<MerchantFieldAppliesVo> vos = (List<MerchantFieldAppliesVo>) redisUtil.get(key);
@@ -101,6 +107,9 @@ public class MerchantRdmService {
 
     // 【主办】详情
     public MerchantSponsorsVo getSponsorsVoBySponsorId(String sponsorId) {
+        if (null == sponsorId || sponsorId.isEmpty()) {
+            return null;
+        }
         String key = MerchantRedisConst.INFO_SPONSOR.concat(sponsorId);
         long s = System.currentTimeMillis();
         MerchantSponsorsVo vo = (MerchantSponsorsVo) redisUtil.get(key);
@@ -119,6 +128,9 @@ public class MerchantRdmService {
 
     // 【主办申请】我的列表
     public List<MerchantSponsorAppliesVo> getSponsorAppliesVosByUid(String uid) {
+        if (null == uid || uid.isEmpty()) {
+            return null;
+        }
         String key = MerchantRedisConst.INFO_SPONSOR_APPLIES.concat(uid);
         long s = System.currentTimeMillis();
         List<MerchantSponsorAppliesVo> vos = (List<MerchantSponsorAppliesVo>) redisUtil.get(key);

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/service/impl/MerchantFieldsServiceImpl.java

@@ -59,7 +59,22 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService {
         // 分页
         PagedResult<MerchantFieldsVo> pagedResult = ObjectUtil.getMerchantFieldsVoPagedResult();
         if (count > 0) {
-            query.fields().include("fieldId").include("isOnline").include("claimStatus").include("name").include("uid").include("isCheck");
+            query.fields()
+                    .include("fieldId")
+                    .include("isOnline")
+                    .include("claimStatus")
+                    .include("uid")
+                    .include("isCheck")
+                    .include("name")
+                    .include("logo")
+                    .include("background")
+                    .include("provinceId")
+                    .include("provinceName")
+                    .include("cityId")
+                    .include("cityName")
+                    .include("districtId")
+                    .include("districtName")
+                    .include("address");
 
             // 查询分页
             Pageable pageable = PageRequest.of(page - 1, size, Sort.by(Sort.Direction.DESC, "createdAt"));

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/service/impl/MerchantSponsorsServiceImpl.java

@@ -44,7 +44,13 @@ public class MerchantSponsorsServiceImpl implements IMerchantSponsorsService {
         // 分页
         PagedResult<MerchantSponsorsVo> pagedResult = ObjectUtil.getMerchantSponsorsVoPagedResult();
         if (count > 0) {
-            query.fields().include("sponsorId").include("isOnline").include("name").include("uid");
+            query.fields()
+                    .include("sponsorId")
+                    .include("isOnline")
+                    .include("uid")
+                    .include("name")
+                    .include("logo")
+                    .include("background");
 
             // 查询分页
             Pageable pageable = PageRequest.of(page - 1, size, Sort.by(Sort.Direction.DESC, "createdAt"));