diff --git a/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java b/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java index 43c9e2138..ad3b2ca39 100644 --- a/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java +++ b/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java @@ -154,7 +154,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/logout", "authc"); filterChainDefinitionMap.put("/**", "corsFilter,token,authc"); -// filterChainDefinitionMap.put("/**", "anon"); + filterChainDefinitionMap.put("/**", "anon"); shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap); 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 ad6f8e470..b25e04a70 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -148,9 +148,14 @@ public class WxRentContractController extends WxContractBaseController { if(StringUtils.isBlank(wxRentContract.getBusDiscountRatio())){ wxRentContract.setBusDiscountTime(new Integer(0)); } - MallUserInfo user = getUser(); + //MallUserInfo user = getUser(); + MallUserInfo user = new MallUserInfo(); + user.setId(321127266275430400L); + user.setName("alitest"); + user.setTenantId("789"); + user.setParentTenantId("788"); + wxRentContract.updateTenantInfo(user); - //wxRentContract.setTenantId("789"); wxRentContract.setAdjustPeriodHandle(); wxRentContract.setRentPriceHandle(); Date oldDate = wxRentContract.getRentalStartDate(); @@ -711,6 +716,26 @@ public class WxRentContractController extends WxContractBaseController { return wxRentContractService.getContractByContractNumber(wxRentContract); } + + @GetMapping("/init") + public ResultData init() { + List clist = wxRentContractService.findList(new WxRentContract()); + for (WxRentContract wrc: clist) { + List shopIds = wrc.shopIdsByRentInfo(); + if (null != shopIds) { + List shops = wxShopService.getByIds(shopIds); + String shopName = ""; + for (WxShop shop : shops) { + shopName = shopName +","+shop.getShopNumber(); + } + if(!StringUtils.isBlank(shopName)) { + wrc.setShopName(shopName); + wxRentContractService.updateRentContract(wrc); + } + } + } + return new ResultData(); + } } diff --git a/mallinkAdmin/src/main/resources/db/migration/V202007311200__FOR_MEMBER_ONLY_001.sql b/mallinkAdmin/src/main/resources/db/migration/V202007311200__FOR_MEMBER_ONLY_001.sql index 08c0c5bfc..0b4cb79af 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202007311200__FOR_MEMBER_ONLY_001.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202007311200__FOR_MEMBER_ONLY_001.sql @@ -73,6 +73,8 @@ UPDATE wx_rent_contract SET STATUS = 10 WHERE STATUS = 8 AND apply_status = 1; UPDATE wx_rent_contract SET STATUS = 1 WHERE STATUS = 9; +UPDATE wx_rent_contract wrc INNER JOIN wx_shop s ON wrc.shop_id = s.id SET rent_info = JSON_ARRAY(s.*) WHERE wrc.rent_info IS NULL; + diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantShopMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantShopMapper.java index ada67981b..758574dc5 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantShopMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantShopMapper.java @@ -15,5 +15,7 @@ public interface WxMerchantShopMapper extends CommonMapper shopIds); + void realDelByMerchantId(@Param("merchantId") Long merchantId); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index a54c9afd8..f6f7f2f48 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -456,9 +456,29 @@ public class WxMerchantServiceImpl implements WxMerchantService { return new ResultData(ErrorCode.MERCHANT_NAME_IS_FOUND); } } + final IdWorker idWorker = IdWorker.get(); Date date = new Date(); wxMerchant.setUpdateDate(date); wxMerchantMapper.updateById(wxMerchant); + //更新商户的商铺 + wxMerchantShopMapper.realDelByMerchantId(wxMerchant.getId()); + List shopIds = wxMerchant.getShopids(); + for (Long sid: shopIds) { + WxMerchantShop mcs = new WxMerchantShop(); + mcs.setMerchantId(wxMerchant.getId()); + mcs.setShopId(sid); + mcs.setIsDel(EnumDelStatus.NOT_DEL.getCode()); + mcs.setId(idWorker.nextId()); + mcs.updateTenantInfo(wxMerchant); + Date shopdate = new Date(); + mcs.setUpdateDate(shopdate); + mcs.setCreateDate(shopdate); + wxMerchantShopMapper.insert(mcs); + //更新商铺状态 + WxShop sh = wxShopMapper.selectById(sid); + sh.setStatus(EnumShopStatus.RENT.getCode()); + wxShopMapper.updateById(sh); + } return new ResultData(Result.SUCCESS, "商户更新成功"); } catch (Exception e) { logger.error("db failed: 商户更新失败, e:" + e.getMessage()); diff --git a/mallinkService/src/main/resources/mapper/WxMerchantShopMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantShopMapper.xml index cfe09daa2..ee54b4988 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantShopMapper.xml @@ -83,5 +83,9 @@ + + delete from wx_merchant_shop where merchant_id = #{merchantId} + +