From 1379f7f186eae1b526e7e33ef5791f68b59c93f2 Mon Sep 17 00:00:00 2001 From: winter Date: Fri, 2 Aug 2024 13:43:28 +0800 Subject: [PATCH] fix --- .../contract/WxRentContractController.java | 12 --- .../db/migration/V202408000000001.sql | 2 + .../iformall/domain/po/WxRentContract.java | 9 ++- .../service/helper/WxRentContractHelper.java | 81 ++++--------------- .../service/impl/WxBillRentServiceImpl.java | 46 +++++------ .../service/impl/WxBusinessServiceImpl.java | 2 +- .../impl/WxRentContractServiceImpl.java | 11 ++- .../resources/mapper/WxRentContractMapper.xml | 9 ++- 8 files changed, 61 insertions(+), 111 deletions(-) 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 762d34f97..9f99cbba7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -172,9 +172,6 @@ public class WxRentContractController extends WxContractBaseController { logger.debug("[" + getIpAddr() + "] WxRentContractController::add"); Integer contractType = wxRentPropertyContractService.getContractType(wxRentContract.getRentShopType(), wxRentContract.getOperationType(), EnumContractType.RENT.getCode()); wxRentContract.setContractType(contractType); - if(StringUtils.isBlank(wxRentContract.getBusDiscountRatio())){ - wxRentContract.setBusDiscountTime(new Integer(0)); - } //WxMerchant wxMerchant = new WxMerchant(); //wxMerchant.setName(wxRentContract.getMerchantName()); //wxMerchant.setId(wxRentContract.getMerchantId()); @@ -209,9 +206,6 @@ public class WxRentContractController extends WxContractBaseController { @PostMapping("updateMoney") public ResultData updateMoney(@RequestBody WxRentContract wxRentContract) { logger.debug("[" + getIpAddr() + "] WxRentContractController::updateMoney"); - if(StringUtils.isBlank(wxRentContract.getBusDiscountRatio())){ - wxRentContract.setBusDiscountTime(new Integer(0)); - } if (null != wxRentContract.getDecimalSize() && wxRentContract.getDecimalSize() <= 0 ) { wxRentContract.setDecimalSize(Constant.default_short_decimal_size); } @@ -243,9 +237,6 @@ public class WxRentContractController extends WxContractBaseController { @PostMapping("updateFile") public ResultData updateFile(@RequestBody WxRentContract wxRentContract) { logger.debug("[" + getIpAddr() + "] WxRentContractController::updateFile"); - if(StringUtils.isBlank(wxRentContract.getBusDiscountRatio())){ - wxRentContract.setBusDiscountTime(new Integer(0)); - } MallUserInfo user = getUser(); wxRentContract.updateTenantInfo(user); //wxRentContract.setAdjustPeriodHandle(); @@ -292,9 +283,6 @@ public class WxRentContractController extends WxContractBaseController { (cure.getStatus().intValue() == EnumRentContractStatus.PERFORMANCE.getCode().intValue() && (cure.getApplyStatus().intValue()== EnumRentContractAppStatus.REJECT.getCode().intValue() || cure.getApplyStatus().intValue()== EnumRentContractAppStatus.SETBACK.getCode().intValue()))) { - if(StringUtils.isBlank(rentContract.getBusDiscountRatio())){ - rentContract.setBusDiscountTime(new Integer(0)); - } MallUserInfo user = getUser(); rentContract.updateTenantInfo(user); rentContract.setAdjustPeriodHandle(); diff --git a/mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql b/mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql index 3ea04377e..acf71a606 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql @@ -2,3 +2,5 @@ ALTER TABLE wx_rent_contract ADD COLUMN day_price_calcute INT(1) NOT NULL DEFAUL ALTER TABLE wx_rent_contract ADD COLUMN month_average_days INT(2) COMMENT '每月平均天数'; ALTER TABLE wx_property_contract ADD COLUMN day_price_calcute INT(1) NOT NULL DEFAULT 1 COMMENT '每天价格计算规则'; ALTER TABLE wx_property_contract ADD COLUMN month_average_days INT(2) COMMENT '每月平均天数'; +ALTER TABLE wx_rent_contract ADD COLUMN revenue_fixed_rent_price INT(1) NOT NULL DEFAULT 0 COMMENT '联营扣点租金取高租金固定价格'; +ALTER TABLE wx_rent_contract ADD COLUMN revenue_rent_price VARCHAR(30) COMMENT '联营扣点租金取高租金固定价格'; 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 d5d9d978f..572735f2e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -314,6 +314,11 @@ public class WxRentContract extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "保底营业额", name = "revenue") private String revenue; + @io.swagger.annotations.ApiModelProperty(value = "联营扣点租金取高租金价格是否固定", name = "revenueFixedRentPrice") + private Integer revenueFixedRentPrice; + @io.swagger.annotations.ApiModelProperty(value = "联营扣点租金取高租金固定价格", name = "revenueRentPrice") + private String revenueRentPrice; + @io.swagger.annotations.ApiModelProperty(value = "是否设置保底营业额", name = "revenueRatio") private Integer revenueRatio; @@ -414,8 +419,8 @@ public class WxRentContract extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "联营扣点跳点设置", name = "busDiscountRatio") private String busDiscountRatio; - @io.swagger.annotations.ApiModelProperty(value = "联营扣点跳点-时间范围 1年2月3周期", name = "busDiscountTime") - private Integer busDiscountTime; +// @io.swagger.annotations.ApiModelProperty(value = "联营扣点跳点-时间范围 1年2月3周期", name = "busDiscountTime") +// private Integer busDiscountTime; @io.swagger.annotations.ApiModelProperty(value = "查询店铺", name = "queryShopId") @TableField(exist = false) diff --git a/mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java b/mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java index effad485c..138c4ce15 100644 --- a/mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java @@ -121,15 +121,25 @@ public class WxRentContractHelper { return computeRatioByShop(Constant.default_long_decimal_size,rentInfoArray,wxRentContract.getAdjustRatioWay(),priceArr,"adjustRatio"); } - //计算每年租金基数(合铺录入) + //计算每年租金基数值(合铺录入),具体计算在合同创建时,会根据合同的PriceUnit来根据此基数来计算 private static String[] calcuteRentPriceByJoin(WxRentContract wxRentContract) { String adjustRatio = wxRentContract.getAdjustRatio(); List integers = JSONArray.parseArray(adjustRatio, Integer.class); integers.add(0, 0); int size = integers.size(); String[] priceArrs = new String[size]; - priceArrs[0] = wxRentContract.getPrice(); - BigDecimal priceD = new BigDecimal(wxRentContract.getPrice()); + + //如果是联营扣点租金取高,是固定租金 + BigDecimal priceD = null; + if (null != wxRentContract.getRevenueFixedRentPrice() && + wxRentContract.getRevenueFixedRentPrice().intValue() == EnumYesOrNo.YES.getCode()) { + priceArrs[0] = wxRentContract.getRevenueRentPrice(); + priceD = new BigDecimal(wxRentContract.getRevenueRentPrice()); + }else { + priceArrs[0] = wxRentContract.getPrice(); + priceD = new BigDecimal(wxRentContract.getPrice()); + } + //BigDecimal priceD = new BigDecimal(wxRentContract.getPrice()); //联营保底营业额。 String revenueYear = wxRentContract.getRevenueYear(); @@ -157,18 +167,6 @@ public class WxRentContractHelper { } } else if (wxRentContract.getAdjustRatioWay().equals(EnumRentContractAdjustRatioWay.CUSTOM.getCode())){ for (int i = 1; i < size; i++) { - if (wxRentContract.getType().equals(EnumRentContractType.RENT_BY_JOINT.getCode())) { - if (EnumMissTimeType.YEAR.getCode().equals(wxRentContract.getBusDiscountTime())) { - priceArrs[i] = new BigDecimal(integers.get(i)).multiply(new BigDecimal(12)) - .setScale(Constant.default_long_decimal_size, RoundingMode.HALF_UP).toPlainString(); - continue; - } - if (EnumMissTimeType.PERIOD.getCode().equals(wxRentContract.getBusDiscountTime())) { - priceArrs[i] = new BigDecimal(integers.get(i)).multiply(new BigDecimal(wxRentContract.getReceivePeriod())) - .setScale(Constant.default_long_decimal_size, RoundingMode.HALF_UP).toPlainString(); - continue; - } - } priceArrs[i] = new BigDecimal(integers.get(i)).setScale(Constant.default_long_decimal_size, RoundingMode.HALF_UP).toPlainString(); } }else if (wxRentContract.getAdjustRatioWay().equals(EnumRentContractAdjustRatioWay.FIX_RATIO.getCode())){ @@ -180,17 +178,6 @@ public class WxRentContractHelper { }else { _p = priceD.multiply(new BigDecimal(integers.get(i))).divide(new BigDecimal(10000)); } - if (wxRentContract.getType().equals(EnumRentContractType.RENT_BY_JOINT.getCode())) { - if (EnumMissTimeType.YEAR.getCode().equals(wxRentContract.getBusDiscountTime())) { - priceArrs[i] = _p.multiply(new BigDecimal(12)).setScale(Constant.default_long_decimal_size, RoundingMode.HALF_UP).toPlainString(); - continue; - } - if (EnumMissTimeType.PERIOD.getCode().equals(wxRentContract.getBusDiscountTime())) { - priceArrs[i] = _p.multiply(new BigDecimal(wxRentContract.getReceivePeriod())) - .setScale(Constant.default_long_decimal_size, RoundingMode.HALF_UP).toPlainString(); - continue; - } - } priceArrs[i] = _p.setScale(Constant.default_long_decimal_size, RoundingMode.HALF_UP).toPlainString(); } } @@ -244,18 +231,6 @@ public class WxRentContractHelper { } } else if (wxRentContract.getRevenueRatioWay().equals(EnumRentContractAdjustRatioWay.CUSTOM.getCode())){ for (int i = 1; i < size; i++) { - if (wxRentContract.getType().equals(EnumRentContractType.RENT_BY_JOINT.getCode())) { - if (EnumMissTimeType.YEAR.getCode().equals(wxRentContract.getBusDiscountTime())) { - revenuePriceArrs[i] = new BigDecimal(revenueRationSets.get(i)).multiply(new BigDecimal(12)) - .setScale(Constant.default_long_decimal_size, RoundingMode.HALF_UP).toPlainString(); - continue; - } - if (EnumMissTimeType.PERIOD.getCode().equals(wxRentContract.getBusDiscountTime())) { - revenuePriceArrs[i] = new BigDecimal(revenueRationSets.get(i)).multiply(new BigDecimal(wxRentContract.getReceivePeriod())) - .setScale(Constant.default_long_decimal_size, RoundingMode.HALF_UP).toPlainString(); - continue; - } - } revenuePriceArrs[i] = new BigDecimal(revenueRationSets.get(i)) .setScale(Constant.default_long_decimal_size, RoundingMode.HALF_UP).toPlainString(); } @@ -265,18 +240,6 @@ public class WxRentContractHelper { if (revenueYears.size() == size && revenueRationSets.size() == size) { _p = new BigDecimal(revenueRationSets.get(i)).multiply(new BigDecimal(revenueYears.get(i))).divide(new BigDecimal(10000)); } - if (wxRentContract.getType().equals(EnumRentContractType.RENT_BY_JOINT.getCode())) { - if (EnumMissTimeType.YEAR.getCode().equals(wxRentContract.getBusDiscountTime())) { - revenuePriceArrs[i] = _p.multiply(new BigDecimal(12)) - .setScale(Constant.default_long_decimal_size, RoundingMode.HALF_UP).toPlainString(); - continue; - } - if (EnumMissTimeType.PERIOD.getCode().equals(wxRentContract.getBusDiscountTime())) { - revenuePriceArrs[i] = _p.multiply(new BigDecimal(wxRentContract.getReceivePeriod())) - .setScale(Constant.default_long_decimal_size, RoundingMode.HALF_UP).toPlainString(); - continue; - } - } revenuePriceArrs[i] = _p.setScale(Constant.default_long_decimal_size, RoundingMode.HALF_UP).toPlainString(); } } @@ -394,23 +357,11 @@ public class WxRentContractHelper { needpay = new BigDecimal(needpayD).setScale(wxRentContract.getDecimalSize(), RoundingMode.HALF_UP).toPlainString(); }else{ BigDecimal priceD = new BigDecimal(price); - if (EnumRentContractType.RENT_BY_JOINT.getCode().equals(wxRentContract.getType())) { - //设置跳点率为年周期 price不变 - if (EnumMissTimeType.PERIOD.getCode().equals(wxRentContract.getBusDiscountTime())) { - return priceD.toPlainString(); - } - //年或者设置跳点率为年周期 除12 - if (EnumMissTimeType.YEAR.getCode().equals(wxRentContract.getBusDiscountTime())) { - priceD = new BigDecimal(price).divide(new BigDecimal(12),Constant.default_long_decimal_size,RoundingMode.HALF_UP).setScale(Constant.default_long_decimal_size, RoundingMode.HALF_UP); - } - }else{ - //年 除12 - if(EnumPriceUnit.Y.getCode().equals(wxRentContract.getPriceUnit())){ - priceD = new BigDecimal(price).divide(new BigDecimal(12),Constant.default_long_decimal_size,RoundingMode.HALF_UP).setScale(Constant.default_long_decimal_size, RoundingMode.HALF_UP); - } + //年 除12 + if(EnumPriceUnit.Y.getCode().equals(wxRentContract.getPriceUnit())){ + priceD = new BigDecimal(price).divide(new BigDecimal(12),Constant.default_long_decimal_size,RoundingMode.HALF_UP).setScale(Constant.default_long_decimal_size, RoundingMode.HALF_UP); } - //生成金额直接计算 if(!saveDb){ //needpay = new Double(getMonthNeedPay(priceD, startDate, endDate,dayType,receivePeriod,part)).longValue(); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index c96555e65..b51248e85 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -349,29 +349,29 @@ public class WxBillRentServiceImpl extends WxBillBaseService implements WxBillRe ratio = wxRentContract.getPayRatio(); }else{ if(StringUtils.isNotBlank(wxRentContract.getBusDiscountRatio())){ - long dayCount = DateUtils.startToEnd(wxBillRent.getStarttime(),wxBillRent.getEndtime()) + 1; - if(EnumBusRatioTime.YEAR.getCode().equals(wxRentContract.getBusDiscountTime())){ - if(startInt == endInt && months == 12){ - //刚好1年 - ratioVo = WxRentContractServiceImpl.getPayRatio(Constant.default_long_decimal_size,EnumGetRatioFrom.BILL.getCode(), - wxBillRent.getRevenue(),wxRentContract.getBusDiscountRatio(),EnumMissTimeType.OTHER.getCode(),dayCount,0,null); - }else{ - ratioVo = WxRentContractServiceImpl.getPayRatio(Constant.default_long_decimal_size,EnumGetRatioFrom.BILL.getCode(), - wxBillRent.getRevenue(),wxRentContract.getBusDiscountRatio(),EnumMissTimeType.YEAR.getCode(),dayCount,0,null); - } - }else if(EnumBusRatioTime.MONTH.getCode().equals(wxRentContract.getBusDiscountTime())){ - if(startInt == endInt && months == 1){ - //刚好1个月 - ratioVo = WxRentContractServiceImpl.getPayRatio(Constant.default_long_decimal_size,EnumGetRatioFrom.BILL.getCode(), - wxBillRent.getRevenue(),wxRentContract.getBusDiscountRatio(),EnumMissTimeType.OTHER.getCode(),dayCount,0,null); - }else{ - ratioVo = WxRentContractServiceImpl.getPayRatio(Constant.default_long_decimal_size,EnumGetRatioFrom.BILL.getCode(), - wxBillRent.getRevenue(),wxRentContract.getBusDiscountRatio(),EnumMissTimeType.MONTH.getCode(),dayCount,0,null); - } - }else if(EnumBusRatioTime.PERIOD.getCode().equals(wxRentContract.getBusDiscountTime())){ - ratioVo = WxRentContractServiceImpl.getPayRatio(Constant.default_long_decimal_size,EnumGetRatioFrom.BILL.getCode(),wxBillRent.getRevenue(),wxRentContract.getBusDiscountRatio(), - EnumMissTimeType.PERIOD.getCode(),dayCount,wxRentContract.getReceivePeriod(),wxRentContract.getReceivePeriodUnit()); - } +// long dayCount = DateUtils.startToEnd(wxBillRent.getStarttime(),wxBillRent.getEndtime()) + 1; +// if(EnumBusRatioTime.YEAR.getCode().equals(wxRentContract.getBusDiscountTime())){ +// if(startInt == endInt && months == 12){ +// //刚好1年 +// ratioVo = WxRentContractServiceImpl.getPayRatio(Constant.default_long_decimal_size,EnumGetRatioFrom.BILL.getCode(), +// wxBillRent.getRevenue(),wxRentContract.getBusDiscountRatio(),EnumMissTimeType.OTHER.getCode(),dayCount,0,null); +// }else{ +// ratioVo = WxRentContractServiceImpl.getPayRatio(Constant.default_long_decimal_size,EnumGetRatioFrom.BILL.getCode(), +// wxBillRent.getRevenue(),wxRentContract.getBusDiscountRatio(),EnumMissTimeType.YEAR.getCode(),dayCount,0,null); +// } +// }else if(EnumBusRatioTime.MONTH.getCode().equals(wxRentContract.getBusDiscountTime())){ +// if(startInt == endInt && months == 1){ +// //刚好1个月 +// ratioVo = WxRentContractServiceImpl.getPayRatio(Constant.default_long_decimal_size,EnumGetRatioFrom.BILL.getCode(), +// wxBillRent.getRevenue(),wxRentContract.getBusDiscountRatio(),EnumMissTimeType.OTHER.getCode(),dayCount,0,null); +// }else{ +// ratioVo = WxRentContractServiceImpl.getPayRatio(Constant.default_long_decimal_size,EnumGetRatioFrom.BILL.getCode(), +// wxBillRent.getRevenue(),wxRentContract.getBusDiscountRatio(),EnumMissTimeType.MONTH.getCode(),dayCount,0,null); +// } +// }else if(EnumBusRatioTime.PERIOD.getCode().equals(wxRentContract.getBusDiscountTime())){ +// ratioVo = WxRentContractServiceImpl.getPayRatio(Constant.default_long_decimal_size,EnumGetRatioFrom.BILL.getCode(),wxBillRent.getRevenue(),wxRentContract.getBusDiscountRatio(), +// EnumMissTimeType.PERIOD.getCode(),dayCount,wxRentContract.getReceivePeriod(),wxRentContract.getReceivePeriodUnit()); +// } } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java index b076ae172..44e48cb01 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java @@ -139,7 +139,7 @@ public class WxBusinessServiceImpl implements WxBusinessService { Integer priceUnit = dbRent.getPriceUnit(); Integer type = dbRent.getType(); Integer period = dbRent.getReceivePeriod(); - Integer busDiscountTime = dbRent.getBusDiscountTime(); + Integer busDiscountTime = 0; BigDecimal priceDecimal = getPriceDecimal(dbRent.getDecimalSize(),day, price, priceUnit, type, period, busDiscountTime); businessSumMoney = businessSumMoney.add(priceDecimal); } 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 c083e2621..bc2da2314 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -457,7 +457,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { }else{ int dayCount = record.getReceivePeriod() * 30; RatioVo ratioVo = getPayRatio(Constant.default_long_decimal_size,EnumGetRatioFrom.RENT.getCode(),record.getRevenue(),record.getBusDiscountRatio(), - record.getBusDiscountTime(),dayCount,record.getReceivePeriod(),record.getReceivePeriodUnit()); + 0,dayCount,record.getReceivePeriod(),record.getReceivePeriodUnit()); //record.setPayRatio(ratioVo.getRatio()); record.setPrice(ratioVo.getPrice()); } @@ -810,7 +810,6 @@ public class WxRentContractServiceImpl implements WxRentContractService { if (wxRentContract == null) { return new ResultData(ErrorCode.RENT_CONTRACT_IS_NOT_FOUND); } - wxRentContract.setBusDiscountTime(record.getBusDiscountTime()); wxRentContract.setBusDiscountRatio(record.getBusDiscountRatio()); wxRentContract.setPayRatio(record.getPayRatio()); @@ -828,7 +827,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { }else{ int dayCount = record.getReceivePeriod() * 30; RatioVo ratioVo = getPayRatio(Constant.default_long_decimal_size,EnumGetRatioFrom.RENT.getCode(),record.getRevenue(), - record.getBusDiscountRatio(),record.getBusDiscountTime(),dayCount,record.getReceivePeriod(),record.getReceivePeriodUnit()); + record.getBusDiscountRatio(),0,dayCount,record.getReceivePeriod(),record.getReceivePeriodUnit()); //record.setPayRatio(ratioVo.getRatio()); record.setPrice(ratioVo.getPrice()); } @@ -1209,7 +1208,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { Date startDate = wxRentContract.getStartDate(); rentList = buildRentJinmao(user, wxRentContract, receivePeriod, lease, startDate, price, isPreview,saveDb); }else{ - rentList = buildRentMonth(user, wxRentContract, receivePeriod, lease, rentalStartDate, price, isPreview,saveDb); + rentList = buildRentMonth(user, wxRentContract, receivePeriod, lease, rentalStartDate, isPreview,saveDb); } } for (int i = 0; i < rentList.size(); i++) { @@ -1220,7 +1219,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { - public List buildRentMonth(MallUserInfo user, WxRentContract wxRentContract, int receivePeriod, Integer lease, Date rentalStartDate, String price, Integer isPreview, boolean saveDb) { + public List buildRentMonth(MallUserInfo user, WxRentContract wxRentContract, int receivePeriod, Integer lease, Date rentalStartDate,Integer isPreview, boolean saveDb) { int years = 0; //计算租金每年的计费基数 String[] priceArrs = WxRentContractHelper.calcuteRentPrice(wxRentContract); @@ -1572,7 +1571,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { } }else{ if(billTimeVo.getStartDate().before(endDate)){ - if (EnumRentContractType.RENT_BY_JOINT.getCode().equals(wxRentContract.getType()) && EnumMissTimeType.PERIOD.getCode().equals(wxRentContract.getBusDiscountTime())) { + if (EnumRentContractType.RENT_BY_JOINT.getCode().equals(wxRentContract.getType()) && EnumMissTimeType.PERIOD.getCode().equals(0)) { //设置跳点率为年周期 price不变 needpayFront = priceArrs[index - 1]; if (null != bussinessManagerPriceArrs && bussinessManagerPriceArrs.length > 0) { diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 2b778ee86..e76a2fb90 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -130,6 +130,8 @@ + + @@ -142,7 +144,7 @@ `deposit`,cashtype_content_lsit,cashtype_lsit,`pay_date`,`is_del`,`merchant_name`, `brand`,`business_id`,`shop_type`,`shop_type_str`,`updatetime`,`createtime`,`link_person`,`link_phone`,`link_address`, `pay_account`,`filename`,`lease`,`type`,`revenue`,`revenue_ratio`,`revenue_year`,`revenue_ratio_way`,`revenue_ratio_set`,`adjust_ratio`,`adjust_period`,`pay_ratio`, - `start_date`,`end_date`,`shop_name`,`from_id`,`end_contract_time`, + `start_date`,`end_date`,`shop_name`,`from_id`,`end_contract_time`,`revenue_fixed_rent_price`,`revenue_rent_price`, `apply_status`,`bank_name`,`rent_shop_type`,`fix_start_date`,`fix_end_date`, `business_type`,`rent_info`, `file_names`,price_unit,rent_price,other_rent_price_info,`subject_name`,rent_start_type, `rent_input_way`,`adjust_ratio_way`,`operation_type`,late_pay_ratio,late_pay_day,bus_discount_ratio,bus_discount_time, @@ -195,6 +197,7 @@ and json_contains(json_extract(rent_info,'$[*].id'),concat('"',#{queryShopId},'"')) and `day_price_calcute` = #{dayPriceCalcute} and `month_average_days` = #{monthAverageDays} + and `revenue_fixed_rent_price` = #{revenueFixedRentPrice} and shop_name like concat('%',#{shopNumber},'%') @@ -378,12 +381,14 @@ + +