winter 1 год назад
Родитель
Сommit
7471b668ea
4 измененных файлов: 8 добавлений и 6 удалений
  1. +5
    -4
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  4. +1
    -1
      mallinkService/src/main/resources/mapper/WxAllBillMapper.xml

+ 5
- 4
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java Просмотреть файл

@@ -101,11 +101,12 @@ public class WxRentPropertyContractController extends WxContractBaseController {
@ApiImplicitParam(name = "rentId", value = "租金合同编号", dataType = "Long", paramType = "query", required = false),
@ApiImplicitParam(name = "propertyId", value = "物业合同编号", dataType = "Long", paramType = "query", required = false),
@ApiImplicitParam(name = "id", value = "租金合同编号(工作流用)", dataType = "String", paramType = "query", required = false)})
public ResultData findById(Long rentId,Long propertyId,String id) {
public ResultData findById(String id) {
logger.debug("[" + getIpAddr() + "] wxRentPropertyContract::findById");
if (null != rentId || null != propertyId) {
return wxRentPropertyContractService.getContractInfo(rentId,propertyId);
}else if (!StringUtils.isBlank(id)) {
//if (null != rentId || null != propertyId) {
// return wxRentPropertyContractService.getContractInfo(rentId,propertyId);
//}else
if (!StringUtils.isBlank(id)) {
//租金+物业工作流查询会传此id
String[] ids = id.split("_RP_");
if (ids.length == 2 ) {


+ 1
- 0
mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java Просмотреть файл

@@ -130,6 +130,7 @@ public class WxBillAllHelper {
public List<WxBillHotNotify> getBillHotNotify(WxShop wxShop,Date starttime, Date enttime) {
WxAllBill br = new WxAllBill();
updateQueryParm(wxShop, br,starttime,enttime);
br.setIsPreview(EnumYesOrNo.NO.getCode());
return wxAllBillService.getBillHotNotify(br);
}


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Просмотреть файл

@@ -3050,7 +3050,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
bmbill.setPeriod(WxRentContractHelper.getPeriod(starttime));
bmbill.setBillRemark(createFrom.getMessage()+".自动计算创建,科目总应收金额为:"+moneyb.setScale(rentcontract.getDecimalSize(),BigDecimal.ROUND_HALF_UP).toPlainString()+"元[科目分摊比率为:"+rate+"]。"+"本铺分担比例"+shoprate.setScale(rentcontract.getDecimalSize(),BigDecimal.ROUND_HALF_UP).toEngineeringString());
bmbill.setExtraCreateFrom(createFrom.getCode());
bmbill.setMoneyChangeDetail("自动计算创建,自动计算创建,科目总应收金额为:"+moneyb.setScale(rentcontract.getDecimalSize(),BigDecimal.ROUND_HALF_UP).toPlainString()+"元[科目分摊比率为:"+rate+"]。"+"本铺分担比例"+shoprate.setScale(rentcontract.getDecimalSize(),BigDecimal.ROUND_HALF_UP).toEngineeringString());
bmbill.setMoneyChangeDetail("自动计算创建,科目总应收金额为:"+moneyb.setScale(rentcontract.getDecimalSize(),BigDecimal.ROUND_HALF_UP).toPlainString()+"元[科目分摊比率为:"+rate+"]。"+"本铺分担比例"+shoprate.setScale(rentcontract.getDecimalSize(),BigDecimal.ROUND_HALF_UP).toEngineeringString());
wxAllBillMapper.insert(bmbill);
if (null != shopMap) {
WxShop s = shopMap.get(sid);


+ 1
- 1
mallinkService/src/main/resources/mapper/WxAllBillMapper.xml Просмотреть файл

@@ -321,7 +321,7 @@
select
energy_fees_id,
count(1) total_count ,
case when bill_type in (13,21,5) then sum(CAST(`receive_pay` AS DECIMAL(20,2)) - CAST(`pay` AS DECIMAL(20,2)) - CAST(IFNULL(`set_off`,'0') AS DECIMAL(20,2)) )
case when bill_type in (13,21,5,7) then sum(CAST(`receive_pay` AS DECIMAL(20,2)) - CAST(`pay` AS DECIMAL(20,2)) - CAST(IFNULL(`set_off`,'0') AS DECIMAL(20,2)))
else sum(CAST(`receive_pay` AS DECIMAL(20,2)) - CAST(`pay` AS DECIMAL(20,2)) - CAST(IFNULL(`set_off`,'0') AS DECIMAL(20,2)) + CAST(IFNULL(`return_pay`,'0') AS DECIMAL(20,2)))
end as total_money,
MIN(starttime) min_begin_time from wx_all_bill


Загрузка…
Отмена
Сохранить