加入查询小区店铺的功能

java110-bean/src/main/java/com/java110/dto/storeShopCommunity/StoreShopCommunityDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.storeShopCommunity;
 
 import com.java110.dto.PageDto;
+import com.java110.dto.shopCommunity.ShopCommunityDto;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -13,130 +14,8 @@ import java.util.Date;
  * @Version 1.0
  * add by wuxw 2019/4/24
  **/
-public class StoreShopCommunityDto extends PageDto implements Serializable {
+public class StoreShopCommunityDto extends ShopCommunityDto implements Serializable {
 
     public static final String STATE_SUCCESS = "24002";
 
-    private String address;
-    private String cityCode;
-    private String codeName;
-    private String communityName;
-    private String startTime;
-    private String shopId;
-    private String endTime;
-    private String state;
-    private String communityId;
-    private String message;
-    private String scId;
-
-
-    private Date createTime;
-
-    private String statusCd = "0";
-
-
-    public String getAddress() {
-        return address;
-    }
-
-    public void setAddress(String address) {
-        this.address = address;
-    }
-
-    public String getCityCode() {
-        return cityCode;
-    }
-
-    public void setCityCode(String cityCode) {
-        this.cityCode = cityCode;
-    }
-
-    public String getCodeName() {
-        return codeName;
-    }
-
-    public void setCodeName(String codeName) {
-        this.codeName = codeName;
-    }
-
-    public String getCommunityName() {
-        return communityName;
-    }
-
-    public void setCommunityName(String communityName) {
-        this.communityName = communityName;
-    }
-
-    public String getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(String startTime) {
-        this.startTime = startTime;
-    }
-
-    public String getShopId() {
-        return shopId;
-    }
-
-    public void setShopId(String shopId) {
-        this.shopId = shopId;
-    }
-
-    public String getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(String endTime) {
-        this.endTime = endTime;
-    }
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public String getCommunityId() {
-        return communityId;
-    }
-
-    public void setCommunityId(String communityId) {
-        this.communityId = communityId;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    public String getScId() {
-        return scId;
-    }
-
-    public void setScId(String scId) {
-        this.scId = scId;
-    }
-
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getStatusCd() {
-        return statusCd;
-    }
-
-    public void setStatusCd(String statusCd) {
-        this.statusCd = statusCd;
-    }
 }

java110-interface/src/main/java/com/java110/intf/store/IStoreShopCommunityV1InnerServiceSMO.java

@@ -16,6 +16,7 @@
 package com.java110.intf.store;
 
 import com.java110.config.feign.FeignConfiguration;
+import com.java110.dto.shopCommunity.ShopCommunityDto;
 import com.java110.dto.storeShopCommunity.StoreShopCommunityDto;
 import com.java110.po.storeShopCommunity.StoreShopCommunityPo;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -55,7 +56,7 @@ public interface IStoreShopCommunityV1InnerServiceSMO {
      * @return StoreShopCommunityDto 对象数据
      */
     @RequestMapping(value = "/queryStoreShopCommunitys", method = RequestMethod.POST)
-    List<StoreShopCommunityDto> queryStoreShopCommunitys(@RequestBody StoreShopCommunityDto storeShopCommunityDto);
+    List<ShopCommunityDto> queryStoreShopCommunitys(@RequestBody StoreShopCommunityDto storeShopCommunityDto);
 
     /**
      * 查询<p>小区楼</p>总记录数

service-store/src/main/java/com/java110/store/cmd/store/ListCommunityStoreShopCmd.java

@@ -0,0 +1,97 @@
+package com.java110.store.cmd.store;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.doc.annotation.*;
+import com.java110.dto.shopCommunity.ShopCommunityDto;
+import com.java110.dto.storeShopCommunity.StoreShopCommunityDto;
+import com.java110.intf.mall.IShopCommunityInnerServiceSMO;
+import com.java110.intf.store.IStoreShopCommunityV1InnerServiceSMO;
+import com.java110.utils.cache.MappingCache;
+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.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.List;
+
+
+@Java110CmdDoc(title = "查询周围店铺",
+        description = "根据小区ID查询周围店铺，设计此接口主要 用于停车卷 商家购买 停车卷时 查询小区周边 商铺，比如 饭店等",
+        httpMethod = "get",
+        url = "http://{ip}:{port}/app/store.listCommunityStoreShop",
+        resource = "storeDoc",
+        author = "吴学文",
+        serviceCode = "store.listCommunityStoreShop"
+)
+
+@Java110ParamsDoc(params = {
+        @Java110ParamDoc(name = "communityId", length = 30, remark = "小区ID"),
+})
+
+@Java110ResponseDoc(
+        params = {
+                @Java110ParamDoc(name = "code", type = "int", length = 11, defaultValue = "0", remark = "返回编号，0 成功 其他失败"),
+                @Java110ParamDoc(name = "msg", type = "String", length = 250, defaultValue = "成功", remark = "描述"),
+        }
+)
+
+@Java110ExampleDoc(
+        reqBody = "http://{ip}:{port}/app/store.listCommunityStoreShop?communityId=123123&page=1&row=10",
+        resBody = "{'code':0,'msg':'成功'}"
+)
+
+@Java110Cmd(serviceCode = "store.listCommunityStoreShop")
+public class ListCommunityStoreShopCmd extends Cmd {
+
+    @Autowired(required = false)
+    private IShopCommunityInnerServiceSMO shopCommunityInnerServiceSMOImpl;
+
+    @Autowired
+    private IStoreShopCommunityV1InnerServiceSMO storeShopCommunityV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+        super.validatePageInfo(reqJson);
+        Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区ID");
+
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+
+        StoreShopCommunityDto storeShopCommunityDto = BeanConvertUtil.covertBean(reqJson, StoreShopCommunityDto.class);
+        List<ShopCommunityDto> storeShopCommunityDtos = null;
+        int count = 0;
+        if ("ON".equals(MappingCache.getValue("HAS_HC_MALL"))) {
+            count = shopCommunityInnerServiceSMOImpl.queryShopCommunitysCount(storeShopCommunityDto);
+            if (count > 0) {
+                storeShopCommunityDtos = shopCommunityInnerServiceSMOImpl.queryShopCommunitys(storeShopCommunityDto);
+            } else {
+                storeShopCommunityDtos = new ArrayList<>();
+            }
+        } else {
+            count = storeShopCommunityV1InnerServiceSMOImpl.queryStoreShopCommunitysCount(storeShopCommunityDto);
+            if (count > 0) {
+                storeShopCommunityDtos = storeShopCommunityV1InnerServiceSMOImpl.queryStoreShopCommunitys(storeShopCommunityDto);
+            } else {
+                storeShopCommunityDtos = new ArrayList<>();
+            }
+        }
+
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, storeShopCommunityDtos);
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+        context.setResponseEntity(responseEntity);
+
+    }
+}

service-store/src/main/java/com/java110/store/cmd/store/PropertySaveStoreAndShopCmd.java

@@ -8,6 +8,7 @@ import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.AuthenticationFactory;
 import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.doc.annotation.*;
 import com.java110.dto.account.AccountDto;
 import com.java110.dto.community.CommunityDto;
 import com.java110.dto.shop.ShopDto;
@@ -43,6 +44,35 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.List;
 
+
+@Java110CmdDoc(title = "物业公司添加商户和商铺功能",
+        description = "此接口目前主要计划用于停车卷相关使用",
+        httpMethod = "post",
+        url = "http://{ip}:{port}/app/store.propertySaveStoreAndShop",
+        resource = "storeDoc",
+        author = "吴学文",
+        serviceCode = "store.propertySaveStoreAndShop"
+)
+
+@Java110ParamsDoc(params = {
+        @Java110ParamDoc(name = "shopName", length = 30, remark = "商铺名称 商家名称和商铺名称一致，如果需求需要不一致"),
+        @Java110ParamDoc(name = "link", length = 30, remark = "管理员手机号"),
+        @Java110ParamDoc(name = "password", length = 30, remark = "登录密码"),
+        @Java110ParamDoc(name = "communityId", length = 30, remark = "小区ID"),
+})
+
+@Java110ResponseDoc(
+        params = {
+                @Java110ParamDoc(name = "code", type = "int", length = 11, defaultValue = "0", remark = "返回编号，0 成功 其他失败"),
+                @Java110ParamDoc(name = "msg", type = "String", length = 250, defaultValue = "成功", remark = "描述"),
+        }
+)
+
+@Java110ExampleDoc(
+        reqBody="{\"shopName\":\"测试商家\",\"link\":\"18909714444\",\"password\":\"123456\",\"communityId\":\"2022081539020475\"}",
+        resBody="{'code':0,'msg':'成功'}"
+)
+
 /**
  * 物业公司添加 商户和商铺功能
  * <p>

service-store/src/main/java/com/java110/store/smo/impl/StoreShopCommunityV1InnerServiceSMOImpl.java

@@ -16,6 +16,7 @@
 package com.java110.store.smo.impl;
 
 
+import com.java110.dto.shopCommunity.ShopCommunityDto;
 import com.java110.store.dao.IStoreShopCommunityV1ServiceDao;
 import com.java110.intf.store.IStoreShopCommunityV1InnerServiceSMO;
 import com.java110.dto.storeShopCommunity.StoreShopCommunityDto;
@@ -66,7 +67,7 @@ public class StoreShopCommunityV1InnerServiceSMOImpl extends BaseServiceSMO impl
     }
 
     @Override
-    public List<StoreShopCommunityDto> queryStoreShopCommunitys(@RequestBody  StoreShopCommunityDto storeShopCommunityDto) {
+    public List<ShopCommunityDto> queryStoreShopCommunitys(@RequestBody  StoreShopCommunityDto storeShopCommunityDto) {
 
         //校验是否传了 分页信息
 
@@ -76,7 +77,7 @@ public class StoreShopCommunityV1InnerServiceSMOImpl extends BaseServiceSMO impl
             storeShopCommunityDto.setPage((page - 1) * storeShopCommunityDto.getRow());
         }
 
-        List<StoreShopCommunityDto> storeShopCommunitys = BeanConvertUtil.covertBeanList(storeShopCommunityV1ServiceDaoImpl.getStoreShopCommunityInfo(BeanConvertUtil.beanCovertMap(storeShopCommunityDto)), StoreShopCommunityDto.class);
+        List<ShopCommunityDto> storeShopCommunitys = BeanConvertUtil.covertBeanList(storeShopCommunityV1ServiceDaoImpl.getStoreShopCommunityInfo(BeanConvertUtil.beanCovertMap(storeShopCommunityDto)), ShopCommunityDto.class);
 
         return storeShopCommunitys;
     }