Explorar el Código

fix

release_toaliyun_real
winter hace 1 año
padre
commit
82d0aa5079
Se han modificado 8 ficheros con 68 adiciones y 73 borrados
  1. +27
    -54
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java
  2. +5
    -1
      mallinkService/src/main/java/com/iformall/domain/vo/WxBillSum.java
  3. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxAllBillMapper.java
  4. +2
    -15
      mallinkService/src/main/java/com/iformall/service/WxAllBillService.java
  5. +6
    -0
      mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java
  6. +6
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java
  7. +6
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
  8. +14
    -0
      mallinkService/src/main/resources/mapper/WxAllBillMapper.xml

+ 27
- 54
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java Ver fichero

@@ -219,61 +219,34 @@ public class WxAllBillController extends BillBaseController {
if (null != wxMerchant.getOnlyOwe() && EnumYesOrNo.YES.getCode().intValue() == wxMerchant.getOnlyOwe().intValue()) {
wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays());
}
//根据科目来
List<WxBillSum> sumList = billAllHelper.getFeesBillSum(wxMerchant,starttime, enttime);
if (null == sumList ) {
return new ResultData();
}
wxMerchant.setBillType(EnumBillAllType.RENT.getCode());
WxBillSum rentSum = billAllHelper.getBillSum(wxMerchant,starttime, enttime);
rentSum.setBillName(EnumBillAllType.RENT.getMessage());
wxMerchant.setBillType(EnumBillAllType.RENT_BUSSINESS_MANAGE.getCode());
WxBillSum rentBussinessManageSum = billAllHelper.getBillSum(wxMerchant, starttime, enttime);
rentBussinessManageSum.setBillName(EnumBillAllType.RENT_BUSSINESS_MANAGE.getMessage());
wxMerchant.setBillType(EnumBillAllType.RENT_OPERATION_MANAGE.getCode());
WxBillSum rentOperationManageSum = billAllHelper.getBillSum(wxMerchant, starttime, enttime);
rentOperationManageSum.setBillName(EnumBillAllType.RENT_OPERATION_MANAGE.getMessage());
wxMerchant.setBillType(EnumBillAllType.RENT_DEPOSIT.getCode());
WxBillSum rentDepositSum = billAllHelper.getBillSum(wxMerchant, starttime, enttime);
rentDepositSum.setBillName(EnumBillAllType.RENT_DEPOSIT.getMessage());
wxMerchant.setBillType(EnumBillAllType.PROPERTY.getCode());
WxBillSum propertySum = billAllHelper.getBillSum(wxMerchant, starttime, enttime);
propertySum.setBillName(EnumBillAllType.PROPERTY.getMessage());
wxMerchant.setBillType(EnumBillAllType.PROPERTY_DEPOSIT.getCode());
WxBillSum propertyDepositSum = billAllHelper.getBillSum(wxMerchant, starttime, enttime);
propertyDepositSum.setBillName(EnumBillAllType.PROPERTY_DEPOSIT.getMessage());
wxMerchant.setBillType(EnumBillAllType.DAILY.getCode());
WxBillSum dailySum = billAllHelper.getBillSum(wxMerchant, starttime, enttime);
dailySum.setBillName(EnumBillAllType.DAILY.getMessage());
wxMerchant.setBillType(EnumBillAllType.OTHER.getCode());
WxBillSum otherSum = billAllHelper.getBillSum(wxMerchant, starttime, enttime);
otherSum.setBillName(EnumBillAllType.OTHER.getMessage());
wxMerchant.setBillType(EnumBillAllType.OTHER_DEPOSIT.getCode());
WxBillSum otherDepositSum = billAllHelper.getBillSum(wxMerchant, starttime, enttime);
otherDepositSum.setBillName(EnumBillAllType.OTHER_DEPOSIT.getMessage());
vo.setNeedPay(billAllHelper.calcuteSum(rentSum.getNeedPay(),rentBussinessManageSum.getNeedPay(),rentOperationManageSum.getNeedPay(),rentDepositSum.getNeedPay(),propertySum.getNeedPay(),
propertyDepositSum.getNeedPay(),dailySum.getNeedPay(),otherSum.getNeedPay(),otherDepositSum.getNeedPay()));
vo.setPaid(billAllHelper.calcuteSum(rentSum.getPaid(),rentBussinessManageSum.getPaid(),rentOperationManageSum.getPaid(),rentDepositSum.getPaid(),propertySum.getPaid(),
propertyDepositSum.getPaid(),dailySum.getPaid(),otherSum.getPaid(),otherDepositSum.getPaid()));
vo.setOwe(billAllHelper.calcuteSum(rentSum.getOwe(),rentBussinessManageSum.getOwe(),rentOperationManageSum.getOwe(),rentDepositSum.getOwe(),propertySum.getOwe(),
propertyDepositSum.getOwe(),dailySum.getOwe(),otherSum.getOwe(),otherDepositSum.getOwe()));
List<WxBillSum> sumlist = new ArrayList<>();
sumlist.add(rentSum);
sumlist.add(rentBussinessManageSum);
sumlist.add(rentOperationManageSum);
sumlist.add(rentDepositSum);
sumlist.add(propertySum);
sumlist.add(propertyDepositSum);
sumlist.add(dailySum);
sumlist.add(otherSum);
sumlist.add(otherDepositSum);
vo.setBillSumList(sumlist);
WxEnergyFees fq = new WxEnergyFees();
fq.updateTenantInfo(wxMerchant);
Map<Long, WxEnergyFees> feesMap = wxEnergyService.getFeesMap(fq);
BigDecimal needpay = new BigDecimal(0);
BigDecimal paid = new BigDecimal(0);
BigDecimal owe = new BigDecimal(0);
for (int i = 0 ; i < sumList.size() ; i ++) {
WxBillSum s = sumList.get(i);
if (null != s.getEnergyFeesId() && null != feesMap) {
WxEnergyFees fees = feesMap.get(s.getEnergyFeesId());
if (null != fees) {
s.setBillName(fees.getName());
}
needpay = needpay.add(s.getNeedPayNumber());
paid = paid.add(s.getPaidNumber());
owe = owe.add(s.getOweNumber());
}
}
vo.setNeedPay(needpay.toPlainString());
vo.setPaid(paid.toPlainString());
vo.setOwe(owe.toPlainString());
vo.setBillSumList(sumList);
return new ResultData(vo);
}


