java110 %!s(int64=3) %!d(string=hai) anos
pai
achega
f3543a1e40

+ 2 - 1
java110-interface/src/main/java/com/java110/intf/store/IStoreShopV1InnerServiceSMO.java

@@ -16,6 +16,7 @@
 package com.java110.intf.store;
 
 import com.java110.config.feign.FeignConfiguration;
+import com.java110.dto.shop.ShopDto;
 import com.java110.dto.storeShop.StoreShopDto;
 import com.java110.po.storeShop.StoreShopPo;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -55,7 +56,7 @@ public interface IStoreShopV1InnerServiceSMO {
      * @return StoreShopDto 对象数据
      */
     @RequestMapping(value = "/queryStoreShops", method = RequestMethod.POST)
-    List<StoreShopDto> queryStoreShops(@RequestBody StoreShopDto storeShopDto);
+    List<ShopDto> queryStoreShops(@RequestBody StoreShopDto storeShopDto);
 
     /**
      * 查询<p>小区楼</p>总记录数

+ 289 - 0
service-store/src/main/java/com/java110/store/cmd/store/PropertyDeleteStoreAndShopCmd.java

@@ -0,0 +1,289 @@
+package com.java110.store.cmd.store;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.ICmdDataFlowContext;
+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.shop.ShopDto;
+import com.java110.dto.shopCommunity.ShopCommunityDto;
+import com.java110.dto.store.StoreUserDto;
+import com.java110.dto.storeShop.StoreShopDto;
+import com.java110.dto.storeShopCommunity.StoreShopCommunityDto;
+import com.java110.intf.acct.IAccountBondObjInnerServiceSMO;
+import com.java110.intf.acct.IAccountInnerServiceSMO;
+import com.java110.intf.community.ICommunityV1InnerServiceSMO;
+import com.java110.intf.mall.IShopCommunityInnerServiceSMO;
+import com.java110.intf.mall.IShopInnerServiceSMO;
+import com.java110.intf.store.*;
+import com.java110.intf.user.IOrgV1InnerServiceSMO;
+import com.java110.intf.user.IPrivilegeUserV1InnerServiceSMO;
+import com.java110.intf.user.IUserV1InnerServiceSMO;
+import com.java110.po.account.AccountPo;
+import com.java110.po.store.StorePo;
+import com.java110.po.storeShop.StoreShopPo;
+import com.java110.po.storeShopCommunity.StoreShopCommunityPo;
+import com.java110.po.user.UserPo;
+import com.java110.utils.cache.MappingCache;
+import com.java110.utils.constant.UserLevelConstant;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.DateUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+
+@Java110CmdDoc(title = "物业公司删除商户和商铺功能",
+        description = "此接口目前主要计划用于停车卷相关使用",
+        httpMethod = "post",
+        url = "http://{ip}:{port}/app/store.propertyDeleteStoreAndShop",
+        resource = "storeDoc",
+        author = "吴学文",
+        serviceCode = "store.propertyDeleteStoreAndShop"
+)
+
+@Java110ParamsDoc(params = {
+        @Java110ParamDoc(name = "shopId", 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 = "{\"shopId\":\"123123123\",\"communityId\":\"2022081539020475\"}",
+        resBody = "{'code':0,'msg':'成功'}"
+)
+
+/**
+ * 物业公司删除 商户和商铺功能
+ * <p>
+ * 此接口目前主要计划用于停车卷相关使用
+ */
+@Java110Cmd(serviceCode = "store.propertyDeleteStoreAndShop")
+public class PropertyDeleteStoreAndShopCmd extends Cmd {
+    public static final String CODE_PREFIX_ID = "10";
+
+    @Autowired
+    private IStoreV1InnerServiceSMO storeV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IStoreAttrV1InnerServiceSMO storeAttrV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IStoreUserV1InnerServiceSMO storeUserV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IOrgV1InnerServiceSMO orgV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IOrgStaffRelV1InnerServiceSMO orgStaffRelV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IPrivilegeUserV1InnerServiceSMO privilegeUserV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IStoreShopV1InnerServiceSMO storeShopV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IAccountInnerServiceSMO accountInnerServiceSMOImpl;
+
+    @Autowired
+    private IAccountBondObjInnerServiceSMO accountBondObjInnerServiceSMOImpl;
+
+    @Autowired
+    private IStoreShopCommunityV1InnerServiceSMO storeShopCommunityV1InnerServiceSMOImpl;
+
+    @Autowired
+    private ICommunityV1InnerServiceSMO communityV1InnerServiceSMOImpl;
+
+
+    @Autowired(required = false)
+    private IShopInnerServiceSMO shopInnerServiceSMOImpl;
+
+    @Autowired(required = false)
+    private IShopCommunityInnerServiceSMO shopCommunityInnerServiceSMOImpl;
+
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+        Assert.hasKeyAndValue(reqJson, "shopId", "未包含商家商铺");
+        Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区信息");
+    }
+
+    @Override
+    @Java110Transactional
+    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+
+
+        //1.0 删除 商铺和小区的关系
+        StoreShopCommunityDto shopCommunityDto = new StoreShopCommunityDto();
+        shopCommunityDto.setCommunityId(reqJson.getString("communityId"));
+        shopCommunityDto.setShopId(reqJson.getString("shopId"));
+
+        List<ShopCommunityDto> storeShopCommunityDtos = null;
+        if ("ON".equals(MappingCache.getValue("HAS_HC_MALL"))) {
+            storeShopCommunityDtos = shopCommunityInnerServiceSMOImpl.queryShopCommunitys(shopCommunityDto);
+        } else {
+            storeShopCommunityDtos =  storeShopCommunityV1InnerServiceSMOImpl.queryStoreShopCommunitys(shopCommunityDto);
+        }
+
+        if (storeShopCommunityDtos == null || storeShopCommunityDtos.size() < 1) {
+            return;
+        }
+        StoreShopCommunityPo storeShopCommunityPo = new StoreShopCommunityPo();
+        storeShopCommunityPo.setScId(storeShopCommunityDtos.get(0).getScId());
+        int flag = 0;
+
+        if ("ON".equals(MappingCache.getValue("HAS_HC_MALL"))) {
+            flag = shopCommunityInnerServiceSMOImpl.deleteShopCommunity(storeShopCommunityPo);
+        } else {
+            flag = storeShopCommunityV1InnerServiceSMOImpl.deleteStoreShopCommunity(storeShopCommunityPo);
+        }
+        if (flag < 1) {
+            throw new CmdException("删除数据失败");
+        }
+
+
+        List<ShopDto> storeShopDtos = null;
+        if ("ON".equals(MappingCache.getValue("HAS_HC_MALL"))) {
+            ShopDto storeShopDto = new ShopDto();
+            storeShopDto.setShopId(reqJson.getString("shopId"));
+            storeShopDtos = shopInnerServiceSMOImpl.queryShops(storeShopDto);
+        } else {
+            StoreShopDto storeShopDto = new StoreShopDto();
+            storeShopDto.setShopId(reqJson.getString("shopId"));
+            storeShopDtos =  storeShopV1InnerServiceSMOImpl.queryStoreShops(storeShopDto);
+        }
+
+        if (storeShopDtos == null || storeShopDtos.size() < 1) {
+            return;
+        }
+        StoreShopPo storeShopPo = new StoreShopPo();
+        storeShopPo.setShopId(storeShopDtos.get(0).getShopId());
+        flag = storeShopV1InnerServiceSMOImpl.deleteStoreShop(storeShopPo);
+        if (flag < 1) {
+            throw new CmdException("删除数据失败");
+        }
+
+
+        StorePo storePo = BeanConvertUtil.covertBean(reqJson, StorePo.class);
+        storePo.setStoreId(storeShopDtos.get(0).getStoreId());
+        flag = storeV1InnerServiceSMOImpl.deleteStore(storePo);
+        if (flag < 1) {
+            throw new CmdException("删除数据失败");
+        }
+
+        StoreUserDto storeUserDto = new StoreUserDto();
+        storeUserDto.setStoreId(storeShopDtos.get(0).getStoreId());
+
+        List<StoreUserDto> storeUserDtos = storeUserV1InnerServiceSMOImpl.queryStoreUsers(storeUserDto);
+
+        if (storeUserDtos == null || storeUserDtos.size() < 1) {
+            return;
+        }
+
+        UserPo userPo = null;
+        for(StoreUserDto tmpStoreUserDto : storeUserDtos){
+            userPo = new UserPo();
+            userPo.setUserId(tmpStoreUserDto.getUserId());
+            userV1InnerServiceSMOImpl.deleteUser(userPo);
+        }
+
+
+
+    }
+
+    private void saveShopCommunity(JSONObject reqJson) {
+
+        StoreShopCommunityPo storeShopCommunityPo = new StoreShopCommunityPo();
+        storeShopCommunityPo.setAddress("无");
+        storeShopCommunityPo.setCityCode(reqJson.getString("areaCode"));
+        storeShopCommunityPo.setCodeName("无");
+        storeShopCommunityPo.setCommunityId(reqJson.getString("communityId"));
+        storeShopCommunityPo.setCommunityName(reqJson.getString("communityName"));
+        storeShopCommunityPo.setEndTime("2050-01-01");
+        storeShopCommunityPo.setMessage("物业添加");
+        storeShopCommunityPo.setScId(GenerateCodeFactory.getGeneratorId("10"));
+        storeShopCommunityPo.setShopId(reqJson.getString("shopId"));
+        storeShopCommunityPo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+        storeShopCommunityPo.setState(StoreShopCommunityDto.STATE_SUCCESS);
+        int flag = 0;
+        if ("ON".equals(MappingCache.getValue("HAS_HC_MALL"))) {
+            flag = shopCommunityInnerServiceSMOImpl.saveShopCommunity(storeShopCommunityPo);
+        } else {
+            flag = storeShopCommunityV1InnerServiceSMOImpl.saveStoreShopCommunity(storeShopCommunityPo);
+        }
+        if (flag < 1) {
+            throw new IllegalArgumentException("小区关联商铺失败");
+        }
+    }
+
+
+    /**
+     * 开户
+     *
+     * @param storePo
+     * @param reqJson
+     */
+    private void addAccountDto(StorePo storePo, JSONObject reqJson) {
+
+        AccountPo accountPo = new AccountPo();
+        accountPo.setAmount("0");
+        accountPo.setAcctId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_acctId));
+        accountPo.setObjId(storePo.getStoreId());
+        accountPo.setObjType(AccountDto.OBJ_TYPE_STORE);
+        accountPo.setAcctType(AccountDto.ACCT_TYPE_CASH);
+        accountPo.setAcctName(storePo.getName());
+        accountPo.setPartId(reqJson.getString("shopId"));
+        accountInnerServiceSMOImpl.saveAccount(accountPo);
+    }
+
+
+    private void saveShop(StorePo storePo, JSONObject reqJson) {
+
+        StoreShopPo shopPo = new StoreShopPo();
+        shopPo.setShopName(reqJson.getString("shopName"));
+        shopPo.setShopDesc("无");
+        shopPo.setReturnPerson("无");
+        shopPo.setReturnLink(reqJson.getString("link"));
+        shopPo.setStoreId(storePo.getStoreId());
+        shopPo.setSendAddress("无");
+        shopPo.setReturnAddress("无");
+        shopPo.setShopType("1012021070202890002");
+        shopPo.setOpenType(ShopDto.OPEN_TYPE_SHOP);
+        //shopPo.setShopRange("无");
+        shopPo.setAreaCode(reqJson.getString("areaCode"));
+        shopPo.setShopId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_shopId));
+        shopPo.setShopLogo("");
+        shopPo.setMapX(storePo.getMapX());
+        shopPo.setMapY(storePo.getMapY());
+
+        shopPo.setState(ShopDto.STATE_Y);
+        //shopPo.setState(ShopDto.STATE_B);
+        int flag = 0;
+        if ("ON".equals(MappingCache.getValue("HAS_HC_MALL"))) {
+            flag = shopInnerServiceSMOImpl.saveShop(shopPo);
+        } else {
+            flag = storeShopV1InnerServiceSMOImpl.saveStoreShop(shopPo);
+        }
+        if (flag < 1) {
+            throw new CmdException("保存商铺失败");
+        }
+        reqJson.put("shopId", shopPo.getShopId());
+    }
+}

