| @@ -106,3 +106,104 @@ ALTER TABLE wx_bill_property_97 ADD COLUMN parent_bill_id BIGINT(20) COMME | |||||
| ALTER TABLE wx_bill_property_98 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ; | ALTER TABLE wx_bill_property_98 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ; | ||||
| ALTER TABLE wx_bill_property_99 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ; | ALTER TABLE wx_bill_property_99 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ; | ||||
| ALTER TABLE wx_bill_property_0 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_1 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_2 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_3 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_4 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_5 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_6 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_7 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_8 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_9 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_10 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_11 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_12 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_13 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_14 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_15 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_16 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_17 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_18 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_19 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_20 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_21 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_22 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_23 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_24 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_25 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_26 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_27 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_28 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_29 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_30 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_31 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_32 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_33 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_34 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_35 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_36 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_37 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_38 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_39 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_40 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_41 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_42 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_43 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_44 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_45 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_46 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_47 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_48 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_49 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_50 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_51 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_52 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_53 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_54 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_55 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_56 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_57 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_58 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_59 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_60 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_61 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_62 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_63 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_64 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_65 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_66 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_67 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_68 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_69 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_70 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_71 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_72 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_73 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_74 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_75 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_76 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_77 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_78 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_79 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_80 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_81 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_82 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_83 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_84 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_85 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_86 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_87 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_88 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_89 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_90 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_91 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_92 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_93 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_94 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_95 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_96 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_97 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_98 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| ALTER TABLE wx_bill_property_99 ADD COLUMN fees_standars_id BIGINT(20) COMMENT '标准费用ID' ; | |||||
| @@ -100,8 +100,11 @@ public class WxBillProperty extends WxBillBaseEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value = "备注", name = "comments") | @io.swagger.annotations.ApiModelProperty(value = "备注", name = "comments") | ||||
| private String comments; | private String comments; | ||||
| @io.swagger.annotations.ApiModelProperty(value="主物业账单ID",name="parentBillId") | @io.swagger.annotations.ApiModelProperty(value="主物业账单ID",name="parentBillId") | ||||
| private Long parentBillId; | private Long parentBillId; | ||||
| @io.swagger.annotations.ApiModelProperty(value="标准费用ID",name="feesStandarsId") | |||||
| private Long feesStandarsId; | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private Integer allPeriod; | private Integer allPeriod; | ||||
| @@ -78,7 +78,7 @@ public class WxFeesStandards extends TenantEntity { | |||||
| private String calcuteUnitName; | private String calcuteUnitName; | ||||
| public String getCalcuteUnitName() { | public String getCalcuteUnitName() { | ||||
| if (null != calcuteUnit) { | if (null != calcuteUnit) { | ||||
| EnumFeesStandardsCalcuteUnit.getEnum(calcuteUnit).getMessage(); | |||||
| return EnumFeesStandardsCalcuteUnit.getEnum(calcuteUnit).getMessage(); | |||||
| } | } | ||||
| return ""; | return ""; | ||||
| } | } | ||||
| @@ -89,7 +89,7 @@ public class WxFeesStandards extends TenantEntity { | |||||
| private String timeUnitName; | private String timeUnitName; | ||||
| public String getTimeUnitName() { | public String getTimeUnitName() { | ||||
| if (null != timeUnit) { | if (null != timeUnit) { | ||||
| EnumFeesStandardsTimeUnit.getEnum(timeUnit).getMessage(); | |||||
| return EnumFeesStandardsTimeUnit.getEnum(timeUnit).getMessage(); | |||||
| } | } | ||||
| return ""; | return ""; | ||||
| } | } | ||||
| @@ -733,7 +733,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||||
| ++billcount; | ++billcount; | ||||
| //物业主账单 | //物业主账单 | ||||
| WxBillProperty wxBillProperty = generateBillProperty(wxPayAccountBill,wxPropertyContract,isPreview,billTimeVo.getStartDate(),billTimeVo.getEndDate(),billTimeVo.getReceiveDate(),needpay,userId,billcount,shopInfo,standarsTotal,"",null); | |||||
| WxBillProperty wxBillProperty = generateBillProperty(wxPayAccountBill,wxPropertyContract,isPreview,billTimeVo.getStartDate(),billTimeVo.getEndDate(),billTimeVo.getReceiveDate(),needpay,userId,billcount,shopInfo,standarsTotal,"",null,null); | |||||
| //非一次性账单 | //非一次性账单 | ||||
| wxBillProperty.setUnFixedbillFeesStandardsList(unFixedList); | wxBillProperty.setUnFixedbillFeesStandardsList(unFixedList); | ||||
| //每个非从一次性都要创建账单 | //每个非从一次性都要创建账单 | ||||
| @@ -772,11 +772,12 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||||
| private WxBillProperty generateBillPropertyByBillStandards(WxPayAccountBill wxPayAccountBill,WxPropertyContract wxPropertyContract,Integer isPreview,Long userId,WxBillFeesStandardsListVo svo, | private WxBillProperty generateBillPropertyByBillStandards(WxPayAccountBill wxPayAccountBill,WxPropertyContract wxPropertyContract,Integer isPreview,Long userId,WxBillFeesStandardsListVo svo, | ||||
| Integer billcount,Map<String, Object> shopInfo) { | Integer billcount,Map<String, Object> shopInfo) { | ||||
| return generateBillProperty(wxPayAccountBill,wxPropertyContract,isPreview,svo.getStart(),svo.getEnd(),svo.getReceiveDate(),svo.getTotal(),userId,billcount,shopInfo,"0",svo.getBillName(),svo.getParentBillId()); | |||||
| Long feesStandardsId = svo.getFeeStandards().getId(); | |||||
| return generateBillProperty(wxPayAccountBill,wxPropertyContract,isPreview,svo.getStart(),svo.getEnd(),svo.getReceiveDate(),svo.getTotal(),userId,billcount,shopInfo,"0",svo.getBillName(),svo.getParentBillId(),feesStandardsId); | |||||
| } | } | ||||
| private WxBillProperty generateBillProperty(WxPayAccountBill wxPayAccountBill,WxPropertyContract wxPropertyContract,Integer isPreview,Date start,Date end,Date receiveDate,String needpay, | private WxBillProperty generateBillProperty(WxPayAccountBill wxPayAccountBill,WxPropertyContract wxPropertyContract,Integer isPreview,Date start,Date end,Date receiveDate,String needpay, | ||||
| Long userId,Integer billcount,Map<String, Object> shopInfo,String standarsTotal,String remark,Long parentBillId) { | |||||
| Long userId,Integer billcount,Map<String, Object> shopInfo,String standarsTotal,String remark,Long parentBillId,Long feesStandardsId) { | |||||
| final IdWorker idWorker = IdWorker.get(); | final IdWorker idWorker = IdWorker.get(); | ||||
| WxBillProperty wxBillProperty = new WxBillProperty(); | WxBillProperty wxBillProperty = new WxBillProperty(); | ||||
| wxBillProperty.setIsPreview(isPreview); | wxBillProperty.setIsPreview(isPreview); | ||||
| @@ -811,6 +812,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||||
| wxBillProperty.setTotalFee(new BigDecimal(needpay).add(new BigDecimal(standarsTotal)).toPlainString()); | wxBillProperty.setTotalFee(new BigDecimal(needpay).add(new BigDecimal(standarsTotal)).toPlainString()); | ||||
| wxBillProperty.setComments(remark); | wxBillProperty.setComments(remark); | ||||
| wxBillProperty.setParentBillId(parentBillId); | wxBillProperty.setParentBillId(parentBillId); | ||||
| wxBillProperty.setFeesStandarsId(feesStandardsId); | |||||
| //计算手续费 | //计算手续费 | ||||
| BigDecimal servicePay = new BigDecimal(wxBillProperty.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(100), wxPropertyContract.getDecimalSize(), BigDecimal.ROUND_HALF_UP); | BigDecimal servicePay = new BigDecimal(wxBillProperty.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(100), wxPropertyContract.getDecimalSize(), BigDecimal.ROUND_HALF_UP); | ||||
| @@ -34,6 +34,7 @@ | |||||
| <result column="late_pay_status" jdbcType="INTEGER" property="latePayStatus"/> | <result column="late_pay_status" jdbcType="INTEGER" property="latePayStatus"/> | ||||
| <result column="comments" jdbcType="VARCHAR" property="comments"/> | <result column="comments" jdbcType="VARCHAR" property="comments"/> | ||||
| <result column="parent_bill_id" jdbcType="BIGINT" property="parentBillId"/> | <result column="parent_bill_id" jdbcType="BIGINT" property="parentBillId"/> | ||||
| <result column="fees_standars_id" jdbcType="BIGINT" property="feesStandarsId"/> | |||||
| <result column="starttime" property="starttime"/> | <result column="starttime" property="starttime"/> | ||||
| <result column="endtime" property="endtime"/> | <result column="endtime" property="endtime"/> | ||||
| <result column="last_owe_call_time" jdbcType="TIMESTAMP" property="lastOweCallTime"/> | <result column="last_owe_call_time" jdbcType="TIMESTAMP" property="lastOweCallTime"/> | ||||
| @@ -54,7 +55,7 @@ | |||||
| `createtime`,`expired_day`,`tenant_id`,`status`,`is_del`,`need_pay`,`last_owe_call_time`,`last_owe_call_user`, | `createtime`,`expired_day`,`tenant_id`,`status`,`is_del`,`need_pay`,`last_owe_call_time`,`last_owe_call_user`, | ||||
| `merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,`apply_status`,`apply_pay_img`,`apply_update_time`, | `merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,`apply_status`,`apply_pay_img`,`apply_update_time`, | ||||
| `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,service_charge_pay,`parent_bill_id` | |||||
| `pay_way`,`late_pay_status`,`comments`,starttime,endtime,freeze,service_charge_pay,`parent_bill_id`,`fees_standars_id` | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||
| @@ -86,6 +87,7 @@ | |||||
| <if test=" null != payWay ">and `pay_way` = #{payWay}</if> | <if test=" null != payWay ">and `pay_way` = #{payWay}</if> | ||||
| <if test=" null != latePayStatus ">and `late_pay_status` = #{latePayStatus}</if> | <if test=" null != latePayStatus ">and `late_pay_status` = #{latePayStatus}</if> | ||||
| <if test=" null != parentBillId ">and `parent_bill_id` = #{parentBillId}</if> | <if test=" null != parentBillId ">and `parent_bill_id` = #{parentBillId}</if> | ||||
| <if test=" null != feesStandarsId ">and `fees_standars_id` = #{feesStandarsId}</if> | |||||
| <if test=" 1 == notifyed ">and (`last_owe_call_time` is not null and `receive_pay` - `pay` > 0 and status not in (3,6,7) )</if> | <if test=" 1 == notifyed ">and (`last_owe_call_time` is not null and `receive_pay` - `pay` > 0 and status not in (3,6,7) )</if> | ||||
| <if test=" null != propertyContractIds "> | <if test=" null != propertyContractIds "> | ||||
| @@ -160,6 +162,7 @@ | |||||
| <if test=" null != payWay ">and br.`pay_way` = #{payWay}</if> | <if test=" null != payWay ">and br.`pay_way` = #{payWay}</if> | ||||
| <if test=" null != latePayStatus ">and br.`late_pay_status` = #{latePayStatus}</if> | <if test=" null != latePayStatus ">and br.`late_pay_status` = #{latePayStatus}</if> | ||||
| <if test=" null != parentBillId ">and br.`parent_bill_id` = #{parentBillId}</if> | <if test=" null != parentBillId ">and br.`parent_bill_id` = #{parentBillId}</if> | ||||
| <if test=" null != feesStandarsId ">and br.`fees_standars_id` = #{feesStandarsId}</if> | |||||
| <if test=" 1 == notifyed ">and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6,7) )</if> | <if test=" 1 == notifyed ">and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6,7) )</if> | ||||
| <if test=" null != propertyContractIds "> | <if test=" null != propertyContractIds "> | ||||
| and br.property_contract_id in | and br.property_contract_id in | ||||
| @@ -189,7 +192,7 @@ | |||||
| br.`status`,br.`need_pay`,br.`updatetime`,br.`merchant_id`,br.`rent_shop_type`,br.`period`,br.`last_owe_call_time`,br.`last_owe_call_user`, | br.`status`,br.`need_pay`,br.`updatetime`,br.`merchant_id`,br.`rent_shop_type`,br.`period`,br.`last_owe_call_time`,br.`last_owe_call_user`, | ||||
| br.`revenue`,br.`late_pay_time`,br.`property_contract_id`,br.late_pay_price,br.`shop_info`,br.pay_way,br.late_pay_status, | br.`revenue`,br.`late_pay_time`,br.`property_contract_id`,br.late_pay_price,br.`shop_info`,br.pay_way,br.late_pay_status, | ||||
| br.`comments`,br.starttime,br.endtime,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,br.freeze,br.service_charge_pay, | br.`comments`,br.starttime,br.endtime,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,br.freeze,br.service_charge_pay, | ||||
| br.`late_pay_ratio`,br.`parent_bill_id` | |||||
| br.`late_pay_ratio`,br.`parent_bill_id`,br.`fees_standars_id` | |||||
| from wx_bill_property br | from wx_bill_property br | ||||
| <include refid="queryBillPropertyListConditions"/> | <include refid="queryBillPropertyListConditions"/> | ||||
| <if test=" null != sortColumns">order by ${sortColumns}</if> | <if test=" null != sortColumns">order by ${sortColumns}</if> | ||||
| @@ -370,7 +373,7 @@ | |||||
| tenant_id, parent_tenant_id, status, is_del, need_pay, merchant_id, user_id, shop_id, updatetime, starttime, | tenant_id, parent_tenant_id, status, is_del, need_pay, merchant_id, user_id, shop_id, updatetime, starttime, | ||||
| endtime, | endtime, | ||||
| rent_shop_type, revenue, late_pay_ratio, late_pay_time, late_pay_price, period, is_preview, shop_info, | rent_shop_type, revenue, late_pay_ratio, late_pay_time, late_pay_price, period, is_preview, shop_info, | ||||
| pay_way, late_pay_status, comments,service_charge_pay,parent_bill_id) | |||||
| pay_way, late_pay_status, comments,service_charge_pay,parent_bill_id,fees_standars_id) | |||||
| VALUES | VALUES | ||||
| <foreach collection="list" item="item" index="index" separator=","> | <foreach collection="list" item="item" index="index" separator=","> | ||||
| ( | ( | ||||
| @@ -379,7 +382,7 @@ | |||||
| #{item.status},#{item.isDel},#{item.needPay},#{item.merchantId}, | #{item.status},#{item.isDel},#{item.needPay},#{item.merchantId}, | ||||
| #{item.userId},#{item.shopId},#{item.updatetime},#{item.starttime},#{item.endtime},#{item.rentShopType},#{item.revenue}, | #{item.userId},#{item.shopId},#{item.updatetime},#{item.starttime},#{item.endtime},#{item.rentShopType},#{item.revenue}, | ||||
| #{item.latePayRatio},#{item.latePayTime},#{item.latePayPrice},#{item.period},#{item.isPreview},#{item.shopInfo}, | #{item.latePayRatio},#{item.latePayTime},#{item.latePayPrice},#{item.period},#{item.isPreview},#{item.shopInfo}, | ||||
| #{item.payWay},#{item.latePayStatus},#{item.comments},#{item.serviceChargePay},#{item.parentBillId} | |||||
| #{item.payWay},#{item.latePayStatus},#{item.comments},#{item.serviceChargePay},#{item.parentBillId},#{item.feesStandarsId} | |||||
| ) | ) | ||||
| </foreach> | </foreach> | ||||
| </insert> | </insert> | ||||