+ 5
- 1
mallinkService/src/main/java/com/iformall/domain/vo/WxBillSum.java Ver fichero

@@ -13,7 +13,11 @@ import com.baomidou.mybatisplus.annotation.TableField;
public class WxBillSum implements Serializable {

private static final long serialVersionUID = 1L;

private Long energyFeesId;
@TableField(exist = false)
private String energyFeesName;
//应收总金额
private String needPay = "0";
@TableField(exist = false)


+ 2
- 0
mallinkService/src/main/java/com/iformall/mapper/WxAllBillMapper.java Ver fichero

@@ -30,6 +30,8 @@ public interface WxAllBillMapper extends CommonMapper<WxAllBill, Long> {

WxBillSum getBillMonthSum(WxAllBill wxBillRent);
List<WxBillSum> getFeesBillSum(WxAllBill wxBillRent);
List<Long> getMerchantIdList(WxAllBill wxBillRent);
List<WxBillHotNotify> getBillHotNotify(WxAllBill wxBillRent);


+ 2
- 15
mallinkService/src/main/java/com/iformall/service/WxAllBillService.java Ver fichero

@@ -29,6 +29,8 @@ public interface WxAllBillService {
WxBillSum getBillMonthSum(WxAllBill wxBillRent);
List<WxBillSum> getFeesBillSum(WxAllBill wxBillRent);
PageInfo<WxAllBill> listAsPage(WxAllBill record, Integer pageIndex, Integer pageSize);
List<Long> getMerchantIds(WxAllBill wxBillRent);
@@ -73,19 +75,4 @@ public interface WxAllBillService {
void deleteEnergyReadingBills(WxAllBill wxBillDaily);

}

+ 6
- 0
mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java Ver fichero

@@ -112,6 +112,12 @@ public class WxBillAllHelper {
return rentSum;
}
public List<WxBillSum> getFeesBillSum(WxMerchant wxMerchant,Date starttime, Date enttime) {
WxAllBill br = new WxAllBill();
updateQueryParm(wxMerchant, br,starttime,enttime);
return wxAllBillService.getFeesBillSum(br);
}
public List<WxBillHotNotify> getBillHotNotify(WxMerchant wxMerchant,Date starttime, Date enttime) {
WxAllBill br = new WxAllBill();
updateQueryParm(wxMerchant, br,starttime,enttime);


+ 6
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java Ver fichero

@@ -152,6 +152,12 @@ public class WxAllBillServiceImpl extends WxBillBaseService implements WxAllBill
updateQueryParam(wxBillRent);
return wxAllBillMapper.getBillMonthSum(wxBillRent);
}
@Override
public List<WxBillSum> getFeesBillSum(WxAllBill wxBillRent) {
updateQueryParam(wxBillRent);
return wxAllBillMapper.getFeesBillSum(wxBillRent);
}
@Override
public PageInfo<WxAllBill> listAsPage(WxAllBill record, Integer pageIndex, Integer pageSize) {


+ 6
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java Ver fichero

@@ -257,10 +257,13 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
wxBillRent.setPropertyContractId(id);
wxBillRent.setSortColumns("starttime asc");
wxBillRent.updateTenantInfo(tenantEntity);
//一次性的和非一次性的都有这个属性,过滤掉,就是物业主账单
wxBillRent.setHasParentBillId(EnumYesOrNo.NO.getCode());
//物业主账单
wxBillRent.setEnergyFeesId(EnumBillAllType.PROPERTY.getEnergyFeesId());
List<WxAllBill> retList = wxAllBillMapper.findList(wxBillRent);
//非一次性的有这个属性
//获取非一次性的,
wxBillRent.setEnergyFeesId(null);
wxBillRent.setBillType(EnumBillAllType.PROPERTY.getCode());
wxBillRent.setHasParentBillId(EnumYesOrNo.YES.getCode());
List<WxAllBill> unFixedList = wxAllBillMapper.findList(wxBillRent);
Map<Long,List<WxAllBill>> childMap = null;


+ 14
- 0
mallinkService/src/main/resources/mapper/WxAllBillMapper.xml Ver fichero

@@ -151,6 +151,7 @@
<result column="max_date" jdbcType="TIMESTAMP" property="maxDate" />
<result column="return_pay" jdbcType="VARCHAR" property="returnPay"/>
<result column="set_off" jdbcType="VARCHAR" property="setOff"/>
<result column="energy_fees_id" jdbcType="BIGINT" property="energyFeesId"/>
</resultMap>
<select id="getBillMonthSum" parameterType="com.iformall.domain.po.WxAllBill" resultMap="SumBaseResultMap">
select
@@ -163,6 +164,19 @@
from wx_all_bill
<include refid="dynamicWhereConditions"/>
</select>
<select id="getFeesBillSum" parameterType="com.iformall.domain.po.WxAllBill" resultMap="SumBaseResultMap">
select
energy_fees_id,
sum(CAST(receive_pay AS DECIMAL(20,2))) receive_pay ,
sum(CAST(pay AS DECIMAL(20,2))) paid,
min(starttime) min_date,
max(endtime) max_date,
sum(CAST(set_off AS DECIMAL(20,2))) set_off ,
sum(CAST(return_pay AS DECIMAL(20,2))) return_pay
from wx_all_bill
<include refid="dynamicWhereConditions"/>
group by energy_fees_id
</select>
<select id="getMerchantIdList" parameterType="com.iformall.domain.po.WxAllBill" resultType="Long">
select distinct merchant_id from wx_all_bill


Cargando…
Cancelar
Guardar