spring boot 启动方式查询小区方式异常问题处理

java110-bean/src/main/java/com/java110/vo/api/ApiIndexStatisticVo.java

@@ -19,6 +19,7 @@ public class ApiIndexStatisticVo extends Vo {
     private String loseMachineCount;
     private String machineRecordCount;
     private String failRecordCount;
+    private String storeTypeCd;
 
 
 
@@ -118,4 +119,12 @@ public class ApiIndexStatisticVo extends Vo {
     public void setFailRecordCount(String failRecordCount) {
         this.failRecordCount = failRecordCount;
     }
+
+    public String getStoreTypeCd() {
+        return storeTypeCd;
+    }
+
+    public void setStoreTypeCd(String storeTypeCd) {
+        this.storeTypeCd = storeTypeCd;
+    }
 }

service-community/src/main/java/com/java110/community/cmd/communitys/QueryStoreCommunitysCmd.java

@@ -7,8 +7,13 @@ import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.dto.CommunityMemberDto;
 import com.java110.dto.community.CommunityDto;
+import com.java110.dto.store.StoreDto;
 import com.java110.intf.community.ICommunityInnerServiceSMO;
+import com.java110.intf.store.IStoreV1InnerServiceSMO;
+import com.java110.utils.cache.MappingCache;
+import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.ResultVo;
 import org.slf4j.Logger;
@@ -25,18 +30,33 @@ import java.util.List;
 public class QueryStoreCommunitysCmd extends Cmd {
     private final static Logger logger = LoggerFactory.getLogger(QueryStoreCommunitysCmd.class);
 
-
+    @Autowired
+    private IStoreV1InnerServiceSMO storeV1InnerServiceSMOImpl;
     @Autowired
     private ICommunityInnerServiceSMO communityInnerServiceSMOImpl;
 
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
 
+        String storeId = cmdDataFlowContext.getReqHeaders().get("store-id");
+
+        Assert.hasLength(storeId, "未包含商户");
     }
 
     @Override
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+        String storeId = cmdDataFlowContext.getReqHeaders().get("store-id");
+
+        StoreDto storeDto = new StoreDto();
+        storeDto.setStoreId(storeId);
+        storeDto.setPage(1);
+        storeDto.setRow(1);
+        List<StoreDto> storeDtos = storeV1InnerServiceSMOImpl.queryStores(storeDto);
+
+        Assert.listOnlyOne(storeDtos, "商户不存在");
         CommunityMemberDto communityMemberDto = BeanConvertUtil.covertBean(reqJson, CommunityMemberDto.class);
+        communityMemberDto.setMemberId(storeId);
+        communityMemberDto.setMemberTypeCd(MappingCache.getValue(MappingConstant.DOMAIN_STORE_TYPE_2_COMMUNITY_MEMBER_TYPE, storeDtos.get(0).getStoreTypeCd()));
         List<CommunityDto> communityDtos = communityInnerServiceSMOImpl.getStoreCommunitys(communityMemberDto);
         cmdDataFlowContext.setResponseEntity(ResultVo.createResponseEntity(communityDtos));
     }

service-community/src/main/java/com/java110/community/cmd/index/QueryIndexStatisticCmd.java

@@ -8,8 +8,10 @@ import com.java110.core.event.cmd.CmdEvent;
 import com.java110.dto.RoomDto;
 import com.java110.dto.owner.OwnerDto;
 import com.java110.dto.parking.ParkingSpaceDto;
+import com.java110.dto.store.StoreDto;
 import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
 import com.java110.intf.community.IRoomInnerServiceSMO;
+import com.java110.intf.store.IStoreV1InnerServiceSMO;
 import com.java110.intf.user.IOwnerInnerServiceSMO;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
@@ -19,6 +21,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
+import java.util.List;
+
 @Java110Cmd(serviceCode = "index.queryIndexStatistic")
 public class QueryIndexStatisticCmd extends Cmd {
 
@@ -27,7 +31,8 @@ public class QueryIndexStatisticCmd extends Cmd {
 
     @Autowired
     private IRoomInnerServiceSMO roomInnerServiceSMOImpl;
-
+    @Autowired
+    private IStoreV1InnerServiceSMO storeV1InnerServiceSMOImpl;
 
     @Autowired
     private IParkingSpaceInnerServiceSMO parkingSpaceInnerServiceSMOImpl;
@@ -39,6 +44,15 @@ public class QueryIndexStatisticCmd extends Cmd {
 
     @Override
     public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+
+        String storeId = context.getReqHeaders().get("store-id");
+        StoreDto storeDto = new StoreDto();
+        storeDto.setStoreId(storeId);
+        storeDto.setPage(1);
+        storeDto.setRow(1);
+        List<StoreDto> storeDtos = storeV1InnerServiceSMOImpl.queryStores(storeDto);
+
+        Assert.listOnlyOne(storeDtos, "商户不存在");
 // 查询业主 总数量
         ApiIndexStatisticVo apiIndexStatisticVo = new ApiIndexStatisticVo();
         OwnerDto ownerDto = BeanConvertUtil.covertBean(reqJson, OwnerDto.class);
@@ -70,6 +84,7 @@ public class QueryIndexStatisticCmd extends Cmd {
         apiIndexStatisticVo.setFreeParkingSpaceCount(freeParkingSpaceCount + "");
         apiIndexStatisticVo.setShopCount(shopCount + "");
         apiIndexStatisticVo.setFreeShopCount(freeShopCount + "");
+        apiIndexStatisticVo.setStoreTypeCd(storeDtos.get(0).getStoreTypeCd());
         ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiIndexStatisticVo), HttpStatus.OK);
         context.setResponseEntity(responseEntity);
     }

springboot/src/main/java/com/java110/boot/smo/DefaultAbstractComponentSMO.java

@@ -388,7 +388,7 @@ public class DefaultAbstractComponentSMO extends AbstractComponentSMO {
     }
 
     private ResponseEntity<String> getStoreEnterCommunitys(IPageData pd, String storeId, String storeTypeCd, RestTemplate restTemplate) {
-        ResultVo resultVo = null;
+        ResultVo resultVo = getCommunityStoreInfoSMOImpl.getStoreEnterCommunitys(pd, storeId, storeTypeCd, restTemplate);
         return new ResponseEntity<String>(resultVo.getMsg(), resultVo.getCode() == ResultVo.CODE_OK ? HttpStatus.OK : HttpStatus.BAD_REQUEST);
     }