diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java index b61a6fa32..f9274d31f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java @@ -104,6 +104,10 @@ public class WxBillDaily implements Serializable { /*更新时间**/ @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime") private Date updatetime; + + @io.swagger.annotations.ApiModelProperty(value = "租赁商铺类型", name = "rentShopType") + private Integer rentShopType; + public Integer getReceivePay() { return receivePay; } @@ -189,7 +193,13 @@ public class WxBillDaily implements Serializable { updatetime = _updatetime; } + public Integer getRentShopType() { + return rentShopType; + } + public void setRentShopType(Integer rentShopType) { + this.rentShopType = rentShopType; + } public static enum Field { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java index 901e8a2e8..3f7186aff 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java @@ -98,6 +98,9 @@ public class WxBillDeposit implements Serializable { @io.swagger.annotations.ApiModelProperty(value="结束时间",name="endtime") private Date endtime; + @io.swagger.annotations.ApiModelProperty(value = "租赁商铺类型", name = "rentShopType") + private Integer rentShopType; + public Date getStarttime() { return starttime; } @@ -219,6 +222,14 @@ public class WxBillDeposit implements Serializable { this.merchantName = merchantName; } + public Integer getRentShopType() { + return rentShopType; + } + + public void setRentShopType(Integer rentShopType) { + this.rentShopType = rentShopType; + } + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java index 0644dd235..4b28c8f1a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java @@ -115,6 +115,10 @@ public class WxBillOther implements Serializable { /*更新时间**/ @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime") private Date updatetime; + + @io.swagger.annotations.ApiModelProperty(value = "租赁商铺类型", name = "rentShopType") + private Integer rentShopType; + public Integer getReceivePay() { return receivePay; } @@ -200,7 +204,13 @@ public class WxBillOther implements Serializable { updatetime = _updatetime; } + public Integer getRentShopType() { + return rentShopType; + } + public void setRentShopType(Integer rentShopType) { + this.rentShopType = rentShopType; + } public static enum Field { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java index c406038c5..78441681c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java @@ -98,6 +98,9 @@ public class WxBillProperty implements Serializable { @io.swagger.annotations.ApiModelProperty(value="结束时间",name="endtime") private Date endtime; + @io.swagger.annotations.ApiModelProperty(value = "租赁商铺类型", name = "rentShopType") + private Integer rentShopType; + public Date getStarttime() { return starttime; } @@ -222,6 +225,14 @@ public class WxBillProperty implements Serializable { this.merchantName = merchantName; } + public Integer getRentShopType() { + return rentShopType; + } + + public void setRentShopType(Integer rentShopType) { + this.rentShopType = rentShopType; + } + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java index 6e5bf1b80..87fc9ce79 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java @@ -98,6 +98,9 @@ public class WxBillPropertyDeposit implements Serializable { @io.swagger.annotations.ApiModelProperty(value="结束时间",name="endtime") private Date endtime; + @io.swagger.annotations.ApiModelProperty(value = "租赁商铺类型", name = "rentShopType") + private Integer rentShopType; + public Date getStarttime() { return starttime; } @@ -221,6 +224,14 @@ public class WxBillPropertyDeposit implements Serializable { this.merchantName = merchantName; } + public Integer getRentShopType() { + return rentShopType; + } + + public void setRentShopType(Integer rentShopType) { + this.rentShopType = rentShopType; + } + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java index a1b1d3360..74136464f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java @@ -100,6 +100,9 @@ public class WxBillRent implements Serializable { @io.swagger.annotations.ApiModelProperty(value="结束时间",name="endtime") private Date endtime; + @io.swagger.annotations.ApiModelProperty(value = "租赁商铺类型", name = "rentShopType") + private Integer rentShopType; + public Date getStarttime() { return starttime; } @@ -223,6 +226,14 @@ public class WxBillRent implements Serializable { this.updatetime = updatetime; } + public Integer getRentShopType() { + return rentShopType; + } + + public void setRentShopType(Integer rentShopType) { + this.rentShopType = rentShopType; + } + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") diff --git a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java index df8de4235..95678d3b4 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java @@ -1,6 +1,7 @@ package com.iformall.service; import com.iformall.common.ResultData; +import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxRentContract; import javax.servlet.http.HttpServletRequest; @@ -66,4 +67,8 @@ public interface WxRentContractService { void updateApplyStatus(WxRentContract wxRentContract); + void buildRent(WxMerchant wxMerchant, Long userId); + + void buildDeposit(WxMerchant wxMerchant, Long userId); + } 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 09ddb0c66..0d04d877d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -14,6 +14,7 @@ import com.iformall.mapper.*; import com.iformall.service.WxCouponService; import com.iformall.service.WxMerchantService; import com.iformall.service.WxProfitSharingReceiverService; +import com.iformall.service.WxRentContractService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -75,6 +76,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Autowired WxCouponMerchantMapper wxCouponMerchantMapper; + @Autowired + WxRentContractService wxRentContractService; + @Override public PageInfo listAsPage(WxMerchant record, Integer pageIndex, Integer pageSize) { @@ -311,9 +315,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { wxRentContract.setStatus(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()); wxRentContractMapper.updateByPrimaryKeySelective(wxRentContract); //创建账单 - buildRent(wxMerchant, userId); + wxRentContractService.buildRent(wxMerchant, userId); //创建押金 - buildDeposit(wxMerchant, userId); + wxRentContractService.buildDeposit(wxMerchant, userId); } return new ResultData(Result.SUCCESS, "商户创建成功", merchantId); } catch (Exception e) { @@ -507,165 +511,4 @@ public class WxMerchantServiceImpl implements WxMerchantService { } } - - @Transactional(rollbackFor = {Exception.class}) - public void buildDeposit(WxMerchant wxMerchant, Long userId) { - WxRentContract wxRentContract = new WxRentContract(); - wxRentContract.setMerchantId(wxMerchant.getId()); - List list = wxRentContractMapper.findList(wxRentContract); - if (list.size() > 0) { - wxRentContract = list.get(0); - final IdWorker idWorker = IdWorker.get(); - WxBillDeposit wxBillDeposit = new WxBillDeposit(); - wxBillDeposit.setId(idWorker.nextId()); - wxBillDeposit.setRentContractId(wxRentContract.getId()); - wxBillDeposit.setReceivePay(0); - wxBillDeposit.setPay(0); - int needpay = wxRentContract.getDeposit(); - wxBillDeposit.setNeedPay(needpay); - wxBillDeposit.setOwe(needpay); - - Date date = new Date(); - Calendar instance = Calendar.getInstance(); - instance.setTime(wxRentContract.getRentalStartDate()); - instance.add(Calendar.DAY_OF_MONTH, -1); - Date time = instance.getTime(); - wxBillDeposit.setReceiveDate(time); - - //账单开始时间 - instance.clear(); - instance.setTime(wxBillDeposit.getReceiveDate()); - instance.add(Calendar.DAY_OF_MONTH, 1); - wxBillDeposit.setStarttime(instance.getTime()); - //账单结束时间 - instance.clear(); - instance.setTime(wxBillDeposit.getReceiveDate()); - instance.add(Calendar.MONTH, wxRentContract.getLease()); - wxBillDeposit.setEndtime(instance.getTime()); - - //截止收租日在当前时间之前 - if (wxBillDeposit.getReceiveDate().before(date)) { - long day = (time.getTime() - date.getTime()) / (24 * 60 * 60 * 1000); - wxBillDeposit.setStatus(EnumBillRentStatus.NOT_PAID.getCode()); - wxBillDeposit.setExpiredDay(day); - } else { - wxBillDeposit.setStatus(EnumBillRentStatus.WAIT_PAY.getCode()); - wxBillDeposit.setExpiredDay(0L); - } - - wxBillDeposit.setTenantId(wxMerchant.getTenantId()); - wxBillDeposit.setIsDel(0); - wxBillDeposit.setMerchantId(wxMerchant.getId()); - wxBillDeposit.setUserId(userId); - wxBillDeposit.setShopId(wxRentContract.getShopId()); - wxBillDeposit.setCreatetime(date); - wxBillDeposit.setUpdatetime(date); - try { - wxBillDepositMapper.insertSelective(wxBillDeposit); - } catch (Exception e) { - logger.error("添加押金账单失败,e:" + e.getMessage()); - throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); - } - } - } - - @Transactional(rollbackFor = {Exception.class}) - public void buildRent(WxMerchant wxMerchant, Long userId) { - - WxRentContract wxRentContract = new WxRentContract(); - wxRentContract.setMerchantId(wxMerchant.getId()); - //根据商户ID找出合同 - List list = wxRentContractMapper.findList(wxRentContract); - if (list.size() > 0) { - wxRentContract = list.get(0); - int receivePeriod = wxRentContract.getReceivePeriod().intValue(); - Integer lease = wxRentContract.getLease(); - int extralease = lease % receivePeriod; - int extracount = extralease > 0 ? 1 : 0; - int paycount = lease / receivePeriod + extracount; - int index = paycount - 1; - final IdWorker idWorker = IdWorker.get(); - for (int i = 0; i < paycount; i++) { - WxBillRent wxBillRent = new WxBillRent(); - wxBillRent.setId(idWorker.nextId()); - wxBillRent.setRentContractId(wxRentContract.getId()); - wxBillRent.setReceivePay(0); - wxBillRent.setPay(0); - - Date date = new Date(); - Calendar instance = Calendar.getInstance(); - instance.setTime(wxRentContract.getRentalStartDate()); - instance.add(Calendar.MONTH, receivePeriod * i); - instance.add(Calendar.DAY_OF_MONTH, -1); - Date time = instance.getTime(); - wxBillRent.setReceiveDate(time); - - //账单开始时间 - instance.clear(); - instance.setTime(wxBillRent.getReceiveDate()); - instance.add(Calendar.DAY_OF_MONTH, 1); - wxBillRent.setStarttime(instance.getTime()); - //账单结束时间 - instance.clear(); - instance.setTime(wxBillRent.getStarttime()); - instance.add(Calendar.MONTH, receivePeriod); - instance.add(Calendar.DAY_OF_MONTH, -1); - wxBillRent.setEndtime(instance.getTime()); - int needpay = wxRentContract.getPrice() * receivePeriod; - if (extracount > 0 && i == index) { - //账单开始时间 - instance.clear(); - instance.setTime(wxBillRent.getReceiveDate()); - instance.add(Calendar.DAY_OF_MONTH, 1); - wxBillRent.setStarttime(instance.getTime()); - //账单结束时间 - instance.clear(); - instance.setTime(wxBillRent.getStarttime()); - instance.add(Calendar.MONTH, extralease); - instance.add(Calendar.DAY_OF_MONTH, -1); - wxBillRent.setEndtime(instance.getTime()); - needpay = wxRentContract.getPrice() * extralease; - } - - wxBillRent.setNeedPay(needpay); - wxBillRent.setOwe(needpay); - - //截止收租日在当前时间之前 - if (wxBillRent.getReceiveDate().before(date)) { - long day = (time.getTime() - date.getTime()) / (24 * 60 * 60 * 1000); - wxBillRent.setStatus(EnumBillRentStatus.NOT_PAID.getCode()); - wxBillRent.setExpiredDay(day); - } else {//截止收租日在当前时间之后 - Calendar now = Calendar.getInstance(); - now.add(Calendar.MONTH, receivePeriod); - Date currenttime = now.getTime(); - //当前日期加上周期后小于截止收租日就是没有到期,否则当前待缴 - if (currenttime.before(wxBillRent.getReceiveDate())) { - wxBillRent.setStatus(EnumBillRentStatus.NOT_EXPIRED.getCode()); - wxBillRent.setExpiredDay(0L); - } else { - wxBillRent.setStatus(EnumBillRentStatus.WAIT_PAY.getCode()); - wxBillRent.setExpiredDay(0L); - } - } - - wxBillRent.setTenantId(wxRentContract.getTenantId()); - wxBillRent.setIsDel(0); - wxBillRent.setMerchantId(wxRentContract.getMerchantId()); - wxBillRent.setUserId(userId); - wxBillRent.setShopId(wxRentContract.getShopId()); - wxBillRent.setCreatetime(date); - wxBillRent.setUpdatetime(date); - try { - wxBillRentMapper.insertSelective(wxBillRent); - } catch (Exception e) { - logger.error("添加租赁账单失败,e:" + e.getMessage()); - throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); - } - } - - } - } - - } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index c4c197d0e..421ae8815 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -168,7 +168,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { } wxRentContractMapper.insertSelective(record); //建立账单 - if (record.getMerchantId() != null && record.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) + /*if (record.getMerchantId() != null && record.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) && record.getReceivePeriod() != null && record.getDeposit() > 0 && record.getPrice() > 0) { WxBillRent wxBillRent = new WxBillRent(); wxBillRent.setMerchantId(record.getMerchantId()); @@ -182,7 +182,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { //押金 buildDeposit(wxMerchant, userId); } - } + }*/ } catch (Exception e) { logger.error("保存租赁合同信息失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); @@ -244,7 +244,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { } wxRentContractMapper.updateByPrimaryKeySelective(record); //建立账单 - if (record.getMerchantId() != null && record.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) + /*if (record.getMerchantId() != null && record.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) && record.getReceivePeriod() != null && record.getDeposit() > 0 && record.getPrice() > 0) { WxBillRent wxBillRent = new WxBillRent(); wxBillRent.setMerchantId(record.getMerchantId()); @@ -258,7 +258,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { //押金 buildDeposit(wxMerchant, userId); } - } + }*/ } catch (Exception e) { logger.error("更新租赁合同信息失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); diff --git a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml index 6490b6f97..0ecc8c059 100644 --- a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml @@ -18,11 +18,14 @@ + - `id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`merchant_id`,`user_id`,`shop_id`,`updatetime`,`type` + `id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`, + `tenant_id`,`owe`,`status`,`is_del`,`merchant_id`,`user_id`,`shop_id`,`updatetime`,`type`, + `rent_shop_type` @@ -43,6 +46,7 @@ and `shop_id` = #{shopId} and `updatetime` = #{updatetime} and `type` = #{type} + and `rent_shop_type` = #{rentShopType} and id in @@ -62,7 +66,7 @@ select br.`id`,br.`receive_pay` receivePay,br.`pay`,br.`receive_date` receiveDate, br.`pay_date` payDate,br.`createtime`,br.`expired_day` expiredDay,br.`owe`,br.`status`, m.`name` merchantName,s.shop_number shopNumber,br.`updatetime`, - br.`merchant_id` merchantId,br.shop_id shopId,br.type + br.`merchant_id` merchantId,br.shop_id shopId,br.type,br.`rent_shop_type` rentShopType from wx_bill_daily br left join wx_merchant m on br.merchant_id=m.id left join wx_shop s on br.shop_id=s.id @@ -73,6 +77,8 @@ and br.`status` = #{status} and br.`is_del` = #{isDel} and br.`type` = #{type} + and br.`rent_shop_type` = #{rentShopType} + order by id desc diff --git a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml index f078b3681..4146b5cfa 100644 --- a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml @@ -19,10 +19,14 @@ + + - `id`,`rent_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`need_pay`,`merchant_id`,`user_id`,`shop_id`,`updatetime` + `id`,`rent_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`, + `expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`need_pay`,`merchant_id`,`user_id`,`shop_id`,`updatetime`, + `rent_shop_type` @@ -42,8 +46,10 @@ and `need_pay` = #{needPay} and `merchant_id` = #{merchantId} and `user_id` = #{userId} - and `shop_id` = #{shopId} - and `updatetime` = #{updatetime} + and `shop_id` = #{shopId} + and `updatetime` = #{updatetime} + and `rent_shop_type` = #{rentShopType} + and id in @@ -63,7 +69,7 @@ select br.`id`,br.`receive_pay` receivePay,br.`pay`,br.`receive_date` receiveDate, br.`pay_date` payDate,br.`createtime`,br.`expired_day` expiredDay,br.`owe`,br.`status`, br.`need_pay` needPay,m.`name` merchantName,s.shop_number shopNumber,br.`updatetime`, - br.`merchant_id` merchantId + br.`merchant_id` merchantId,br.`rent_shop_type` rentShopType from wx_bill_rent_deposit br left join wx_merchant m on br.merchant_id=m.id left join wx_shop s on br.shop_id=s.id @@ -73,6 +79,7 @@ and br.`tenant_id` = #{tenantId} and br.`status` = #{status} and br.`is_del` = #{isDel} + and br.`rent_shop_type` = #{rentShopType} order by id desc diff --git a/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml b/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml index d58675583..d0355b255 100644 --- a/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml @@ -19,11 +19,14 @@ + - `id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`merchant_id`,`user_id`,`shop_id`,`updatetime`,`name`,`comments` + `id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`, + `tenant_id`,`owe`,`status`,`is_del`,`merchant_id`,`user_id`,`shop_id`,`updatetime`,`name`,`comments`, + `rent_shop_type` @@ -44,6 +47,7 @@ and `shop_id` = #{shopId} and `updatetime` = #{updatetime} and `name` = #{name} + and `rent_shop_type` = #{rentShopType} and id in @@ -63,7 +67,7 @@ select br.`id`,br.`receive_pay` receivePay,br.`pay`,br.`receive_date` receiveDate, br.`pay_date` payDate,br.`createtime`,br.`expired_day` expiredDay,br.`owe`,br.`status`, m.`name` merchantName,s.shop_number shopNumber,br.`updatetime`, - br.`merchant_id` merchantId,br.shop_id shopId,br.name,br.comments + br.`merchant_id` merchantId,br.shop_id shopId,br.name,br.comments,br.`rent_shop_type` rentShopType from wx_bill_other br left join wx_merchant m on br.merchant_id=m.id left join wx_shop s on br.shop_id=s.id @@ -74,6 +78,8 @@ and br.`status` = #{status} and br.`is_del` = #{isDel} and br.`name` = #{name} + and br.`rent_shop_type` = #{rentShopType} + order by id desc diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml index 778a967ce..1b4dbf6bf 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml @@ -19,10 +19,14 @@ + + - `id`,`property_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`need_pay`,`merchant_id`,`user_id`,`shop_id`,`updatetime` + `id`,`property_contract_id`,`receive_pay`,`pay`,`receive_date`, + `pay_date`,`createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`need_pay`, + `merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type` @@ -42,8 +46,10 @@ and `need_pay` = #{needPay} and `merchant_id` = #{merchantId} and `user_id` = #{userId} - and `shop_id` = #{shopId} - and `updatetime` = #{updatetime} + and `shop_id` = #{shopId} + and `updatetime` = #{updatetime} + and `rent_shop_type` = #{rentShopType} + and id in @@ -62,7 +68,7 @@ select br.`id`,br.`receive_pay` receivePay,br.`pay`,br.`receive_date` receiveDate, br.`pay_date` payDate,br.`createtime`,br.`expired_day` expiredDay,br.`owe`,br.`status`, br.`need_pay` needPay,m.`name` merchantName,s.shop_number shopNumber,br.`updatetime`, - br.`merchant_id` merchantId + br.`merchant_id` merchantId,br.`rent_shop_type` rentShopType from wx_bill_property_deposit br left join wx_merchant m on br.merchant_id=m.id left join wx_shop s on br.shop_id=s.id @@ -72,6 +78,8 @@ and br.`tenant_id` = #{tenantId} and br.`status` = #{status} and br.`is_del` = #{isDel} + and br.`rent_shop_type` = #{rentShopType} + order by id desc diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml index 82a780b93..b86bdc5db 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml @@ -19,10 +19,14 @@ + + - `id`,`property_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`need_pay`,`merchant_id`,`user_id`,`shop_id`,`updatetime` + `id`,`property_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`, + `createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`need_pay`, + `merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type` @@ -42,8 +46,10 @@ and `need_pay` = #{needPay} and `merchant_id` = #{merchantId} and `user_id` = #{userId} - and `shop_id` = #{shopId} - and `updatetime` = #{updatetime} + and `shop_id` = #{shopId} + and `updatetime` = #{updatetime} + and `rent_shop_type` = #{rentShopType} + and id in @@ -62,7 +68,7 @@ select br.`id`,br.`receive_pay` receivePay,br.`pay`,br.`receive_date` receiveDate, br.`pay_date` payDate,br.`createtime`,br.`expired_day` expiredDay,br.`owe`,br.`status`, br.`need_pay` needPay,m.`name` merchantName,s.shop_number shopNumber,br.`updatetime`, - br.`merchant_id` merchantId + br.`merchant_id` merchantId,br.`rent_shop_type` rentShopType from wx_bill_property br left join wx_merchant m on br.merchant_id=m.id left join wx_shop s on br.shop_id=s.id @@ -73,7 +79,8 @@ and br.`status` = #{status} and br.`is_del` = #{isDel} and br.`receive_date` between #{starttime} and #{endtime} - + and br.`rent_shop_type` = #{rentShopType} + order by id desc diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index fb656cde4..7768499c5 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -19,12 +19,15 @@ + - `id`,`rent_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`need_pay`,`merchant_id`,`user_id`,`shop_id`,`updatetime` + `id`,`rent_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`, + `createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`need_pay`, + `merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type` @@ -46,7 +49,7 @@ and `user_id` = #{userId} and `shop_id` = #{shopId} and `updatetime` = #{updatetime} - + and `rent_shop_type` = #{rentShopType} and id in @@ -69,7 +72,7 @@ select br.`id`,br.`receive_pay` receivePay,br.`pay`,br.`receive_date` receiveDate, br.`pay_date` payDate,br.`createtime`,br.`expired_day` expiredDay,br.`owe`,br.`status`, br.`need_pay` needPay,m.`name` merchantName,s.shop_number shopNumber,br.`updatetime`, - br.`merchant_id` merchantId + br.`merchant_id` merchantId,br.`rent_shop_type` rentShopType from wx_bill_rent br left join wx_merchant m on br.merchant_id=m.id left join wx_shop s on br.shop_id=s.id @@ -80,6 +83,8 @@ and br.`status` = #{status} and br.`is_del` = #{isDel} and br.`receive_date` between #{starttime} and #{endtime} + and br.`rent_shop_type` = #{rentShopType} + order by id desc diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index 62cd24b25..35978225a 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -303,6 +303,13 @@ SELECT shop_id FROM wx_rent_contract WHERE tenant_id = #{tenantId} and status!=1 and status!=5 and status!=6 and status!=7 and merchant_id is not null ) + + and s.`type` = #{type} + + + + and s.`point_type` = #{pointType} + order by s.${sortColumns}