+ 0 - 71
service-store/src/main/java/com/java110/store/cmd/storeShop/DeleteStoreShopCmd.java

@@ -1,71 +0,0 @@
-/*
- * Copyright 2017-2020 吴学文 and java110 team.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.java110.store.cmd.storeShop;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.core.annotation.Java110Cmd;
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.Cmd;
-import com.java110.core.event.cmd.CmdEvent;
-import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.intf.store.IStoreShopV1InnerServiceSMO;
-import com.java110.po.storeShop.StoreShopPo;
-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.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-/**
- * 类表述:删除
- * 服务编码:storeShop.deleteStoreShop
- * 请求路劲:/app/storeShop.DeleteStoreShop
- * add by 吴学文 at 2022-10-10 17:54:27 mail: 928255095@qq.com
- * open source address: https://gitee.com/wuxw7/MicroCommunity
- * 官网:http://www.homecommunity.cn
- * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
- * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行
- */
-@Java110Cmd(serviceCode = "storeShop.deleteStoreShop")
-public class DeleteStoreShopCmd extends Cmd {
-  private static Logger logger = LoggerFactory.getLogger(DeleteStoreShopCmd.class);
-
-    @Autowired
-    private IStoreShopV1InnerServiceSMO storeShopV1InnerServiceSMOImpl;
-
-    @Override
-    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "shopId", "shopId不能为空");
-Assert.hasKeyAndValue(reqJson, "storeId", "storeId不能为空");
-
-    }
-
-    @Override
-    @Java110Transactional
-    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
-       StoreShopPo storeShopPo = BeanConvertUtil.covertBean(reqJson, StoreShopPo.class);
-        int flag = storeShopV1InnerServiceSMOImpl.deleteStoreShop(storeShopPo);
-
-        if (flag < 1) {
-            throw new CmdException("删除数据失败");
-        }
-
-        cmdDataFlowContext.setResponseEntity(ResultVo.success());
-    }
-}

