Просмотр исходного кода

[合同][修改][开发账单结算]

release_toaliyun_real
luozukai 6 лет назад
Родитель
Сommit
54da7d583d
5 измененных файлов: 89 добавлений и 7 удалений
  1. +1
    -0
      mallinkService/src/main/java/com/iformall/enums/EnumBillRentStatus.java
  2. +2
    -1
      mallinkService/src/main/java/com/iformall/enums/EnumBillType.java
  3. +2
    -1
      mallinkService/src/main/java/com/iformall/mapper/WxBillSettleBillMapper.java
  4. +81
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java
  5. +3
    -0
      mallinkService/src/main/resources/mapper/WxBillSettleBillMapper.xml

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

@@ -12,6 +12,7 @@ public enum EnumBillRentStatus {
NOT_EXPIRED(4,"未到期"), NOT_EXPIRED(4,"未到期"),
RETURN(5, "已退还"), RETURN(5, "已退还"),
INVALID(6, "失效"), INVALID(6, "失效"),
FREEZE(7, "冻结(结算单审核过程中)"),
; ;


public static EnumBillRentStatus getEnum(Integer code) { public static EnumBillRentStatus getEnum(Integer code) {


+ 2
- 1
mallinkService/src/main/java/com/iformall/enums/EnumBillType.java Просмотреть файл

@@ -13,7 +13,8 @@ public enum EnumBillType {
WATER(4, "水费"), WATER(4, "水费"),
POWER(5, "电费"), POWER(5, "电费"),
ROUTINE(6, "其他"), ROUTINE(6, "其他"),
AIR_CONDITIONING(7, "空调费")
AIR_CONDITIONING(7, "空调费"),
OTHER_DEPOSIT(8, "其他押金")
; ;


public static EnumBillType getEnum(Integer code) { public static EnumBillType getEnum(Integer code) {


+ 2
- 1
mallinkService/src/main/java/com/iformall/mapper/WxBillSettleBillMapper.java Просмотреть файл

@@ -1,6 +1,7 @@
package com.iformall.mapper; package com.iformall.mapper;


import com.iformall.common.CommonMapper; import com.iformall.common.CommonMapper;
import com.iformall.domain.po.WxBillSettle;
import com.iformall.domain.po.WxBillSettleBill; import com.iformall.domain.po.WxBillSettleBill;
import java.util.List; import java.util.List;


@@ -13,5 +14,5 @@ public interface WxBillSettleBillMapper extends CommonMapper<WxBillSettleBill, L


void update(WxBillSettleBill record); void update(WxBillSettleBill record);


void delBySettleId(WxBillSettle record);
} }

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

@@ -4,16 +4,19 @@ import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;
import com.iformall.common.ResultData; import com.iformall.common.ResultData;
import com.iformall.domain.po.MallUserInfo;
import com.iformall.domain.po.WxBillSettle;
import com.iformall.mapper.WxBillSettleMapper;
import com.iformall.domain.po.*;
import com.iformall.enums.EnumBillRentStatus;
import com.iformall.enums.EnumBillType;
import com.iformall.mapper.*;
import com.iformall.service.WxBillSettleService; import com.iformall.service.WxBillSettleService;
import com.iformall.service.WxFlowService; import com.iformall.service.WxFlowService;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.List;


/** /**
* @author luozukai * @author luozukai
@@ -25,6 +28,22 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
private WxBillSettleMapper wxBillSettleMapper; private WxBillSettleMapper wxBillSettleMapper;
@Autowired @Autowired
private WxFlowService wxFlowService; private WxFlowService wxFlowService;
@Autowired
private WxBillSettleBillMapper wxBillSettleBillMapper;
@Autowired
private WxBillRentMapper wxBillRentMapper;
@Autowired
private WxBillDepositMapper wxBillDepositMapper;
@Autowired
private WxBillPropertyMapper wxBillPropertyMapper;
@Autowired
private WxBillDailyMapper wxBillDailyMapper;
@Autowired
private WxBillOtherMapper wxBillOtherMapper;
@Autowired
private WxBillPropertyDepositMapper wxBillPropertyDepositMapper;
@Autowired
private WxBillOtherDepositMapper wxBillOtherDepositMapper;


@Override @Override
public PageInfo<WxBillSettle> listAsPage(WxBillSettle record, Integer pageIndex, Integer pageSize) { public PageInfo<WxBillSettle> listAsPage(WxBillSettle record, Integer pageIndex, Integer pageSize) {
@@ -36,16 +55,73 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
return wxBillSettleMapper.selectByPrimaryKey(id); return wxBillSettleMapper.selectByPrimaryKey(id);
} }


public void updateFreeze(List<WxBillSettleBill> billList){
for (WxBillSettleBill bill:billList) {
if(EnumBillType.RENT.getCode().equals(bill.getBillType())) {
WxBillRent wxBillRent = new WxBillRent();
wxBillRent.setId(bill.getBillId());
wxBillRent.setStatus(EnumBillRentStatus.FREEZE.getCode());
wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent);
}else if(EnumBillType.DEPOSIT.getCode().equals(bill.getBillType())) {
WxBillDeposit wxBillRent = new WxBillDeposit();
wxBillRent.setId(bill.getBillId());
wxBillRent.setStatus(EnumBillRentStatus.FREEZE.getCode());
wxBillDepositMapper.updateByPrimaryKeySelective(wxBillRent);
}else if(EnumBillType.PROPERTY.getCode().equals(bill.getBillType())) {
WxBillProperty wxBillRent = new WxBillProperty();
wxBillRent.setId(bill.getBillId());
wxBillRent.setStatus(EnumBillRentStatus.FREEZE.getCode());
wxBillPropertyMapper.updateByPrimaryKeySelective(wxBillRent);

WxBillPropertyDeposit propertyDeposit = new WxBillPropertyDeposit();
propertyDeposit.setId(bill.getBillId());
propertyDeposit.setStatus(EnumBillRentStatus.FREEZE.getCode());
wxBillPropertyDepositMapper.updateByPrimaryKeySelective(propertyDeposit);
}else if(EnumBillType.ROUTINE.getCode().equals(bill.getBillType())) {
WxBillOther wxBillRent = new WxBillOther();
wxBillRent.setId(bill.getBillId());
wxBillRent.setStatus(EnumBillRentStatus.FREEZE.getCode());
wxBillOtherMapper.updateByPrimaryKeySelective(wxBillRent);
}else if(EnumBillType.OTHER_DEPOSIT.getCode().equals(bill.getBillType())) {
WxBillOtherDeposit wxBillRent = new WxBillOtherDeposit();
wxBillRent.setId(bill.getBillId());
wxBillRent.setStatus(EnumBillRentStatus.FREEZE.getCode());
wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillRent);
}else{
WxBillDaily wxBillRent = new WxBillDaily();
wxBillRent.setId(bill.getBillId());
wxBillRent.setStatus(EnumBillRentStatus.FREEZE.getCode());
wxBillDailyMapper.updateByPrimaryKeySelective(wxBillRent);
}
}
}

@Override @Override
@Transactional @Transactional
public ResultData saveOrUpdate(WxBillSettle record, MallUserInfo userInfo) { public ResultData saveOrUpdate(WxBillSettle record, MallUserInfo userInfo) {
final IdWorker idWorker = IdWorker.get();
if (record.getId() == null) { if (record.getId() == null) {
final IdWorker idWorker = IdWorker.get();
record.setId(idWorker.nextId()); record.setId(idWorker.nextId());
wxBillSettleMapper.insertSelective(record); wxBillSettleMapper.insertSelective(record);
} else {
}else{
wxBillSettleMapper.updateByPrimaryKeySelective(record); wxBillSettleMapper.updateByPrimaryKeySelective(record);
} }

wxBillSettleBillMapper.delBySettleId(record);
//保存中间表
for (WxBillSettleBill bill:record.getReceiveBillIds()) {
bill.setId(idWorker.nextId());
bill.setSettleId(record.getId());
bill.setTenantId(record.getTenantId());
wxBillSettleBillMapper.insertSelective(bill);
}

//改为冻结状态
if (record.getFlowParams() != null && record.getFlowParams().size() > 0) {
updateFreeze(record.getReceiveBillIds());
updateFreeze(record.getPayBillIds());
}

//启动审批流 //启动审批流
record.getFlowParams().put("businessId",record.getId()); record.getFlowParams().put("businessId",record.getId());
if (record.getFlowParams() != null && record.getFlowParams().size() > 0) { if (record.getFlowParams() != null && record.getFlowParams().size() > 0) {


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

@@ -41,6 +41,9 @@
<include refid="dynamicWhereConditions"/> <include refid="dynamicWhereConditions"/>
</select> </select>


<update id="delBySettleId" parameterType="com.iformall.domain.po.WxBillSettle">
delete from wx_bill_settle_bill where settle_id = #{id}
</update>


</mapper> </mapper>



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