diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxSettleMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxSettleMerchantController.java
index 8021c08ca..069287fee 100644
--- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxSettleMerchantController.java
+++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxSettleMerchantController.java
@@ -179,13 +179,13 @@ public class WxSettleMerchantController extends BaseController {
_np = new BigDecimal(r.getNeedPay());
}
BigDecimal _bmf = new BigDecimal(0);
- if (null != r.getBussinessManageFeeNeedPay()) {
- _bmf = new BigDecimal(r.getBussinessManageFeeNeedPay());
- }
+// if (null != r.getBussinessManageFeeNeedPay()) {
+// _bmf = new BigDecimal(r.getBussinessManageFeeNeedPay());
+// }
BigDecimal _omf = new BigDecimal(0);
- if (null != r.getOperatingManageFeeNeedPay()) {
- _omf = new BigDecimal(r.getOperatingManageFeeNeedPay());
- }
+// if (null != r.getOperatingManageFeeNeedPay()) {
+// _omf = new BigDecimal(r.getOperatingManageFeeNeedPay());
+// }
all = all.add(_np).add(_bmf).add(_omf);
}
Map retMap = new HashMap();
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java b/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java
index 27ce4179c..d8f95ede7 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java
@@ -261,12 +261,6 @@ public class WxAllBill extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="最近催缴时间",name="lastOweCallUser")
public String lastOweCallUser;
- @io.swagger.annotations.ApiModelProperty(value="租金里面的商业管理费",name="bussinessManageFeeNeedPay")
- public String bussinessManageFeeNeedPay;
-
- @io.swagger.annotations.ApiModelProperty(value="租金里面的营业管理费",name="operatingManageFeeNeedPay")
- public String operatingManageFeeNeedPay;
-
@io.swagger.annotations.ApiModelProperty(value = "商铺信息", name = "shopInfo")
public String shopInfo;
@@ -285,10 +279,10 @@ public class WxAllBill extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="主物账单ID(针对合同里面的自定义科目账单)",name="parentBillId")
public Long parentBillId;
- @io.swagger.annotations.ApiModelProperty(value="虚拟组合ID(针对店铺拆分用,主账单用)",name="virtualComposeId")
+ @io.swagger.annotations.ApiModelProperty(value="虚拟组合ID(针对店铺拆分用,主账单用,前端使用)",name="virtualComposeId")
public Long virtualComposeId;
- @io.swagger.annotations.ApiModelProperty(value="父虚拟组合ID(针对店铺拆分,自定义科目账单用)",name="parentVirtualComposeId")
+ @io.swagger.annotations.ApiModelProperty(value="父虚拟组合ID(针对店铺拆分,自定义科目账单用,前端使用)",name="parentVirtualComposeId")
public Long parentVirtualComposeId;
@io.swagger.annotations.ApiModelProperty(value = "能源抄表计算ID", name = "energyReadingCalcuteId")
@@ -338,13 +332,6 @@ public class WxAllBill extends TenantEntity {
return new BigDecimal(getOwe()).add(new BigDecimal(bl)).add(new BigDecimal(serviceChargePay)).setScale(2, RoundingMode.UP).toPlainString();
}
- @TableField(exist = false)
- private String totalFee;//租金合同创建时,所有的应收费用
- public void calcuteTotalFee(Integer decimalSize) {
- this.totalFee = new BigDecimal(this.receivePay).add(new BigDecimal(bussinessManageFeeNeedPay)).add(new BigDecimal(operatingManageFeeNeedPay))
- .setScale(decimalSize, RoundingMode.HALF_UP).toPlainString();
- }
-
@TableField(exist = false)
public String month;
//EnumBillOweOrNearType 逾期 1, 临期 2
diff --git a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml
index 939a666f4..a98a58814 100644
--- a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml
@@ -32,8 +32,6 @@
-
-
@@ -54,7 +52,7 @@
`id`,`tenant_id`,`parent_tenant_id`,`shop_id`,`createtime`,`create_by`,`create_by_name`,`updatetime`,`update_by`,`update_by_name`,
`price_detail`,`need_pay`,`receive_pay`,`history_receive_pay`,`pay`,`pay_way`,`pay_date`,`set_off`,`use_money`,`starttime`,`endtime`,`status`,`energy_fees_id`,
- `return_pay`,`bill_remark`,`last_owe_call_time`,`last_owe_call_user`,`bussiness_manage_fee_need_pay`,`operating_manage_fee_need_pay`,`receive_date`,`period`,
+ `return_pay`,`bill_remark`,`last_owe_call_time`,`last_owe_call_user`,`receive_date`,`period`,
`is_preview`,`shop_info`,`rent_contract_id`,`rent_contract_agile_fees_type`,`property_contract_id`,`parent_bill_id`,`virtual_compose_id`,`parent_virtual_compose_id`,
`energy_reading_calcuteId`,`energy_reading_id`,`extra_create_from`,`rent_area`,`can_edit`,`cus_name`,`fees_type`
@@ -220,8 +218,6 @@
sum(CAST(ifnull(set_off,'0') AS DECIMAL(20,2))) set_off,
sum(CAST(ifnull(use_money,'0') AS DECIMAL(20,2))) use_money,
sum(CAST(ifnull(return_pay,'0') AS DECIMAL(20,2))) return_pay,
- sum(CAST(ifnull(bussiness_manage_fee_need_pay,'0') AS DECIMAL(20,2))) bussiness_manage_fee_need_pay,
- sum(CAST(ifnull(operating_manage_fee_need_pay,'0') AS DECIMAL(20,2))) operating_manage_fee_need_pay,
starttime,
endtime,
receive_date,
@@ -240,8 +236,6 @@
sum(CAST(ifnull(set_off,'0') AS DECIMAL(20,2))) set_off,
sum(CAST(ifnull(use_money,'0') AS DECIMAL(20,2))) use_money,
sum(CAST(ifnull(return_pay,'0') AS DECIMAL(20,2))) return_pay,
- sum(CAST(ifnull(bussiness_manage_fee_need_pay,'0') AS DECIMAL(20,2))) bussiness_manage_fee_need_pay,
- sum(CAST(ifnull(operating_manage_fee_need_pay,'0') AS DECIMAL(20,2))) operating_manage_fee_need_pay,
starttime,
endtime,
receive_date,
@@ -396,10 +390,10 @@
#{item.createBy},#{item.createByName},#{item.updatetime},#{item.updateBy},#{item.updateByName},#{item.priceDetail},
#{item.needPay},#{item.receivePay},#{item.historyReceivePay},#{item.pay},#{item.payWay},#{item.payDate},#{item.setOff},#{item.useMoney},
#{item.starttime},#{item.endtime},#{item.status},#{item.energyFeesId},#{item.returnPay},#{item.billRemark},
- #{item.lastOweCallTime},#{item.lastOweCallUser},#{item.bussinessManageFeeNeedPay},#{item.operatingManageFeeNeedPay},
+ #{item.lastOweCallTime},#{item.lastOweCallUser},
#{item.receiveDate},#{item.period},#{item.isPreview},#{item.shopInfo},#{item.rentContractId},#{item.rentContractAgileFeesType},#{item.propertyContractId},
#{item.parentBillId},#{item.virtualComposeId},#{item.parentVirtualComposeId},#{item.energyReadingCalcuteId},
- #{item.energyReadingId},#{item.extraCreateFrom},#{item.rentArea},#{item.canEdit},#{item.cusName}
+ #{item.energyReadingId},#{item.extraCreateFrom},#{item.rentArea},#{item.canEdit},#{item.cusName},#{item.feesType}
)