+ 0 - 84
service-store/src/main/java/com/java110/store/cmd/storeShop/ListStoreShopCmd.java

@@ -1,84 +0,0 @@
-/*
- * Copyright 2017-2020 吴学文 and java110 team.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.java110.store.cmd.storeShop;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.core.annotation.Java110Cmd;
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.Cmd;
-import com.java110.core.event.cmd.CmdEvent;
-import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.intf.store.IStoreShopV1InnerServiceSMO;
-import com.java110.po.storeShop.StoreShopPo;
-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 com.java110.dto.storeShop.StoreShopDto;
-import java.util.List;
-import java.util.ArrayList;
-import org.springframework.http.ResponseEntity;
-import org.springframework.http.HttpStatus;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * 类表述:查询
- * 服务编码:storeShop.listStoreShop
- * 请求路劲:/app/storeShop.ListStoreShop
- * add by 吴学文 at 2022-10-10 17:54:27 mail: 928255095@qq.com
- * open source address: https://gitee.com/wuxw7/MicroCommunity
- * 官网:http://www.homecommunity.cn
- * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
- * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行
- */
-@Java110Cmd(serviceCode = "storeShop.listStoreShop")
-public class ListStoreShopCmd extends Cmd {
-
-  private static Logger logger = LoggerFactory.getLogger(ListStoreShopCmd.class);
-    @Autowired
-    private IStoreShopV1InnerServiceSMO storeShopV1InnerServiceSMOImpl;
-
-    @Override
-    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
-        super.validatePageInfo(reqJson);
-    }
-
-    @Override
-    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
-           StoreShopDto storeShopDto = BeanConvertUtil.covertBean(reqJson, StoreShopDto.class);
-
-           int count = storeShopV1InnerServiceSMOImpl.queryStoreShopsCount(storeShopDto);
-
-           List<StoreShopDto> storeShopDtos = null;
-
-           if (count > 0) {
-               storeShopDtos = storeShopV1InnerServiceSMOImpl.queryStoreShops(storeShopDto);
-           } else {
-               storeShopDtos = new ArrayList<>();
-           }
-
-           ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, storeShopDtos);
-
-           ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
-
-           cmdDataFlowContext.setResponseEntity(responseEntity);
-    }
-}

