winter 1 год назад
Родитель
Сommit
17f03f3705
5 измененных файлов: 24 добавлений и 6 удалений
  1. +5
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFees.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxBillFeesStandardsListVo.java
  3. +6
    -0
      mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java
  4. +9
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
  5. +3
    -2
      mallinkService/src/main/resources/mapper/WxEnergyFeesMapper.xml

+ 5
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFees.java Просмотреть файл

@@ -123,6 +123,11 @@ public class WxEnergyFees extends TenantEntity {
return ""; return "";
} }
@io.swagger.annotations.ApiModelProperty(value = "是否押金类,押金类是需要退回的", name = "isDespoit")
private Integer isDespoit;
public String calcuteTotalMoney(Integer decimalSize,Date start,Date end,String count,boolean isFixed,EnumRentDayPriceCalcute priceCalcute,Integer monthDays, public String calcuteTotalMoney(Integer decimalSize,Date start,Date end,String count,boolean isFixed,EnumRentDayPriceCalcute priceCalcute,Integer monthDays,
EnumContractReceivePeriodUnit dayType,Integer receivePeriod ) { EnumContractReceivePeriodUnit dayType,Integer receivePeriod ) {
if (StringUtils.isBlank(count)) { if (StringUtils.isBlank(count)) {


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

@@ -16,5 +16,6 @@ public class WxBillFeesStandardsListVo implements Serializable {
private Date receiveDate; private Date receiveDate;
private WxEnergyFees feeStandards; private WxEnergyFees feeStandards;
private Long parentBillId; private Long parentBillId;
private boolean isDeposit;
} }

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

@@ -477,6 +477,12 @@ public class WxRentContractHelper {
vo.setTotal(fees.calcuteTotalMoney(decimalSize, billStartDate, billEndDate, count,true,null,null,null,null)); vo.setTotal(fees.calcuteTotalMoney(decimalSize, billStartDate, billEndDate, count,true,null,null,null,null));
vo.setReceiveDate(DateUtils.getDaySet(billStartDate,Calendar.DATE,-1)); vo.setReceiveDate(DateUtils.getDaySet(billStartDate,Calendar.DATE,-1));
vo.setFeeStandards(fees); vo.setFeeStandards(fees);
if(fees.getIsDespoit().intValue() == EnumYesOrNo.YES.getCode().intValue()) {
vo.setDeposit(true);
}else {
vo.setDeposit(false);
}
retList.add(vo); retList.add(vo);
} }
}else { }else {


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

@@ -768,7 +768,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService


++billcount; ++billcount;
//物业主账单 //物业主账单
WxAllBill wxBillProperty = generateBillProperty(wxPayAccountBill,wxPropertyContract,isPreview,billTimeVo.getStartDate(),billTimeVo.getEndDate(),billTimeVo.getReceiveDate(),needpay,user,billcount,shopInfo,standarsTotal,"",null,null);
WxAllBill wxBillProperty = generateBillProperty(wxPayAccountBill,wxPropertyContract,isPreview,billTimeVo.getStartDate(),billTimeVo.getEndDate(),billTimeVo.getReceiveDate(),needpay,user,billcount,shopInfo,standarsTotal,"",null,null,false);
//设置物业科目 //设置物业科目
wxBillProperty.setEnergyFeesId(EnumBillAllType.PROPERTY.getEnergyFeesId()); wxBillProperty.setEnergyFeesId(EnumBillAllType.PROPERTY.getEnergyFeesId());
//非一次性账单 //非一次性账单
@@ -818,11 +818,12 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
private WxAllBill generateBillPropertyByBillStandards(WxPayAccountBill wxPayAccountBill,WxPropertyContract wxPropertyContract,Integer isPreview,MallUserInfo user,WxBillFeesStandardsListVo svo, private WxAllBill generateBillPropertyByBillStandards(WxPayAccountBill wxPayAccountBill,WxPropertyContract wxPropertyContract,Integer isPreview,MallUserInfo user,WxBillFeesStandardsListVo svo,
Integer billcount,Map<String, Object> shopInfo) { Integer billcount,Map<String, Object> shopInfo) {
Long feesStandardsId = svo.getFeeStandards().getId(); Long feesStandardsId = svo.getFeeStandards().getId();
return generateBillProperty(wxPayAccountBill,wxPropertyContract,isPreview,svo.getStart(),svo.getEnd(),svo.getReceiveDate(),svo.getTotal(),user,billcount,shopInfo,"0",svo.getBillName(),svo.getParentBillId(),feesStandardsId);
boolean isDeposit = svo.isDeposit();
return generateBillProperty(wxPayAccountBill,wxPropertyContract,isPreview,svo.getStart(),svo.getEnd(),svo.getReceiveDate(),svo.getTotal(),user,billcount,shopInfo,"0",svo.getBillName(),svo.getParentBillId(),feesStandardsId,isDeposit);
} }
private WxAllBill generateBillProperty(WxPayAccountBill wxPayAccountBill,WxPropertyContract wxPropertyContract,Integer isPreview,Date start,Date end,Date receiveDate,String needpay, private WxAllBill generateBillProperty(WxPayAccountBill wxPayAccountBill,WxPropertyContract wxPropertyContract,Integer isPreview,Date start,Date end,Date receiveDate,String needpay,
MallUserInfo user,Integer billcount,Map<String, Object> shopInfo,String standarsTotal,String remark,Long parentBillId,Long feesStandardsId) {
MallUserInfo user,Integer billcount,Map<String, Object> shopInfo,String standarsTotal,String remark,Long parentBillId,Long feesStandardsId,boolean isDeposit) {
if (StringUtils.isBlank(needpay)) { if (StringUtils.isBlank(needpay)) {
needpay = "0"; needpay = "0";
}else { }else {
@@ -832,7 +833,11 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
WxAllBill wxBillProperty = new WxAllBill(); WxAllBill wxBillProperty = new WxAllBill();
wxBillProperty.setIsPreview(isPreview); wxBillProperty.setIsPreview(isPreview);
wxBillProperty.setId(idWorker.nextId()); wxBillProperty.setId(idWorker.nextId());
wxBillProperty.setBillType(EnumBillAllType.PROPERTY.getCode());
if (isDeposit) {
wxBillProperty.setBillType(EnumBillAllType.PROPERTY_DEPOSIT.getCode());
}else {
wxBillProperty.setBillType(EnumBillAllType.PROPERTY.getCode());
}
wxBillProperty.setPropertyContractId(wxPropertyContract.getId()); wxBillProperty.setPropertyContractId(wxPropertyContract.getId());
wxBillProperty.setPay("0"); wxBillProperty.setPay("0");
wxBillProperty.setStarttime(start); wxBillProperty.setStarttime(start);


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

@@ -18,11 +18,12 @@
<result column="calcute_unit" jdbcType="INTEGER" property="calcuteUnit"/> <result column="calcute_unit" jdbcType="INTEGER" property="calcuteUnit"/>
<result column="time_unit" jdbcType="INTEGER" property="timeUnit"/> <result column="time_unit" jdbcType="INTEGER" property="timeUnit"/>
<result column="tax_rate" jdbcType="VARCHAR" property="taxRate"/> <result column="tax_rate" jdbcType="VARCHAR" property="taxRate"/>
<result column="is_despoit" jdbcType="INTEGER" property="isDespoit"/>
</resultMap> </resultMap>


<sql id="allColumns"> <sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`is_del`,`name`,`price`,`public_calcute`,`type`,`bill_type`,`is_system`, `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`is_del`,`name`,`price`,`public_calcute`,`type`,`bill_type`,`is_system`,
`fixed_price`,`calcute_unit`,`time_unit`,`tax_rate`
`fixed_price`,`calcute_unit`,`time_unit`,`tax_rate`,`is_despoit`
</sql> </sql>


<sql id="dynamicWhereConditions"> <sql id="dynamicWhereConditions">
@@ -45,7 +46,7 @@
<if test=" null != calcuteUnit ">and `calcute_unit` = #{calcuteUnit}</if> <if test=" null != calcuteUnit ">and `calcute_unit` = #{calcuteUnit}</if>
<if test=" null != timeUnit ">and `time_unit` = #{timeUnit}</if> <if test=" null != timeUnit ">and `time_unit` = #{timeUnit}</if>
<if test=" null != name and '' != name ">and name like concat('%', #{name},'%')</if> <if test=" null != name and '' != name ">and name like concat('%', #{name},'%')</if>
<if test=" null != isDespoit ">and `is_despoit` = #{isDespoit}</if>
<if test=" null != ids "> <if test=" null != ids ">
and id in and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")"> <foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">


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