优化代码

java110-bean/src/main/java/com/java110/dto/shopCommunity/ShopCommunityDto.java

@@ -0,0 +1,180 @@
+package com.java110.dto.shopCommunity;
+
+import com.java110.dto.shop.ShopDto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName FloorDto
+ * @Description 商铺小区数据层封装
+ * @Author wuxw
+ * @Date 2019/4/24 8:52
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+public class ShopCommunityDto extends ShopDto implements Serializable {
+
+    public static final String STATE_W = "12001";
+    public static final String STATE_S = "24002";
+    public static final String STATE_F = "48004";
+
+    private String communityName;
+    private String startTime;
+    private String shopId;
+    private String shopName;
+    private String endTime;
+    private String state;
+    private String stateName;
+    private String communityId;
+    private String message;
+    private String scId;
+    private String openType;
+    private String address;
+    private String cityCode;
+    private String codeName;
+
+
+    private Date createTime;
+
+    private String statusCd = "0";
+    private String rangeName;
+
+
+    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;
+    }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
+
+    public String getShopName() {
+        return shopName;
+    }
+
+    public void setShopName(String shopName) {
+        this.shopName = shopName;
+    }
+
+    public String getRangeName() {
+        return rangeName;
+    }
+
+    public void setRangeName(String rangeName) {
+        this.rangeName = rangeName;
+    }
+
+    public String getOpenType() {
+        return openType;
+    }
+
+    public void setOpenType(String openType) {
+        this.openType = openType;
+    }
+
+    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;
+    }
+}

java110-bean/src/main/java/com/java110/po/shopCommunity/ShopCommunityPo.java

@@ -0,0 +1,115 @@
+package com.java110.po.shopCommunity;
+
+import java.io.Serializable;
+
+public class ShopCommunityPo implements Serializable {
+
+    private String communityName;
+    private String startTime;
+    private String statusCd = "0";
+    private String shopId;
+    private String endTime;
+    private String state;
+    private String communityId;
+    private String message;
+    private String scId;
+    private String address;
+    private String cityCode;
+    private String 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 getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+
+    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 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;
+    }
+}

java110-bean/src/main/java/com/java110/po/storeShop/StoreShopPo.java

@@ -15,8 +15,10 @@
  */
 package com.java110.po.storeShop;
 
+import com.java110.po.shop.ShopPo;
+
 import java.io.Serializable;
-import java.util.Date;
+
 /**
  * 类表述： Po 数据模型实体对象 基本保持与数据库模型一直 用于 增加修改删除 等时的数据载体
  * add by 吴学文 at 2022-10-10 17:54:27 mail: 928255095@qq.com
@@ -25,120 +27,8 @@ import java.util.Date;
  * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
  * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
  */