+ 0 - 88
service-store/src/main/java/com/java110/store/cmd/storeShop/SaveStoreShopCmd.java

@@ -1,88 +0,0 @@
-/*
- * Copyright 2017-2020 吴学文 and java110 team.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.java110.store.cmd.storeShop;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.core.annotation.Java110Cmd;
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.Cmd;
-import com.java110.core.event.cmd.CmdEvent;
-import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.intf.store.IStoreShopV1InnerServiceSMO;
-import com.java110.po.storeShop.StoreShopPo;
-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.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * 类表述:保存
- * 服务编码:storeShop.saveStoreShop
- * 请求路劲:/app/storeShop.SaveStoreShop
- * add by 吴学文 at 2022-10-10 17:54:27 mail: 928255095@qq.com
- * open source address: https://gitee.com/wuxw7/MicroCommunity
- * 官网:http://www.homecommunity.cn
- * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
- * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行
- */
-@Java110Cmd(serviceCode = "storeShop.saveStoreShop")
-public class SaveStoreShopCmd extends Cmd {
-
-    private static Logger logger = LoggerFactory.getLogger(SaveStoreShopCmd.class);
-
-    public static final String CODE_PREFIX_ID = "10";
-
-    @Autowired
-    private IStoreShopV1InnerServiceSMO storeShopV1InnerServiceSMOImpl;
-
-    @Override
-    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "shopLogo", "请求报文中未包含shopLogo");
-Assert.hasKeyAndValue(reqJson, "storeId", "请求报文中未包含storeId");
-Assert.hasKeyAndValue(reqJson, "shopName", "请求报文中未包含shopName");
-Assert.hasKeyAndValue(reqJson, "shopDesc", "请求报文中未包含shopDesc");
-Assert.hasKeyAndValue(reqJson, "mapX", "请求报文中未包含mapX");
-Assert.hasKeyAndValue(reqJson, "mapY", "请求报文中未包含mapY");
-Assert.hasKeyAndValue(reqJson, "sendAddress", "请求报文中未包含sendAddress");
-Assert.hasKeyAndValue(reqJson, "returnAddress", "请求报文中未包含returnAddress");
-Assert.hasKeyAndValue(reqJson, "returnPerson", "请求报文中未包含returnPerson");
-Assert.hasKeyAndValue(reqJson, "returnLink", "请求报文中未包含returnLink");
-Assert.hasKeyAndValue(reqJson, "statusCd", "请求报文中未包含statusCd");
-Assert.hasKeyAndValue(reqJson, "state", "请求报文中未包含state");
-Assert.hasKeyAndValue(reqJson, "shopType", "请求报文中未包含shopType");
-Assert.hasKeyAndValue(reqJson, "openType", "请求报文中未包含openType");
-
-    }
-
-    @Override
-    @Java110Transactional
-    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
-       StoreShopPo storeShopPo = BeanConvertUtil.covertBean(reqJson, StoreShopPo.class);
-        storeShopPo.setShopId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
-        int flag = storeShopV1InnerServiceSMOImpl.saveStoreShop(storeShopPo);
-
-        if (flag < 1) {
-            throw new CmdException("保存数据失败");
-        }
-
-        cmdDataFlowContext.setResponseEntity(ResultVo.success());
-    }
-}

