| @@ -326,6 +326,11 @@ public class WxRentContractController extends BaseController { | |||||
| if(StringUtils.isNotBlank(payAccountBill.getBankAccountName()) && StringUtils.isNotBlank(payAccountBill.getBankCardId())) { | if(StringUtils.isNotBlank(payAccountBill.getBankAccountName()) && StringUtils.isNotBlank(payAccountBill.getBankCardId())) { | ||||
| map.put("bankAccountName", payAccountBill.getBankAccountName()); | map.put("bankAccountName", payAccountBill.getBankAccountName()); | ||||
| map.put("bankCardId", payAccountBill.getBankCardId()); | map.put("bankCardId", payAccountBill.getBankCardId()); | ||||
| if(payAccountBill.getServiceChargeRate() == null){ | |||||
| map.put("serviceChargeRate", "0"); | |||||
| }else{ | |||||
| map.put("serviceChargeRate", payAccountBill.getServiceChargeRate()+""); | |||||
| } | |||||
| } | } | ||||
| return new ResultData(map); | return new ResultData(map); | ||||
| } | } | ||||
| @@ -110,7 +110,6 @@ public class WxBillDaily extends BaseEntity { | |||||
| private Integer buildWay; | private Integer buildWay; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "手续费", name = "serviceChargePay") | @io.swagger.annotations.ApiModelProperty(value = "手续费", name = "serviceChargePay") | ||||
| @TableField(exist = false) | |||||
| private Integer serviceChargePay; | private Integer serviceChargePay; | ||||
| @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="realReceivePay") | @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="realReceivePay") | ||||
| @@ -78,7 +78,6 @@ public class WxBillDeposit extends BaseEntity { | |||||
| private Integer freeze; | private Integer freeze; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "手续费", name = "serviceChargePay") | @io.swagger.annotations.ApiModelProperty(value = "手续费", name = "serviceChargePay") | ||||
| @TableField(exist = false) | |||||
| private Integer serviceChargePay; | private Integer serviceChargePay; | ||||
| @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="realReceivePay") | @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="realReceivePay") | ||||
| @@ -132,7 +132,6 @@ public class WxBillOther extends BaseEntity { | |||||
| private Integer freeze; | private Integer freeze; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "手续费", name = "serviceChargePay") | @io.swagger.annotations.ApiModelProperty(value = "手续费", name = "serviceChargePay") | ||||
| @TableField(exist = false) | |||||
| private Integer serviceChargePay; | private Integer serviceChargePay; | ||||
| @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="realReceivePay") | @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="realReceivePay") | ||||
| @@ -141,7 +141,6 @@ public class WxBillOtherDeposit extends BaseEntity { | |||||
| private Integer freeze; | private Integer freeze; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "手续费", name = "serviceChargePay") | @io.swagger.annotations.ApiModelProperty(value = "手续费", name = "serviceChargePay") | ||||
| @TableField(exist = false) | |||||
| private Integer serviceChargePay; | private Integer serviceChargePay; | ||||
| @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="realReceivePay") | @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="realReceivePay") | ||||
| @@ -186,10 +186,14 @@ public class WxBillProperty extends BaseEntity { | |||||
| private Integer freeze; | private Integer freeze; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "手续费", name = "serviceChargePay") | @io.swagger.annotations.ApiModelProperty(value = "手续费", name = "serviceChargePay") | ||||
| @TableField(exist = false) | |||||
| private Integer serviceChargePay; | private Integer serviceChargePay; | ||||
| @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="realReceivePay") | @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="realReceivePay") | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private Long realReceivePay; | private Long realReceivePay; | ||||
| @TableField(exist = false) | |||||
| private String serviceChargePayBefore; | |||||
| @TableField(exist = false) | |||||
| private String serviceChargePayUpdate; | |||||
| } | } | ||||
| @@ -76,7 +76,6 @@ public class WxBillPropertyDeposit extends BaseEntity { | |||||
| private Integer freeze; | private Integer freeze; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "手续费", name = "serviceChargePay") | @io.swagger.annotations.ApiModelProperty(value = "手续费", name = "serviceChargePay") | ||||
| @TableField(exist = false) | |||||
| private Integer serviceChargePay; | private Integer serviceChargePay; | ||||
| @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="realReceivePay") | @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="realReceivePay") | ||||
| @@ -197,11 +197,14 @@ public class WxBillRent extends BaseEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value = "联营租金", name = "joinRentPrice") | @io.swagger.annotations.ApiModelProperty(value = "联营租金", name = "joinRentPrice") | ||||
| private Long joinRentPrice; | private Long joinRentPrice; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "手续费", name = "serviceChargePay") | @io.swagger.annotations.ApiModelProperty(value = "手续费", name = "serviceChargePay") | ||||
| @TableField(exist = false) | |||||
| private Integer serviceChargePay; | private Integer serviceChargePay; | ||||
| @TableField(exist = false) | |||||
| private String serviceChargePayBefore; | |||||
| @TableField(exist = false) | |||||
| private String serviceChargePayUpdate; | |||||
| @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="realReceivePay") | @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="realReceivePay") | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private Long realReceivePay; | private Long realReceivePay; | ||||
| @@ -14,7 +14,8 @@ public enum EnumBillAction { | |||||
| DEPOSIT_MODIFY(6, "押金变更"), | DEPOSIT_MODIFY(6, "押金变更"), | ||||
| IMPORT_PAY(6, "导入缴费"), | IMPORT_PAY(6, "导入缴费"), | ||||
| UPDATE_LATE_PAY_MONEY(7, "滞纳金变更"), | UPDATE_LATE_PAY_MONEY(7, "滞纳金变更"), | ||||
| UPDATE_SETTLE_MONEY(8, "结算单清算"); | |||||
| UPDATE_SETTLE_MONEY(8, "结算单清算"), | |||||
| UPDATE_SERVICE_MONEY(9, "手续费变更"); | |||||
| public static EnumBillAction getEnum(Integer code) { | public static EnumBillAction getEnum(Integer code) { | ||||
| for (EnumBillAction value : values()) { | for (EnumBillAction value : values()) { | ||||
| @@ -67,7 +67,12 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { | |||||
| //手续费 = 合同应收+手续费+滞纳金 | //手续费 = 合同应收+手续费+滞纳金 | ||||
| if(e.getReceivePay() != null){ | if(e.getReceivePay() != null){ | ||||
| if(e.getLatePayPrice() == null) e.setLatePayPrice(0l); | if(e.getLatePayPrice() == null) e.setLatePayPrice(0l); | ||||
| BigDecimal servicePay = new BigDecimal(e.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP); | |||||
| BigDecimal servicePay; | |||||
| if(e.getServiceChargePay() != null){ | |||||
| servicePay = new BigDecimal(e.getServiceChargePay()); | |||||
| }else{ | |||||
| servicePay = new BigDecimal(e.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP); | |||||
| } | |||||
| Long realReceivePay = servicePay.longValue() + e.getLatePayPrice() + e.getReceivePay(); | Long realReceivePay = servicePay.longValue() + e.getLatePayPrice() + e.getReceivePay(); | ||||
| e.setRealReceivePay(realReceivePay); | e.setRealReceivePay(realReceivePay); | ||||
| e.setServiceChargePay(servicePay.intValue()); | e.setServiceChargePay(servicePay.intValue()); | ||||
| @@ -57,7 +57,12 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { | |||||
| //手续费 = 合同应收+手续费+滞纳金 | //手续费 = 合同应收+手续费+滞纳金 | ||||
| if(e.get("receivePay") != null){ | if(e.get("receivePay") != null){ | ||||
| Long receivePayB = (Long)e.get("receivePay"); | Long receivePayB = (Long)e.get("receivePay"); | ||||
| BigDecimal servicePay = new BigDecimal(receivePayB).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP); | |||||
| BigDecimal servicePay; | |||||
| if(e.get("serviceChargePay") != null){ | |||||
| servicePay = new BigDecimal((Long)e.get("serviceChargePay")); | |||||
| }else{ | |||||
| servicePay = new BigDecimal(receivePayB).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP); | |||||
| } | |||||
| Long realReceivePay = servicePay.longValue() + receivePayB; | Long realReceivePay = servicePay.longValue() + receivePayB; | ||||
| e.put("realReceivePay",realReceivePay); | e.put("realReceivePay",realReceivePay); | ||||
| e.put("serviceChargePay",servicePay.intValue()); | e.put("serviceChargePay",servicePay.intValue()); | ||||
| @@ -61,7 +61,12 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService | |||||
| //手续费 = 合同应收+手续费+滞纳金 | //手续费 = 合同应收+手续费+滞纳金 | ||||
| if(e.getReceivePay() != null){ | if(e.getReceivePay() != null){ | ||||
| if(e.getLatePayPrice() == null) e.setLatePayPrice(0l); | if(e.getLatePayPrice() == null) e.setLatePayPrice(0l); | ||||
| BigDecimal servicePay = new BigDecimal(e.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP); | |||||
| BigDecimal servicePay; | |||||
| if(e.getServiceChargePay() != null){ | |||||
| servicePay = new BigDecimal(e.getServiceChargePay()); | |||||
| }else{ | |||||
| servicePay = new BigDecimal(e.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP); | |||||
| } | |||||
| Long realReceivePay = servicePay.longValue() + e.getLatePayPrice() + e.getReceivePay(); | Long realReceivePay = servicePay.longValue() + e.getLatePayPrice() + e.getReceivePay(); | ||||
| e.setRealReceivePay(realReceivePay); | e.setRealReceivePay(realReceivePay); | ||||
| e.setServiceChargePay(servicePay.intValue()); | e.setServiceChargePay(servicePay.intValue()); | ||||
| @@ -61,7 +61,12 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { | |||||
| //手续费 = 合同应收+手续费+滞纳金 | //手续费 = 合同应收+手续费+滞纳金 | ||||
| if(e.getReceivePay() != null){ | if(e.getReceivePay() != null){ | ||||
| if(e.getLatePayPrice() == null) e.setLatePayPrice(0l); | if(e.getLatePayPrice() == null) e.setLatePayPrice(0l); | ||||
| BigDecimal servicePay = new BigDecimal(e.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP); | |||||
| BigDecimal servicePay; | |||||
| if(e.getServiceChargePay() != null){ | |||||
| servicePay = new BigDecimal(e.getServiceChargePay()); | |||||
| }else{ | |||||
| servicePay = new BigDecimal(e.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP); | |||||
| } | |||||
| Long realReceivePay = servicePay.longValue() + e.getLatePayPrice() + e.getReceivePay(); | Long realReceivePay = servicePay.longValue() + e.getLatePayPrice() + e.getReceivePay(); | ||||
| e.setRealReceivePay(realReceivePay); | e.setRealReceivePay(realReceivePay); | ||||
| e.setServiceChargePay(servicePay.intValue()); | e.setServiceChargePay(servicePay.intValue()); | ||||
| @@ -55,7 +55,12 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe | |||||
| //手续费 = 合同应收+手续费+滞纳金 | //手续费 = 合同应收+手续费+滞纳金 | ||||
| if(e.get("receivePay") != null){ | if(e.get("receivePay") != null){ | ||||
| Long receivePayB = (Long)e.get("receivePay"); | Long receivePayB = (Long)e.get("receivePay"); | ||||
| BigDecimal servicePay = new BigDecimal(receivePayB).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP); | |||||
| BigDecimal servicePay; | |||||
| if(e.get("serviceChargePay") != null){ | |||||
| servicePay = new BigDecimal((Long)e.get("serviceChargePay")); | |||||
| }else{ | |||||
| servicePay = new BigDecimal(receivePayB).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP); | |||||
| } | |||||
| Long realReceivePay = servicePay.longValue() + receivePayB; | Long realReceivePay = servicePay.longValue() + receivePayB; | ||||
| e.put("realReceivePay",realReceivePay); | e.put("realReceivePay",realReceivePay); | ||||
| e.put("serviceChargePay",servicePay.intValue()); | e.put("serviceChargePay",servicePay.intValue()); | ||||
| @@ -66,7 +66,12 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { | |||||
| //手续费 = 合同应收+手续费+滞纳金 | //手续费 = 合同应收+手续费+滞纳金 | ||||
| if(e.getReceivePay() != null){ | if(e.getReceivePay() != null){ | ||||
| if(e.getLatePayPrice() == null) e.setLatePayPrice(0l); | if(e.getLatePayPrice() == null) e.setLatePayPrice(0l); | ||||
| BigDecimal servicePay = new BigDecimal(e.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP); | |||||
| BigDecimal servicePay; | |||||
| if(e.getServiceChargePay() != null){ | |||||
| servicePay = new BigDecimal(e.getServiceChargePay()); | |||||
| }else{ | |||||
| servicePay = new BigDecimal(e.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP); | |||||
| } | |||||
| Long realReceivePay = servicePay.longValue() + e.getLatePayPrice() + e.getReceivePay(); | Long realReceivePay = servicePay.longValue() + e.getLatePayPrice() + e.getReceivePay(); | ||||
| e.setRealReceivePay(realReceivePay); | e.setRealReceivePay(realReceivePay); | ||||
| e.setServiceChargePay(servicePay.intValue()); | e.setServiceChargePay(servicePay.intValue()); | ||||
| @@ -309,6 +314,9 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { | |||||
| if(record.getLatePayMoneyUpdate() != null) { | if(record.getLatePayMoneyUpdate() != null) { | ||||
| record.setLatePayPrice(Long.parseLong(record.getLatePayMoneyUpdate()) * 100); | record.setLatePayPrice(Long.parseLong(record.getLatePayMoneyUpdate()) * 100); | ||||
| } | } | ||||
| if(record.getServiceChargePay() != null) { | |||||
| record.setServiceChargePay(record.getServiceChargePay() * 100); | |||||
| } | |||||
| wxBillPropertyMapper.updateById(record); | wxBillPropertyMapper.updateById(record); | ||||
| final IdWorker idWorker = IdWorker.get(); | final IdWorker idWorker = IdWorker.get(); | ||||
| @@ -321,6 +329,19 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { | |||||
| billAction.setDetails(record.getLatePayMoneyBefore()+"元变更为" +record.getLatePayMoneyUpdate()+"元"); | billAction.setDetails(record.getLatePayMoneyBefore()+"元变更为" +record.getLatePayMoneyUpdate()+"元"); | ||||
| billAction.setUpdatetime(new Date()); | billAction.setUpdatetime(new Date()); | ||||
| wxBillActionMapper.insert(billAction); | wxBillActionMapper.insert(billAction); | ||||
| if(record.getServiceChargePay() != null) { | |||||
| billAction = new WxBillAction(); | |||||
| billAction.setId(idWorker.nextId()); | |||||
| billAction.setCreatetime(new Date()); | |||||
| billAction.setUserName("系统端"); | |||||
| billAction.setAction(EnumBillAction.UPDATE_SERVICE_MONEY.getCode()); | |||||
| billAction.setBillId(record.getId()); | |||||
| billAction.setDetails(record.getServiceChargePayBefore()+"元变更为" +record.getServiceChargePayUpdate()+"元"); | |||||
| billAction.setUpdatetime(new Date()); | |||||
| wxBillActionMapper.insert(billAction); | |||||
| } | |||||
| return new ResultData(); | return new ResultData(); | ||||
| } | } | ||||
| } | } | ||||
| @@ -70,7 +70,12 @@ public class WxBillRentServiceImpl implements WxBillRentService { | |||||
| //手续费 = 合同应收+手续费+滞纳金 | //手续费 = 合同应收+手续费+滞纳金 | ||||
| if(e.getReceivePay() != null){ | if(e.getReceivePay() != null){ | ||||
| if(e.getLatePayPrice() == null) e.setLatePayPrice(0l); | if(e.getLatePayPrice() == null) e.setLatePayPrice(0l); | ||||
| BigDecimal servicePay = new BigDecimal(e.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP); | |||||
| BigDecimal servicePay; | |||||
| if(e.getServiceChargePay() != null){ | |||||
| servicePay = new BigDecimal(e.getServiceChargePay()); | |||||
| }else{ | |||||
| servicePay = new BigDecimal(e.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP); | |||||
| } | |||||
| Long realReceivePay = servicePay.longValue() + e.getLatePayPrice() + e.getReceivePay(); | Long realReceivePay = servicePay.longValue() + e.getLatePayPrice() + e.getReceivePay(); | ||||
| e.setRealReceivePay(realReceivePay); | e.setRealReceivePay(realReceivePay); | ||||
| e.setServiceChargePay(servicePay.intValue()); | e.setServiceChargePay(servicePay.intValue()); | ||||
| @@ -423,9 +428,12 @@ public class WxBillRentServiceImpl implements WxBillRentService { | |||||
| if(record.getLatePayMoneyUpdate() != null) { | if(record.getLatePayMoneyUpdate() != null) { | ||||
| record.setLatePayPrice(Long.parseLong(record.getLatePayMoneyUpdate()) * 100); | record.setLatePayPrice(Long.parseLong(record.getLatePayMoneyUpdate()) * 100); | ||||
| } | } | ||||
| if(record.getServiceChargePay() != null) { | |||||
| record.setServiceChargePay(record.getServiceChargePay() * 100); | |||||
| } | |||||
| wxBillRentMapper.updateById(record); | wxBillRentMapper.updateById(record); | ||||
| final IdWorker idWorker = IdWorker.get(); | final IdWorker idWorker = IdWorker.get(); | ||||
| WxBillAction billAction = new WxBillAction(); | WxBillAction billAction = new WxBillAction(); | ||||
| billAction.setId(idWorker.nextId()); | billAction.setId(idWorker.nextId()); | ||||
| billAction.setCreatetime(new Date()); | billAction.setCreatetime(new Date()); | ||||
| @@ -435,6 +443,18 @@ public class WxBillRentServiceImpl implements WxBillRentService { | |||||
| billAction.setDetails(record.getLatePayMoneyBefore()+"元变更为" +record.getLatePayMoneyUpdate()+"元"); | billAction.setDetails(record.getLatePayMoneyBefore()+"元变更为" +record.getLatePayMoneyUpdate()+"元"); | ||||
| billAction.setUpdatetime(new Date()); | billAction.setUpdatetime(new Date()); | ||||
| wxBillActionMapper.insert(billAction); | wxBillActionMapper.insert(billAction); | ||||
| if(record.getServiceChargePay() != null) { | |||||
| billAction = new WxBillAction(); | |||||
| billAction.setId(idWorker.nextId()); | |||||
| billAction.setCreatetime(new Date()); | |||||
| billAction.setUserName("系统端"); | |||||
| billAction.setAction(EnumBillAction.UPDATE_SERVICE_MONEY.getCode()); | |||||
| billAction.setBillId(record.getId()); | |||||
| billAction.setDetails(record.getServiceChargePayBefore()+"元变更为" +record.getServiceChargePayUpdate()+"元"); | |||||
| billAction.setUpdatetime(new Date()); | |||||
| wxBillActionMapper.insert(billAction); | |||||
| } | |||||
| return new ResultData(); | return new ResultData(); | ||||
| } | } | ||||
| } | } | ||||
| @@ -28,13 +28,13 @@ | |||||
| <result column="endtime" property="endtime"/> | <result column="endtime" property="endtime"/> | ||||
| <result column="freeze" property="freeze"/> | <result column="freeze" property="freeze"/> | ||||
| <result column="build_way" property="buildWay"/> | <result column="build_way" property="buildWay"/> | ||||
| <result column="service_charge_pay" property="serviceChargePay"/> | |||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`, | `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`, | `tenant_id`,`owe`,`status`,`is_del`,`merchant_id`,`user_id`,`shop_id`,`updatetime`,`type`, | ||||
| `rent_shop_type`,`pay_way`,`price_detail`,`starttime`,`endtime`,freeze,build_way | |||||
| `rent_shop_type`,`pay_way`,`price_detail`,`starttime`,`endtime`,freeze,build_way,service_charge_pay | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||
| @@ -77,7 +77,7 @@ | |||||
| select br.`id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day` , | select br.`id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day` , | ||||
| case when br.status=1 then br.owe else 0 end owe,br.`status`,m.`name` merchant_name,s.shop_number, | case when br.status=1 then br.owe else 0 end owe,br.`status`,m.`name` merchant_name,s.shop_number, | ||||
| br.`updatetime`,br.`merchant_id`,br.shop_id,br.type,br.`rent_shop_type`,br.pay_way,br.price_detail, | br.`updatetime`,br.`merchant_id`,br.shop_id,br.type,br.`rent_shop_type`,br.pay_way,br.price_detail, | ||||
| br.`starttime`,br.`endtime`,br.`build_way`,br.freeze | |||||
| br.`starttime`,br.`endtime`,br.`build_way`,br.freeze,br.service_charge_pay | |||||
| from wx_bill_daily br left join wx_merchant m on br.merchant_id=m.id | 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 | left join wx_shop s on br.shop_id=s.id | ||||
| <where> | <where> | ||||
| @@ -22,13 +22,13 @@ | |||||
| <result column="rent_shop_type" jdbcType="INTEGER" property="rentShopType"/> | <result column="rent_shop_type" jdbcType="INTEGER" property="rentShopType"/> | ||||
| <result column="return_price" jdbcType="BIGINT" property="returnPrice"/> | <result column="return_price" jdbcType="BIGINT" property="returnPrice"/> | ||||
| <result column="pay_way" jdbcType="INTEGER" property="payWay"/> | <result column="pay_way" jdbcType="INTEGER" property="payWay"/> | ||||
| <result column="service_charge_pay" property="serviceChargePay"/> | |||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `id`,`rent_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`, | `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`, | `expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`need_pay`,`merchant_id`,`user_id`,`shop_id`,`updatetime`, | ||||
| `rent_shop_type`,`return_price`,`pay_way` | |||||
| `rent_shop_type`,`return_price`,`pay_way`,service_charge_pay | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||
| @@ -67,13 +67,12 @@ | |||||
| <include refid="dynamicWhereConditions" /> | <include refid="dynamicWhereConditions" /> | ||||
| </select> | </select> | ||||
| <select id="queryBillDepositList" parameterType="com.iformall.domain.po.WxRentContract" resultType="hashmap"> | <select id="queryBillDepositList" parameterType="com.iformall.domain.po.WxRentContract" resultType="hashmap"> | ||||
| select br.`id`,br.`receive_pay` receivePay,br.`pay`,br.`receive_date` receiveDate, | 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.`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.`need_pay` needPay,m.`name` merchantName,s.shop_number shopNumber,br.`updatetime`, | ||||
| br.`merchant_id` merchantId,br.`rent_shop_type` rentShopType,br.`return_price` returnPrice, | br.`merchant_id` merchantId,br.`rent_shop_type` rentShopType,br.`return_price` returnPrice, | ||||
| br.pay_way payWay,br.shop_info shopInfo,br.freeze | |||||
| br.pay_way payWay,br.shop_info shopInfo,br.freeze,br.service_charge_pay serviceChargePay | |||||
| from wx_bill_rent_deposit br left join wx_merchant m on br.merchant_id=m.id | 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 | left join wx_shop s on br.shop_id=s.id | ||||
| <where> | <where> | ||||
| @@ -28,13 +28,13 @@ | |||||
| <result column="starttime" property="starttime"/> | <result column="starttime" property="starttime"/> | ||||
| <result column="endtime" property="endtime"/> | <result column="endtime" property="endtime"/> | ||||
| <result column="freeze" property="freeze"/> | <result column="freeze" property="freeze"/> | ||||
| <result column="service_charge_pay" property="serviceChargePay"/> | |||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`, | `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`, | `tenant_id`,`owe`,`status`,`is_del`,`merchant_id`,`user_id`,`shop_id`,`updatetime`,`name`,`comments`, | ||||
| `rent_shop_type`,`return_price`,`pay_way`,`starttime`,`endtime`,freeze | |||||
| `rent_shop_type`,`return_price`,`pay_way`,`starttime`,`endtime`,freeze,service_charge_pay | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||
| @@ -79,7 +79,7 @@ | |||||
| <select id="queryBillList" parameterType="com.iformall.domain.po.WxBillOtherDeposit" resultMap="BaseResultMap"> | <select id="queryBillList" parameterType="com.iformall.domain.po.WxBillOtherDeposit" resultMap="BaseResultMap"> | ||||
| select br.`id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day`, | select br.`id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day`, | ||||
| br.`owe`,br.`status`,m.`name` merchant_name,s.shop_number,br.`updatetime`,br.`return_price`,br.`merchant_id`, | br.`owe`,br.`status`,m.`name` merchant_name,s.shop_number,br.`updatetime`,br.`return_price`,br.`merchant_id`, | ||||
| br.shop_id,br.name,br.comments,br.`rent_shop_type`,br.pay_way,br.`starttime`,br.`endtime`,br.freeze | |||||
| br.shop_id,br.name,br.comments,br.`rent_shop_type`,br.pay_way,br.`starttime`,br.`endtime`,br.freeze,br.service_charge_pay | |||||
| from wx_bill_other_deposit br left join wx_merchant m on br.merchant_id=m.id | from wx_bill_other_deposit br left join wx_merchant m on br.merchant_id=m.id | ||||
| left join wx_shop s on br.shop_id=s.id | left join wx_shop s on br.shop_id=s.id | ||||
| <where> | <where> | ||||
| @@ -27,13 +27,13 @@ | |||||
| <result column="starttime" property="starttime"/> | <result column="starttime" property="starttime"/> | ||||
| <result column="endtime" property="endtime"/> | <result column="endtime" property="endtime"/> | ||||
| <result column="freeze" property="freeze"/> | <result column="freeze" property="freeze"/> | ||||
| <result column="service_charge_pay" property="serviceChargePay"/> | |||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`, | `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`, | `tenant_id`,`owe`,`status`,`is_del`,`merchant_id`,`user_id`,`shop_id`,`updatetime`,`name`,`comments`, | ||||
| `rent_shop_type`,`pay_way`,`starttime`,`endtime`,endtime | |||||
| `rent_shop_type`,`pay_way`,`starttime`,`endtime`,endtime,service_charge_pay | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||
| @@ -75,7 +75,8 @@ | |||||
| select br.`id`,br.`receive_pay`,br.`pay`,br.`receive_date`, br.`pay_date`,br.`createtime`,br.`expired_day`, | select br.`id`,br.`receive_pay`,br.`pay`,br.`receive_date`, br.`pay_date`,br.`createtime`,br.`expired_day`, | ||||
| case when br.status=1 then br.owe else 0 end owe,br.`status`,m.`name` | case when br.status=1 then br.owe else 0 end owe,br.`status`,m.`name` | ||||
| merchant_name,s.shop_number,br.`updatetime`, | merchant_name,s.shop_number,br.`updatetime`, | ||||
| br.`merchant_id`,br.shop_id,br.name,br.comments,br.`rent_shop_type`,br.pay_way,br.`starttime`,br.`endtime`,br.freeze | |||||
| br.`merchant_id`,br.shop_id,br.name,br.comments,br.`rent_shop_type`,br.pay_way, | |||||
| br.`starttime`,br.`endtime`,br.freeze,br.service_charge_pay | |||||
| from wx_bill_other br left join wx_merchant m on br.merchant_id=m.id | 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 | left join wx_shop s on br.shop_id=s.id | ||||
| <where> | <where> | ||||
| @@ -24,12 +24,13 @@ | |||||
| <result column="shop_info" jdbcType="VARCHAR" property="shopInfo"/> | <result column="shop_info" jdbcType="VARCHAR" property="shopInfo"/> | ||||
| <result column="pay_way" jdbcType="INTEGER" property="payWay"/> | <result column="pay_way" jdbcType="INTEGER" property="payWay"/> | ||||
| <result column="freeze" property="freeze"/> | <result column="freeze" property="freeze"/> | ||||
| <result column="service_charge_pay" property="serviceChargePay"/> | |||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `id`,`property_contract_id`,`receive_pay`,`pay`,`receive_date`, | `id`,`property_contract_id`,`receive_pay`,`pay`,`receive_date`, | ||||
| `pay_date`,`createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`need_pay`, | `pay_date`,`createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`need_pay`, | ||||
| `merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,`return_price`,`shop_info`,`pay_way`,freeze | |||||
| `merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,`return_price`,`shop_info`,`pay_way`,freeze,service_charge_pay | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||
| @@ -73,7 +74,7 @@ | |||||
| br.`pay_date` payDate,br.`createtime`,br.`expired_day` expiredDay,br.`owe`,br.`status`, | 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.`need_pay` needPay,m.`name` merchantName,s.shop_number shopNumber,br.`updatetime`, | ||||
| br.`merchant_id` merchantId,br.`rent_shop_type` rentShopType,br.`return_price` returnPrice,br.`shop_info` | br.`merchant_id` merchantId,br.`rent_shop_type` rentShopType,br.`return_price` returnPrice,br.`shop_info` | ||||
| shopInfo,br.pay_way payWay,br.pay_way payWay,br.freeze | |||||
| shopInfo,br.pay_way payWay,br.pay_way payWay,br.freeze,br.service_charge_pay serviceChargePay | |||||
| from wx_bill_property_deposit br left join wx_merchant m on br.merchant_id=m.id | 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 | left join wx_shop s on br.shop_id=s.id | ||||
| <where> | <where> | ||||
| @@ -41,6 +41,7 @@ | |||||
| <result column="late_pay_day" property="latePayDay"/> | <result column="late_pay_day" property="latePayDay"/> | ||||
| <result column="late_pay_ratio" property="latePayRatio"/> | <result column="late_pay_ratio" property="latePayRatio"/> | ||||
| <result column="freeze" property="freeze"/> | <result column="freeze" property="freeze"/> | ||||
| <result column="service_charge_pay" property="serviceChargePay"/> | |||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| @@ -48,7 +49,7 @@ | |||||
| `createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`need_pay`, | `createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`need_pay`, | ||||
| `merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`, | `merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`, | ||||
| `revenue`,`late_pay_ratio`,`late_pay_time`,`late_pay_price`,`period`,`is_preview`,`shop_info`, | `revenue`,`late_pay_ratio`,`late_pay_time`,`late_pay_price`,`period`,`is_preview`,`shop_info`, | ||||
| `pay_way`,`late_pay_status`,`comments`,starttime,endtime,freeze | |||||
| `pay_way`,`late_pay_status`,`comments`,starttime,endtime,freeze,service_charge_pay | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||
| @@ -97,7 +98,7 @@ | |||||
| br.late_pay_price,d.`status` | br.late_pay_price,d.`status` | ||||
| deposit_status,br.`shop_info`,br.pay_way,br.late_pay_status, | deposit_status,br.`shop_info`,br.pay_way,br.late_pay_status, | ||||
| br.`comments`,br.starttime,br.endtime, | br.`comments`,br.starttime,br.endtime, | ||||
| r.late_pay_day,r.late_pay_ratio,br.freeze | |||||
| r.late_pay_day,r.late_pay_ratio,br.freeze,br.service_charge_pay | |||||
| from wx_bill_property br left join wx_merchant m on br.merchant_id=m.id | 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 | left join wx_shop s on br.shop_id=s.id | ||||
| left join wx_property_contract r on br.property_contract_id=r.id | left join wx_property_contract r on br.property_contract_id=r.id | ||||
| @@ -46,7 +46,7 @@ | |||||
| <result column="freeze" property="freeze"/> | <result column="freeze" property="freeze"/> | ||||
| <result column="bus_discount_ratio" property="busDiscountRatio"/> | <result column="bus_discount_ratio" property="busDiscountRatio"/> | ||||
| <result column="join_rent_price" property="joinRentPrice"/> | <result column="join_rent_price" property="joinRentPrice"/> | ||||
| <result column="service_charge_pay" property="serviceChargePay"/> | |||||
| </resultMap> | </resultMap> | ||||
| @@ -55,7 +55,7 @@ | |||||
| `createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`need_pay`, | `createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`need_pay`, | ||||
| `merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`, | `merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`, | ||||
| `revenue`,`late_pay_ratio`,`late_pay_time`,`late_pay_price`,`period`,`is_preview`,`shop_info`, | `revenue`,`late_pay_ratio`,`late_pay_time`,`late_pay_price`,`period`,`is_preview`,`shop_info`, | ||||
| `pay_way`,`late_pay_status`,`comments`,starttime,endtime,bus_discount_ratio,freeze,join_rent_price | |||||
| `pay_way`,`late_pay_status`,`comments`,starttime,endtime,bus_discount_ratio,freeze,join_rent_price,service_charge_pay | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||
| @@ -105,7 +105,7 @@ | |||||
| r.pay_ratio,br.`revenue`,r.`late_pay_ratio`,br.`late_pay_time`,br.`period`,br.`rent_contract_id`, | r.pay_ratio,br.`revenue`,r.`late_pay_ratio`,br.`late_pay_time`,br.`period`,br.`rent_contract_id`, | ||||
| d.receive_pay deposit,d.`status` | d.receive_pay deposit,d.`status` | ||||
| deposit_status,br.late_pay_price,br.shop_info,br.pay_way,br.late_pay_status,br.`comments`,br.starttime,br.endtime, | deposit_status,br.late_pay_price,br.shop_info,br.pay_way,br.late_pay_status,br.`comments`,br.starttime,br.endtime, | ||||
| r.late_pay_day,r.late_pay_ratio,br.bus_discount_ratio,br.freeze,br.join_rent_price | |||||
| r.late_pay_day,r.late_pay_ratio,br.bus_discount_ratio,br.freeze,br.join_rent_price,br.service_charge_pay | |||||
| from wx_bill_rent br | from wx_bill_rent br | ||||
| left join wx_shop s on br.shop_id=s.id | left join wx_shop s on br.shop_id=s.id | ||||
| left join wx_rent_contract r on br.rent_contract_id=r.id | left join wx_rent_contract r on br.rent_contract_id=r.id | ||||