From 73fb90da9f5c66b5d0422008e86baf87af505c85 Mon Sep 17 00:00:00 2001 From: winter Date: Fri, 27 Sep 2024 21:27:03 +0800 Subject: [PATCH] fix --- .../controller/basic/WxShopController.java | 10 +++++ .../contract/WxRentContractController.java | 8 +++- .../db/migration/V202409000000002.sql | 5 ++- .../java/com/iformall/domain/po/WxShop.java | 7 +++- .../service/impl/WxShopServiceImpl.java | 6 ++- .../main/resources/mapper/WxShopMapper.xml | 40 +++++++++++++++++++ 6 files changed, 72 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java index a21c1fd5a..e9a7408e0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java @@ -15,6 +15,8 @@ import com.iformall.domain.po.WxUserDataRule; import com.iformall.domain.po.base.BaseEntity; import com.iformall.enums.EnumBillAllType; import com.iformall.enums.EnumCUserBaseInfoSex; +import com.iformall.enums.EnumRentShopType; +import com.iformall.enums.EnumShopSellStatus; import com.iformall.enums.EnumShopUsersPersonRelax; import com.iformall.enums.EnumShopUsersPrincipalType; import com.iformall.enums.EnumShopUsersStatus; @@ -81,6 +83,14 @@ public class WxShopController extends BaseController { wxShop.setSortColumn("shop_number asc"); //wxShop.setSortColumns(BaseEntity.SortField.CreateDate_DESC,BaseEntity.SortField.Id_DESC); setDataRule(wxShop); + //查询自持的商业店铺 + if (null != wxShop.getIsOwnMerchantShop()) { + List typeList = new ArrayList(); + typeList.add(EnumRentShopType.SHOP.getCode()); + typeList.add(EnumRentShopType.POINT.getCode()); + wxShop.setTypeList(typeList); + wxShop.setSellStatus(EnumShopSellStatus.OWNED.getCode()); + } final PageInfo> page = wxShopService.listMapAsPage(wxShop, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index 004401631..e8ebf4d87 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -275,7 +275,13 @@ public class WxRentContractController extends WxContractBaseController { WxMerchant merchant = wxMerchantService.selectById(merchantId); if (merchant.getIsPrivate() == EnumYesOrNo.YES.getCode()) { shopList = new ArrayList(); - shopList.add(Long.parseLong(merchant.getCreateFromId())); + //不从这取,因为这是存的第一次创建时店铺的编号,这个店铺有可能被删除重新创建 + //shopList.add(Long.parseLong(merchant.getCreateFromId())); + String shopNumber = merchant.getCreateFromData(); + WxShop shop = wxShopService.getShopByShopNumber(merchant, shopNumber); + if (null != shop) { + shopList.add(shop.getId()); + } }else { shopList = wxMerchantService.getMerchantShopIds(merchantId); } diff --git a/mallinkAdmin/src/main/resources/db/migration/V202409000000002.sql b/mallinkAdmin/src/main/resources/db/migration/V202409000000002.sql index a6747230b..87ccf073b 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202409000000002.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202409000000002.sql @@ -1 +1,4 @@ -ALTER TABLE wx_shop ADD COLUMN sell_status INT(1) NOT NULL DEFAULT 1 COMMENT '销售状态'; \ No newline at end of file +ALTER TABLE wx_shop ADD COLUMN sell_status INT(1) NOT NULL DEFAULT 1 COMMENT '销售状态'; + +更新虚拟商户的铺位为待出租状态。 +删除虚拟商户的关联铺位。 \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java b/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java index 939331bdf..d15963621 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java @@ -191,5 +191,10 @@ public class WxShop extends TenantEntity { this.rent_unit = rentUnit; } - + @TableField(exist = false) + private Integer isOwnMerchantShop; + @TableField(exist = false) + private List typeList; + @TableField(exist = false) + private String queryShopNumber; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java index d4a46c531..1ec8bc973 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -285,6 +285,10 @@ public class WxShopServiceImpl implements WxShopService { } } } + Integer type = (Integer)shop.get("type"); + if (null != type ) { + shop.put("typeName", EnumRentShopType.getEnum(type).getMessage()); + } } } } @@ -848,7 +852,7 @@ public class WxShopServiceImpl implements WxShopService { public WxShop getShopByShopNumber(TenantEntity tenantEntity,String shopNumber) { WxShop shopQ = new WxShop(); shopQ.updateTenantInfo(tenantEntity); - shopQ.setShopNumber(shopNumber); + shopQ.setQueryShopNumber(shopNumber); List shopList = wxShopMapper.findList(shopQ); if (null != shopList && shopList.size() > 0 ) { return shopList.get(0); diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index b4dea1598..b7c83b036 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -60,6 +60,10 @@ and `shop_number` like concat('%', #{shopNumber},'%') + + + and `shop_number` = #{queryShopNumber} + and `build_area` like concat('%', #{buildArea},'%') @@ -142,6 +146,13 @@ and type in (${shopTypeForRule}) + + + and type in + + #{tidItem} + + and id in @@ -235,6 +246,10 @@ and s.`shop_number` like concat('%', #{shopNumber},'%') + + + and s.`shop_number` = #{queryShopNumber} + and s.`build_area` like concat('%', #{buildArea},'%') @@ -298,6 +313,13 @@ and s.`business_id` in (${businessForRule}) + + + and s.type in + + #{tidItem} + + and s.id in @@ -330,9 +352,19 @@ and s.`shop_number` like concat('%', #{shopNumber},'%') + + + and s.`shop_number` = #{queryShopNumber} + + and s.`status` = #{status} + + + and s.`sell_status` = #{sellStatus} + + and s.`type` = #{type} @@ -382,6 +414,10 @@ and s.`shop_number` like concat('%', #{shopNumber},'%') + + + and s.`shop_number` = #{queryShopNumber} + and s.`build_area` like concat('%', #{buildArea},'%') @@ -402,6 +438,10 @@ and s.`status` = #{status} + + + and s.`sell_status` = #{sellStatus} + and s.`x` = #{x}