+ 0 - 75
service-store/src/main/java/com/java110/store/cmd/storeShop/UpdateStoreShopCmd.java

@@ -1,75 +0,0 @@
-/*
- * Copyright 2017-2020 吴学文 and java110 team.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.java110.store.cmd.storeShop;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.core.annotation.Java110Cmd;
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.Cmd;
-import com.java110.core.event.cmd.CmdEvent;
-import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.intf.store.IStoreShopV1InnerServiceSMO;
-import com.java110.po.storeShop.StoreShopPo;
-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.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * 类表述:更新
- * 服务编码:storeShop.updateStoreShop
- * 请求路劲:/app/storeShop.UpdateStoreShop
- * add by 吴学文 at 2022-10-10 17:54:27 mail: 928255095@qq.com
- * open source address: https://gitee.com/wuxw7/MicroCommunity
- * 官网:http://www.homecommunity.cn
- * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
- * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行
- */
-@Java110Cmd(serviceCode = "storeShop.updateStoreShop")
-public class UpdateStoreShopCmd extends Cmd {
-
-  private static Logger logger = LoggerFactory.getLogger(UpdateStoreShopCmd.class);
-
-
-    @Autowired
-    private IStoreShopV1InnerServiceSMO storeShopV1InnerServiceSMOImpl;
-
-    @Override
-    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "shopId", "shopId不能为空");
-Assert.hasKeyAndValue(reqJson, "storeId", "storeId不能为空");
-
-    }
-
-    @Override
-    @Java110Transactional
-    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
-       StoreShopPo storeShopPo = BeanConvertUtil.covertBean(reqJson, StoreShopPo.class);
-        int flag = storeShopV1InnerServiceSMOImpl.updateStoreShop(storeShopPo);
-
-        if (flag < 1) {
-            throw new CmdException("更新数据失败");
-        }
-
-        cmdDataFlowContext.setResponseEntity(ResultVo.success());
-    }
-}

