diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index e9722f026..d590b20b1 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -255,7 +255,7 @@ public class WxMerchantController extends BaseController { wxMerchant.updateTenantInfo(getTenantInfo()); wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); - wxMerchant.setType(type); + //wxMerchant.setType(type); wxMerchant.setCarVendorType(0); wxMerchant.setAdminTypes(EnumMerchantAdmin.getOrdinaryTypes()); WxUserDataRule dataRule = this.getCurrentDataFloors(); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java index 9737576c1..3154eefb2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -150,6 +150,9 @@ public class WxPropertyContractController extends WxContractBaseController { if (null == wxPropertyContract.getOperationType()) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "operationType不能为空"); } + if (null == wxPropertyContract.getRentShopType()) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "rentShopType不能为空"); + } if (null == wxPropertyContract.getAdjustPeriod()) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "adjustPeriod不能为空"); } @@ -197,6 +200,7 @@ public class WxPropertyContractController extends WxContractBaseController { wxPropertyContract.setSignDate(rentContract.getSignDate()); wxPropertyContract.setRentInfo(rentContract.getRentInfo()); wxPropertyContract.setShopNumbers(rentContract.getRentInfoShopNumber()); + wxPropertyContract.setRentShopType(rentContract.getRentShopType()); } WxMerchant merchant = wxMerchantService.selectById(wxPropertyContract.getMerchantId()); @@ -209,7 +213,7 @@ public class WxPropertyContractController extends WxContractBaseController { wxPropertyContract.setShopType(merchant.getShopType()); wxPropertyContract.setLinkPerson(merchant.getLinkPerson()); wxPropertyContract.setLinkPhone(merchant.getLinkPhone()); - wxPropertyContract.setRentShopType(merchant.getType()); + //wxPropertyContract.setRentShopType(merchant.getType()); Integer contractType = wxRentPropertyContractService.getContractType(wxPropertyContract.getRentShopType(), wxPropertyContract.getOperationType(), EnumContractType.PROPERTY.getCode()); wxPropertyContract.setContractType(contractType); diff --git a/mallinkAdmin/src/main/resources/db/migration/V202409000000001.sql b/mallinkAdmin/src/main/resources/db/migration/V202409000000001.sql new file mode 100644 index 000000000..f2df0fc75 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V202409000000001.sql @@ -0,0 +1,3 @@ +INSERT INTO `mallink`.`mall_permission` (`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) +VALUES (213, '写字楼住宅', 201, 'Y', NULL, 1, NULL, NULL, 'xzlzzlist', NULL, 0, 213); + diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java b/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java index 5bb51129f..66ff720b4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java @@ -409,4 +409,6 @@ public class WxAllBill extends TenantEntity { private String merchantLinkPerson; @TableField(exist = false) private String merchantPhone; + @TableField(exist = false) + private String queryShopNumber; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcuteResult.java b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcuteResult.java index 250aed395..2b472966f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcuteResult.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcuteResult.java @@ -91,7 +91,7 @@ public class WxEnergyReadingCalcuteResult extends TenantEntity { daily.setId(idWorker.nextId()); daily.updateTenantInfo(this); daily.setMerchantId(merchant.getId()); - daily.setRentShopType(merchant.getType()); + daily.setRentShopType(shop.getType()); daily.setCreatetime(new Date()); daily.setCreateBy(user.getId()); daily.setCreateByName(user.getName()); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java index a53ba84f0..27971f69e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java @@ -161,8 +161,8 @@ public class WxFinanceReceive extends TenantEntity { @TableField(exist = false) private List merchantIdList; - @io.swagger.annotations.ApiModelProperty(value = "店铺/多径EnumRentShopType", name = "rentShopType") - private Integer rentShopType; +// @io.swagger.annotations.ApiModelProperty(value = "店铺/多径EnumRentShopType", name = "rentShopType") +// private Integer rentShopType; @io.swagger.annotations.ApiModelProperty(value = "remark", name = "remark") private String remark; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index 69df4e20b..39930c525 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -85,7 +85,7 @@ public class WxMerchant extends TenantEntity { private Date rentalEndDate; @Excel(name="商户状态",width = 20,orderNum = "7",replace = {"停用_0","正常_1"}) - @io.swagger.annotations.ApiModelProperty(value="状态1可用0停用",name="status") + @io.swagger.annotations.ApiModelProperty(value="状态1可用0停用EnumMerchantStatus",name="status") private Integer status; public boolean checkStatus() { @@ -112,7 +112,7 @@ public class WxMerchant extends TenantEntity { private Date createDate; @Excel(name="是否展示",width = 20,orderNum = "9",replace = {"否_0","是_1"}) - @io.swagger.annotations.ApiModelProperty(value = "是否显示在C端", name = "isPublic") + @io.swagger.annotations.ApiModelProperty(value = "是否显示在C端EnumMerchantPublic", name = "isPublic") private Integer isPublic; @io.swagger.annotations.ApiModelProperty(value = "是否保密", name = "isPrivate") @@ -282,8 +282,8 @@ public class WxMerchant extends TenantEntity { private Integer shopType; @io.swagger.annotations.ApiModelProperty(value="品牌",name="brand") private Long brand; - @io.swagger.annotations.ApiModelProperty(value = "类型EnumRentShopType", name = "type") - private Integer type; +// @io.swagger.annotations.ApiModelProperty(value = "类型EnumRentShopType", name = "type") +// private Integer type; @io.swagger.annotations.ApiModelProperty(value = "邮件", name = "email") private String email; @io.swagger.annotations.ApiModelProperty(value = "副标题", name = "title") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java index ec28edb35..666097714 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java @@ -376,6 +376,7 @@ public class WxPropertyContract extends TenantEntity { @TableField(exist = false) List feeStandards; - + @TableField(exist = false) + private String queryShopNumber; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java index 81db26081..f449f24f4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -627,5 +627,7 @@ public class WxRentContract extends TenantEntity { private Date yearsBegin; @TableField(exist = false) private Date yearsEnd; + @TableField(exist = false) + private String queryShopNumber; } 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 a02aa857b..df3546909 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java @@ -77,7 +77,7 @@ public class WxShop extends TenantEntity { private String floorName; @Excel(name="租赁状态",width = 20,orderNum = "7",replace = {"未出租_0","已出租_1"}) - @io.swagger.annotations.ApiModelProperty(value="状态(0:未出租, 1:已出租)",name="status") + @io.swagger.annotations.ApiModelProperty(value="状态(0:未出租, 1:已出租)EnumShopStatus",name="status") private Integer status; @io.swagger.annotations.ApiModelProperty(value="店铺相对位置x",name="x") @@ -119,8 +119,6 @@ public class WxShop extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "类型EnumRentShopType", name = "type") private Integer type; - - @io.swagger.annotations.ApiModelProperty(value = "备注", name = "comments") private String comments; diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumMerchantCreateFrom.java b/mallinkService/src/main/java/com/iformall/enums/EnumMerchantCreateFrom.java index cdf800ed0..727b796e7 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumMerchantCreateFrom.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumMerchantCreateFrom.java @@ -7,7 +7,8 @@ package com.iformall.enums; public enum EnumMerchantCreateFrom { CREATE(1, "手动创建"), - DOUYIN_LAIKE(2, "抖音来客"); + DOUYIN_LAIKE(2, "抖音来客"), + SYS_SHOP_CREATE(3, "系统根据店铺自动创建"); public static EnumMerchantCreateFrom getEnum(Integer code) { for (EnumMerchantCreateFrom value : values()) { diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumRentShopType.java b/mallinkService/src/main/java/com/iformall/enums/EnumRentShopType.java index 19ef9a8d1..01daf2dee 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumRentShopType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumRentShopType.java @@ -8,7 +8,8 @@ package com.iformall.enums; public enum EnumRentShopType { SHOP(1, "店铺"), - POINT(2, "多经点位"); + POINT(2, "多经点位"), + XIZILOU(3, "写字楼住宅"); public static EnumRentShopType getEnum(Integer code) { for (EnumRentShopType value : values()) { diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java index 75059da60..95b323e32 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java @@ -31,7 +31,7 @@ public interface WxRentContractMapper extends CommonMapper List selectRentContractByMerchantId(WxRentContract wxRentContract); - List selectRentContractByShopId(@Param("tenantId") String tenantId,@Param("parentTenantId") String parentTenantId,@Param("shopId") Long shopId,@Param("status") Integer status); + //List selectRentContractByShopId(@Param("tenantId") String tenantId,@Param("parentTenantId") String parentTenantId,@Param("shopId") Long shopId,@Param("status") Integer status); int hasContractNumber(WxRentContract wxRentContract); diff --git a/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java b/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java index c255f85e1..7a3213423 100644 --- a/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java @@ -89,7 +89,7 @@ public class WxBillAllHelper { bill.setMerchantId(wxMerchant.getId()); bill.setStarttime(starttime); bill.setEndtime(enttime); - bill.setRentShopType(wxMerchant.getType()); + //bill.setRentShopType(wxMerchant.getType()); if (null != wxMerchant.getOweBillBeforeDays()) { bill.setOweBillLastTime(getDateBefore(wxMerchant.getOweBillBeforeDays())); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java index a03b8968c..bbb29ebcb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java @@ -914,8 +914,8 @@ public class WxFinanceServiceImpl implements WxFinanceService { addreceive.setReceiveMoney(receiveMoney); addreceive.setPayMoney(payMoney); addreceive.setMerchantId(merchantId); - WxMerchant merchant = wxMerchantService.getById(merchantId); - addreceive.setRentShopType(merchant.getType()); + //WxMerchant merchant = wxMerchantService.getById(merchantId); + //addreceive.setRentShopType(merchant.getType()); addreceive.setCreateTime(new Date()); addreceive.setCreateBy(user.getId()); addreceive.setCreateByName(user.getName()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantPowerBillConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantPowerBillConfigServiceImpl.java index b81e671fe..5b1df0ce6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantPowerBillConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantPowerBillConfigServiceImpl.java @@ -74,7 +74,7 @@ public class WxMerchantPowerBillConfigServiceImpl implements WxMerchantPowerBill return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); } config.setMerchantName(wxMerchant.getName()); - config.setMerchantType(wxMerchant.getType()); + //config.setMerchantType(wxMerchant.getType()); final IdWorker idWorker = IdWorker.get(); config.setId(idWorker.nextId()); config.setCreateDate(date); 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 68d5d6d8a..5dc41f913 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -2271,7 +2271,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { shopIds.add(shop.getId()); merchant.setShopids(shopIds); merchant.setBusinessId(shop.getBusinessId()); - merchant.setType(1); + //merchant.setType(1); merchant.setCreateFrom(EnumMerchantCreateFrom.DOUYIN_LAIKE.getCode()); merchant.setCreateFromId(poiId); Result result = this.addMerchant(merchant, user.getId()); 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 dac18b788..807664645 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -1,6 +1,7 @@ package com.iformall.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.github.pagehelper.Constant; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; @@ -15,8 +16,10 @@ import com.iformall.domain.vo.WxNotRentShopVo; import com.iformall.domain.vo.WxShopVo; import com.iformall.enums.*; import com.iformall.exception.MallinkException; +import com.iformall.mapper.WxAllBillMapper; import com.iformall.mapper.WxMerchantMapper; import com.iformall.mapper.WxMerchantShopMapper; +import com.iformall.mapper.WxPropertyContractMapper; import com.iformall.mapper.WxRentContractMapper; import com.iformall.mapper.WxShopMapper; import com.iformall.service.*; @@ -36,6 +39,8 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -66,6 +71,12 @@ public class WxShopServiceImpl implements WxShopService { @Autowired WxRentContractMapper wxRentContractMapper; + @Autowired + WxPropertyContractMapper wxPropertyContractMapper; + + @Autowired + WxAllBillMapper wxAllBillMapper; + @Lazy @Autowired WxMallFloorService wxMallFloorService; @@ -332,6 +343,7 @@ public class WxShopServiceImpl implements WxShopService { return volist; } + @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) @Override public ResultData saveOrUpdate(WxShop record) { if (record.getId() == null) { @@ -345,6 +357,44 @@ public class WxShopServiceImpl implements WxShopService { if (StringUtils.isBlank(record.getOperationArea()) || "0".equals(record.getOperationArea())) { record.setOperationArea(record.getBuildArea()); } + + //如果是写字楼住宅,则自动新增虚拟商户 + if (record.getType() == EnumRentShopType.XIZILOU.getCode()) { + WxMerchant merchant = new WxMerchant(); + merchant.updateTenantInfo(record); + merchant.setName("[系统]"+record.getShopNumber()); + merchant.setId(idWorker.nextId()); + merchant.setLinkPerson("虚拟"); + merchant.setLinkPhone("11111111111"); + merchant.setStatus(EnumMerchantStatus.VALID.getCode()); + merchant.setCreateDate(new Date()); + merchant.setUpdateDate(new Date()); + merchant.setIsPublic(EnumMerchantPublic.PRIVATE.getCode()); + merchant.setIsPrivate(EnumYesOrNo.YES.getCode()); + merchant.setBillSetting(3); + merchant.setCreateFrom(EnumMerchantCreateFrom.SYS_SHOP_CREATE.getCode()); + merchant.setCreateFromId(String.valueOf(record.getId())); + merchant.setCarVendorType(0); + merchant.setBusinessId(com.iformall.utils.Constant.default_business); + //merchant.setType(); + merchant.setIsAdmin(EnumYesOrNo.NO.getCode()); + merchant.setIsDel(EnumYesOrNo.NO.getCode()); + merchant.setSearchCardByPhone(EnumYesOrNo.NO.getCode()); + merchant.setCreditLocked(EnumYesOrNo.NO.getCode()); + wxMerchantMapper.insert(merchant); + + WxMerchantShop ms = new WxMerchantShop(); + ms.updateTenantInfo(record); + ms.setMerchantId(merchant.getId()); + ms.setShopId(record.getId()); + ms.setIsDel(EnumYesOrNo.NO.getCode()); + ms.setCreateDate(new Date()); + ms.setUpdateDate(new Date()); + wxMerchantShopMapper.insert(ms); + + record.setStatus(EnumShopStatus.RENT.getCode()); + } + wxShopMapper.insert(record); return new ResultData(Result.SUCCESS,"添加成功"); } else { @@ -367,40 +417,40 @@ public class WxShopServiceImpl implements WxShopService { //2、是否关联过商户 WxMerchantShop wxMerchantShop = new WxMerchantShop(); wxMerchantShop.setShopId(wxShop.getId()); - List wxMerchantShops = wxMerchantShopMapper.selectList(new QueryWrapper(wxMerchantShop)); - - if (isAdmin.equals(EnumUserAdmin.ADMIN.getCode())) { - //3、合同 两种 都要查一下 存在时不能删除 - WxRentContract wxRentContract = new WxRentContract(); - //wxRentContract.setShopId(wxShop.getId()); - wxRentContract.updateTenantInfo(wxShop); - long count = 0; - if (wxShop.getType().equals(EnumRentShopType.SHOP.getCode())) { - count = wxRentContractMapper.selectRentContractByShopId(wxRentContract.getTenantId(),wxRentContract.getParentTenantId(),wxShop.getId(),null).parallelStream() -// .filter(r -> !r.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) && -// !r.getStatus().equals(EnumRentContractStatus.RENT_PAID.getCode()) && -// !r.getStatus().equals(EnumRentContractStatus.CONTRACT_END_SOON.getCode())).count(); - .filter(r -> !EnumRentContractStatus.getValidStatus().contains(r.getStatus())).count(); - - - } else { - wxRentContract.setShopNumber(wxShop.getShopNumber()); - List list = wxRentContractMapper.findList(wxRentContract); -// count = list.stream().filter(r -> !r.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) && -// !r.getStatus().equals(EnumRentContractStatus.RENT_PAID.getCode()) && -// !r.getStatus().equals(EnumRentContractStatus.CONTRACT_END_SOON.getCode())).count(); - count = list.stream().filter(r -> EnumRentContractStatus.getValidStatus().contains(r.getStatus())).count(); - } - if (count > 0) { - return new ResultData(ErrorCode.SHOP_CONTRACT_HAS_CONNECT); - } + wxMerchantShop.updateTenantInfo(wxShop); + List wxMerchantShops = wxMerchantShopMapper.findList(wxMerchantShop); + + //如果存在有效的合同,则不允许删除 + WxRentContract rcq = new WxRentContract(); + rcq.updateTenantInfo(wxShop); + rcq.setQueryShopNumber(wxShop.getShopNumber()); + List status = EnumRentContractStatus.getValidStatus(); + status.add(EnumRentContractStatus.PERFORMANCE.getCode()); + rcq.setStatuss(status); + List list = wxRentContractMapper.findList(rcq); + if (null != list && list.size() > 0 ) { + return new ResultData(Result.ERROR, "店铺存在有效或者审批中的租金合同,不能删除"); + } + + WxPropertyContract pcq = new WxPropertyContract(); + pcq.updateTenantInfo(wxShop); + pcq.setQueryShopNumber(wxShop.getShopNumber()); + pcq.setStatuss(status); + List plist = wxPropertyContractMapper.findList(pcq); + if (null != plist && plist.size() > 0 ) { + return new ResultData(Result.ERROR, "店铺存在有效或者审批中的物业合同,不能删除"); + } + WxAllBill abq = new WxAllBill(); + abq.updateTenantInfo(wxShop); + abq.setQueryShopNumber(wxShop.getShopNumber()); + abq.setIsPreview(EnumYesOrNo.NO.getCode()); + List billlist = wxAllBillMapper.findList(abq); + if (null != billlist && plist.size() > 0 ) { + return new ResultData(Result.ERROR, "店铺已存在有效的账单,不能删除"); } //有关联过商户必须是管理员才能删除 int count = wxMerchantShops.size(); if (count > 0) { - if (!isAdmin.equals(EnumUserAdmin.ADMIN.getCode())) { - return new ResultData(ErrorCode.SHOP_DELETED_BY_ADMIN); - } //更新标记 wxShop.setIsDel(EnumDelStatus.DEL.getCode()); wxShopMapper.updateById(wxShop); diff --git a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml index b114d5dfc..fd95a0923 100644 --- a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml @@ -81,6 +81,8 @@ and `extra_create_from` is null and bill_type = 6 and IFNULL(`pay`,'0') - IFNULL(`use_money`,'0') > 0 and `can_edit` = #{canEdit} + and shop_number like concat('%',#{shopNumber},'%') + and shop_number like concat('%,',#{shopNumber},',%') and date_format(starttime,'%Y-%m') <= #{month} and date_format(endtime,'%Y-%m') >= #{month} diff --git a/mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml b/mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml index 80b6a994f..5ee44190c 100644 --- a/mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml @@ -20,7 +20,6 @@ - @@ -30,7 +29,7 @@ `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`receive_date`,`receive_money`,`pay_money`,`set_off_money`,`cut_money`,`status`,`type`, - `money_detail`,`create_by`,`create_by_name`,`update_by`,`update_by_name`,`merchant_id`,`rent_shop_type`,`remark`,`fees_id`,`is_print`,`is_finish`,`parent_id` + `money_detail`,`create_by`,`create_by_name`,`update_by`,`update_by_name`,`merchant_id`,`remark`,`fees_id`,`is_print`,`is_finish`,`parent_id` @@ -45,7 +44,6 @@ and `status` = #{status} and `type` = #{type} and `merchant_id` = #{merchantId} - and `rent_shop_type` = #{rentShopType} and `create_time` >= #{createTimeBegin} and `create_time` <= #{createTimeEnd} and `receive_date` >= #{receiveDateBegin} diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 2be596046..3f6be4d7a 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -21,7 +21,6 @@ - @@ -55,7 +54,7 @@ m.`id`,m.`tenant_id`,m.`parent_tenant_id`,m.`img_url`,m.`name`,m.`encode`,m.`link_phone`,m.`create_date`,m.`update_date`,m.`car_vendor_type`,m.`car_params`,m.`status`,m.`link_person`, - m.`business_id`,m.`business_types`,m.`sub_business_id`,m.`shop_type`,m.`brand`,m.`type`,m.`is_public`,m.`is_private`,m.email,m.`title`,m.`cover_picture`,m.`is_admin`,m.`bill_setting`,m.`qr_code`,m.`tt_qr_code`, + m.`business_id`,m.`business_types`,m.`sub_business_id`,m.`shop_type`,m.`brand`,m.`is_public`,m.`is_private`,m.email,m.`title`,m.`cover_picture`,m.`is_admin`,m.`bill_setting`,m.`qr_code`,m.`tt_qr_code`, m.`introduction`,m.`action_desc`,m.`mark`,m.mark_time,m.`is_del`,m.`talk_user_main`,m.`talk_user_aux`,m.link_line_phone,m.search_card_by_phone,m.credit_locked,m.credit_locked,m.entry_amount,m.cash_out_count, m.cash_out_last_time,m.create_from,m.create_from_id @@ -124,9 +123,6 @@ and m.business_id in (${businessForRule}) and m.is_del=0 - - and m.type in (${shopTypeForRule}) - and JSON_CONTAINS(m.business_types,JSON_OBJECT('id', #{businessTypes})) @@ -143,9 +139,6 @@ and m.`status` = #{status} - - and m.`type` = #{type} - and m.`is_public` = #{isPublic} @@ -467,7 +460,7 @@ @@ -476,7 +469,7 @@ select m.`id`,m.`tenant_id` tenantId,m.`parent_tenant_id` parentTenantId,m.`img_url`,m.`name`,m.`encode`,m.`link_phone`,m.`create_date`,m.`update_date`, m.`car_vendor_type`,m.`car_params`,m.`status`,m.`link_person`, - m.`business_id`,m.`business_types`,m.`sub_business_id`,m.`shop_type`,m.`brand`,m.`type`,m.`is_public`,m.`is_private`,m.email,m.`title`,m.`cover_picture`,m.`is_admin`,m.`bill_setting`,m.`qr_code`,m.`tt_qr_code`, + m.`business_id`,m.`business_types`,m.`sub_business_id`,m.`shop_type`,m.`brand`,m.`is_public`,m.`is_private`,m.email,m.`title`,m.`cover_picture`,m.`is_admin`,m.`bill_setting`,m.`qr_code`,m.`tt_qr_code`, m.`introduction`,m.`action_desc`,m.`mark`,m.mark_time,m.`is_del`,m.`talk_user_main`,m.`talk_user_aux`,m.link_line_phone,m.credit_locked,m.credit_locked from wx_merchant m where m.id = #{id} and m.is_del = 0 diff --git a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml index a0bf52a8a..11734edac 100644 --- a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml @@ -132,6 +132,9 @@ and rent_shop_type in (${shopTypeForRule}) + + and concat(',',shop_numbers,',') like concat('%,',#{queryShopNumber},',%') + and merchant_id in diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index d8b2bcd13..9475fc6fe 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -206,6 +206,9 @@ and shop_name like concat('%',#{shopNumber},'%') + + and concat(',',shop_name,',') like concat('%,',#{queryShopNumber},',%') + and business_id in (${businessForRule}) @@ -314,8 +317,7 @@ - diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index ed101f6c7..7451bd33d 100644 --- a/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -110,7 +110,7 @@ public class WxMerchantController extends BaseController { wxMerchant.updateTenantInfo(getTenantInfo()); wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); - wxMerchant.setType(type); + //wxMerchant.setType(type); wxMerchant.setCarVendorType(0); return new ResultData(wxMerchantService.queryIdAndNames(wxMerchant)); }