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 a3342839f..f614ce03a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java @@ -133,16 +133,19 @@ public class WxShopController extends BaseController { wxShop.setSortColumn("shop_number asc"); } + //TODO 这个字段暂时没什么用了,但是商户选择店铺的弹框里面还根据这个字段查询,先屏蔽掉 + wxShop.setStatus(null); + //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()); - } +// 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/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java index 92b4b08f2..a5e85110c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -245,27 +245,6 @@ public class WxShopServiceImpl implements WxShopService { return count; } - private Map getMerchantMap(TenantEntity tenantEntity,List merchantIds,Map merchantMap) { - if (null == merchantMap) { - merchantMap = new HashMap(); - } - if (null != merchantIds && merchantIds.size() > 0 ) { - WxMerchant merchantQ = new WxMerchant(); - merchantQ.updateTenantInfo(tenantEntity); - merchantQ.setIds(merchantIds); - List merchantList = wxMerchantMapper.findList(merchantQ); - if (null != merchantList && merchantList.size() > 0 ) { - for (int i = 0 ; i < merchantList.size() ; i ++) { - WxMerchant m = merchantList.get(i); - if (null != m) { - merchantMap.put(m.getId(), m); - } - } - } - } - return merchantMap; - } - private void initShopMerchantMap(WxShop record,Map shopMerchantIdMap,Map merchantMap) { WxMerchantShop merchantShopQ = new WxMerchantShop(); merchantShopQ.updateTenantInfo(record); @@ -287,43 +266,25 @@ public class WxShopServiceImpl implements WxShopService { } } } - //还得查一下虚拟商户,如果店铺既有品牌商户关联,又有虚拟商户,则取虚拟商户。因为这种情况代表的是已售铺创建的品牌,不能创建合同,智能做营销。 - WxShop sq = new WxShop(); - sq.setId(record.getId()); - sq.setIds(record.getIds()); - sq.setIsDel(EnumYesOrNo.NO.getCode()); - List shopList = wxShopMapper.findList(sq); - if (null != shopList && shopList.size() > 0 ) { - Map shopNumberMap = new HashMap(); - List shopNumberList = new ArrayList(); - for (int i = 0 ; i < shopList.size() ; i ++ ) { - WxShop s = shopList.get(i); - shopNumberMap.put(s.getShopNumber(), s.getId()); - shopNumberList.add(s.getShopNumber()); - } - - WxMerchant mq = new WxMerchant(); - mq.updateTenantInfo(record); - sq.setIsDel(EnumYesOrNo.NO.getCode()); - mq.setCreateShopNumberList(shopNumberList); - List mlist = wxMerchantMapper.findList(mq); - if (null != mlist && mlist.size() > 0) { - for (int i = 0 ; i < mlist.size() ; i ++ ) { - WxMerchant m = mlist.get(i); - String createshopNumber = m.getCreateShopNumber(); - if (StringUtils.isNotBlank(createshopNumber)) { - Long shopId = shopNumberMap.get(createshopNumber); - if (null != shopId) { - shopMerchantIdMap.put(shopId, m.getId()); - } + + if (null == merchantMap) { + merchantMap = new HashMap(); + } + if (null != merchantIds && merchantIds.size() > 0 ) { + WxMerchant merchantQ = new WxMerchant(); + merchantQ.updateTenantInfo(record); + merchantQ.setIds(merchantIds); + List merchantList = wxMerchantMapper.findList(merchantQ); + if (null != merchantList && merchantList.size() > 0 ) { + for (int i = 0 ; i < merchantList.size() ; i ++) { + WxMerchant m = merchantList.get(i); + if (null != m) { + merchantMap.put(m.getId(), m); } - if (!merchantIds.contains(m.getId())) { - merchantIds.add(m.getId()); - } - } + } } } - merchantMap = getMerchantMap(record,merchantIds,merchantMap); + } @Override