+ 3 - 2
service-store/src/main/java/com/java110/store/smo/impl/StoreShopV1InnerServiceSMOImpl.java

@@ -16,6 +16,7 @@
 package com.java110.store.smo.impl;
 
 
+import com.java110.dto.shop.ShopDto;
 import com.java110.store.dao.IStoreShopV1ServiceDao;
 import com.java110.intf.store.IStoreShopV1InnerServiceSMO;
 import com.java110.dto.storeShop.StoreShopDto;
@@ -66,7 +67,7 @@ public class StoreShopV1InnerServiceSMOImpl extends BaseServiceSMO implements IS
     }
 
     @Override
-    public List<StoreShopDto> queryStoreShops(@RequestBody  StoreShopDto storeShopDto) {
+    public List<ShopDto> queryStoreShops(@RequestBody  StoreShopDto storeShopDto) {
 
         //校验是否传了 分页信息
 
@@ -76,7 +77,7 @@ public class StoreShopV1InnerServiceSMOImpl extends BaseServiceSMO implements IS
             storeShopDto.setPage((page - 1) * storeShopDto.getRow());
         }
 
-        List<StoreShopDto> storeShops = BeanConvertUtil.covertBeanList(storeShopV1ServiceDaoImpl.getStoreShopInfo(BeanConvertUtil.beanCovertMap(storeShopDto)), StoreShopDto.class);
+        List<ShopDto> storeShops = BeanConvertUtil.covertBeanList(storeShopV1ServiceDaoImpl.getStoreShopInfo(BeanConvertUtil.beanCovertMap(storeShopDto)), ShopDto.class);
 
         return storeShops;
     }