-public class StoreShopPo implements Serializable {
+public class StoreShopPo extends ShopPo implements Serializable {
 
-    private String shopDesc;
-private String returnPerson;
-private String shopLogo;
-private String shopName;
-private String statusCd = "0";
-private String storeId;
-private String mapY;
-private String mapX;
-private String sendAddress;
-private String returnAddress;
-private String openType;
-private String areaCode;
-private String returnLink;
-private String shopId;
-private String state;
-private String shopType;
-public String getShopDesc() {
-        return shopDesc;
-    }
-public void setShopDesc(String shopDesc) {
-        this.shopDesc = shopDesc;
-    }
-public String getReturnPerson() {
-        return returnPerson;
-    }
-public void setReturnPerson(String returnPerson) {
-        this.returnPerson = returnPerson;
-    }
-public String getShopLogo() {
-        return shopLogo;
-    }
-public void setShopLogo(String shopLogo) {
-        this.shopLogo = shopLogo;
-    }
-public String getShopName() {
-        return shopName;
-    }
-public void setShopName(String shopName) {
-        this.shopName = shopName;
-    }
-public String getStatusCd() {
-        return statusCd;
-    }
-public void setStatusCd(String statusCd) {
-        this.statusCd = statusCd;
-    }
-public String getStoreId() {
-        return storeId;
-    }
-public void setStoreId(String storeId) {
-        this.storeId = storeId;
-    }
-public String getMapY() {
-        return mapY;
-    }
-public void setMapY(String mapY) {
-        this.mapY = mapY;
-    }
-public String getMapX() {
-        return mapX;
-    }
-public void setMapX(String mapX) {
-        this.mapX = mapX;
-    }
-public String getSendAddress() {
-        return sendAddress;
-    }
-public void setSendAddress(String sendAddress) {
-        this.sendAddress = sendAddress;
-    }
-public String getReturnAddress() {
-        return returnAddress;
-    }
-public void setReturnAddress(String returnAddress) {
-        this.returnAddress = returnAddress;
-    }
-public String getOpenType() {
-        return openType;
-    }
-public void setOpenType(String openType) {
-        this.openType = openType;
-    }
-public String getAreaCode() {
-        return areaCode;
-    }
-public void setAreaCode(String areaCode) {
-        this.areaCode = areaCode;
-    }
-public String getReturnLink() {
-        return returnLink;
-    }
-public void setReturnLink(String returnLink) {
-        this.returnLink = returnLink;
-    }
-public String getShopId() {
-        return shopId;
-    }
-public void setShopId(String shopId) {
-        this.shopId = shopId;
-    }
-public String getState() {
-        return state;
-    }
-public void setState(String state) {
-        this.state = state;
-    }
-public String getShopType() {
-        return shopType;
-    }
-public void setShopType(String shopType) {
-        this.shopType = shopType;
-    }
 
 
 

java110-bean/src/main/java/com/java110/po/storeShopCommunity/StoreShopCommunityPo.java

@@ -15,6 +15,8 @@
  */
 package com.java110.po.storeShopCommunity;
 
+import com.java110.po.shopCommunity.ShopCommunityPo;
+
 import java.io.Serializable;
 import java.util.Date;
 /**
@@ -25,92 +27,7 @@ import java.util.Date;
  * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
  * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
  */
-public class StoreShopCommunityPo implements Serializable {
-
-    private String address;
-private String cityCode;
-private String codeName;
-private String communityName;
-private String startTime;
-private String statusCd = "0";
-private String shopId;
-private String endTime;
-private String state;
-private String communityId;
-private String message;
-private String scId;
-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 getStatusCd() {
-        return statusCd;
-    }
-public void setStatusCd(String statusCd) {
-        this.statusCd = statusCd;
-    }
-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 class StoreShopCommunityPo extends ShopCommunityPo implements Serializable {
 
 
 

java110-interface/src/main/java/com/java110/intf/mall/IShopCommunityInnerServiceSMO.java

@@ -0,0 +1,53 @@
+package com.java110.intf.mall;
+
+import com.java110.config.feign.FeignConfiguration;
+import com.java110.dto.shopCommunity.ShopCommunityDto;
+import com.java110.po.shopCommunity.ShopCommunityPo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import java.util.List;
+
+/**
+ * @ClassName IShopCommunityInnerServiceSMO
+ * @Description 商铺小区接口类
+ * @Author wuxw
+ * @Date 2019/4/24 9:04
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+@FeignClient(name = "shop-service", configuration = {FeignConfiguration.class})
+@RequestMapping("/shopCommunityApi")
+public interface IShopCommunityInnerServiceSMO {
+
+
+    @RequestMapping(value = "/saveShopCommunity", method = RequestMethod.POST)
+    public int saveShopCommunity(@RequestBody ShopCommunityPo shopCommunityPo);
+
+    @RequestMapping(value = "/updateShopCommunity", method = RequestMethod.POST)
+    public int updateShopCommunity(@RequestBody  ShopCommunityPo shopCommunityPo);
+
+    @RequestMapping(value = "/deleteShopCommunity", method = RequestMethod.POST)
+    public int deleteShopCommunity(@RequestBody  ShopCommunityPo shopCommunityPo);
+
+    /**
+     * <p>查询小区楼信息</p>
+     *
+     *
+     * @param shopCommunityDto 数据对象分享
+     * @return ShopCommunityDto 对象数据
+     */
+    @RequestMapping(value = "/queryShopCommunitys", method = RequestMethod.POST)
+    List<ShopCommunityDto> queryShopCommunitys(@RequestBody ShopCommunityDto shopCommunityDto);
+
+    /**
+     * 查询<p>小区楼</p>总记录数
+     *
+     * @param shopCommunityDto 数据对象分享
+     * @return 小区下的小区楼记录数
+     */
+    @RequestMapping(value = "/queryShopCommunitysCount", method = RequestMethod.POST)
+    int queryShopCommunitysCount(@RequestBody ShopCommunityDto shopCommunityDto);
+}

java110-interface/src/main/java/com/java110/intf/mall/IShopInnerServiceSMO.java

@@ -0,0 +1,60 @@
+package com.java110.intf.mall;
+
+import com.java110.config.feign.FeignConfiguration;
+import com.java110.dto.shop.ShopDto;
+import com.java110.po.shop.ShopPo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import java.util.List;
+
+/**
+ * @ClassName IShopInnerServiceSMO
+ * @Description 店铺接口类
+ * @Author wuxw
+ * @Date 2019/4/24 9:04
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+@FeignClient(name = "shop-service", configuration = {FeignConfiguration.class})
+@RequestMapping("/shopApi")
+public interface IShopInnerServiceSMO {
+
+
+    @RequestMapping(value = "/saveShop", method = RequestMethod.POST)
+    public int saveShop(@RequestBody ShopPo shopPo);
+
+    @RequestMapping(value = "/updateShop", method = RequestMethod.POST)
+    public int updateShop(@RequestBody ShopPo shopPo);
+
+    @RequestMapping(value = "/deleteShop", method = RequestMethod.POST)
+    public int deleteShop(@RequestBody ShopPo shopPo);
+
+    /**
+     * <p>查询小区楼信息</p>
+     *
+     * @param shopDto 数据对象分享
+     * @return ShopDto 对象数据
+     */
+    @RequestMapping(value = "/queryShops", method = RequestMethod.POST)
+    List<ShopDto> queryShops(@RequestBody ShopDto shopDto);
+
+    /**
+     * <p>查询小区楼信息</p>
+     *
+     * @param
+     * @return ShopDto 对象数据
+     */
+    @RequestMapping(value = "/getOrderShopInfo", method = RequestMethod.POST)
+    List<ShopDto> getOrderShopInfo(@RequestBody String [] shopIds);
+    /**
+     * 查询<p>小区楼</p>总记录数
+     *
+     * @param shopDto 数据对象分享
+     * @return 小区下的小区楼记录数
+     */
+    @RequestMapping(value = "/queryShopsCount", method = RequestMethod.POST)
+    int queryShopsCount(@RequestBody ShopDto shopDto);
+}

java110-interface/src/main/java/com/java110/intf/mall/package-info.java

@@ -0,0 +1,7 @@
+/**
+ * 这个包内定义 和商城 的接口类
+ *
+ * add by 吴学文 2022-10-11
+ *
+ */
+package com.java110.intf.mall;

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

@@ -16,6 +16,8 @@ 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;
@@ -24,13 +26,11 @@ import com.java110.po.account.AccountPo;
 import com.java110.po.org.OrgPo;
 import com.java110.po.org.OrgStaffRelPo;
 import com.java110.po.privilegeUser.PrivilegeUserPo;
-import com.java110.po.shop.ShopPo;
 import com.java110.po.store.StorePo;
 import com.java110.po.store.StoreUserPo;
 import com.java110.po.storeShop.StoreShopPo;
 import com.java110.po.storeShopCommunity.StoreShopCommunityPo;
 import com.java110.po.user.UserPo;
-import com.java110.utils.cache.CommonCache;
 import com.java110.utils.cache.MappingCache;
 import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.constant.StoreUserRelConstant;
@@ -39,7 +39,6 @@ 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 com.java110.utils.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.List;
@@ -75,7 +74,7 @@ public class PropertySaveStoreAndShopCmd extends Cmd {
     private IPrivilegeUserV1InnerServiceSMO privilegeUserV1InnerServiceSMOImpl;
 
     @Autowired
-    private IStoreShopV1InnerServiceSMO shopInnerServiceSMOImpl;
+    private IStoreShopV1InnerServiceSMO storeShopV1InnerServiceSMOImpl;
 
     @Autowired
     private IAccountInnerServiceSMO accountInnerServiceSMOImpl;
@@ -90,6 +89,13 @@ public class PropertySaveStoreAndShopCmd extends Cmd {
     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, "shopName", "未包含商铺名称");
@@ -107,9 +113,9 @@ public class PropertySaveStoreAndShopCmd extends Cmd {
         communityDto.setCommunityId(reqJson.getString("communityId"));
         List<CommunityDto> communityDtos = communityV1InnerServiceSMOImpl.queryCommunitys(communityDto);
 
-        Assert.listOnlyOne(communityDtos,"小区不存在");
-        reqJson.put("communityName",communityDtos.get(0).getName());
-        reqJson.put("areaCode",communityDtos.get(0).getAreaCode());
+        Assert.listOnlyOne(communityDtos, "小区不存在");
+        reqJson.put("communityName", communityDtos.get(0).getName());
+        reqJson.put("areaCode", communityDtos.get(0).getAreaCode());
 
         StoreDto storeDto = new StoreDto();
         storeDto.setTel(reqJson.getString("link"));
@@ -264,9 +270,13 @@ public class PropertySaveStoreAndShopCmd extends Cmd {
         storeShopCommunityPo.setShopId(reqJson.getString("shopId"));
         storeShopCommunityPo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
         storeShopCommunityPo.setState(StoreShopCommunityDto.STATE_SUCCESS);
-        int flag = storeShopCommunityV1InnerServiceSMOImpl.saveStoreShopCommunity(storeShopCommunityPo);
-
-        if(flag < 1){
+        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("小区关联商铺失败");
         }
     }
@@ -313,7 +323,12 @@ public class PropertySaveStoreAndShopCmd extends Cmd {
 
         shopPo.setState(ShopDto.STATE_Y);
         //shopPo.setState(ShopDto.STATE_B);
-        int flag = shopInnerServiceSMOImpl.saveStoreShop(shopPo);
+        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("保存商铺失败");
         }