|
|
|
@@ -269,7 +269,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
long merchantId = idWorker.nextId(); |
|
|
|
//保存商户商铺的关联 |
|
|
|
List<Long> shopidlist = wxMerchant.getShopids(); |
|
|
|
if (!shopidlist.isEmpty()) { |
|
|
|
if (shopidlist.isEmpty()) { |
|
|
|
return new ResultData(ErrorCode.SHOP_NOT_SELECTED); |
|
|
|
} |
|
|
|
//先检查是否存在已出租的商铺 |
|
|
|
@@ -296,6 +296,8 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
wxMerchantShop.setId(idWorker.nextId()); |
|
|
|
wxMerchantShop.setMerchantId(merchantId); |
|
|
|
wxMerchantShop.setTenantId(wxMerchant.getTenantId()); |
|
|
|
wxMerchantShop.setShopId(shopid); |
|
|
|
wxMerchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode()); |
|
|
|
Date shopdate = new Date(); |
|
|
|
wxMerchantShop.setUpdateDate(shopdate); |
|
|
|
wxMerchantShop.setCreateDate(shopdate); |
|
|
|
|