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

[修改][结算单][修改业态分析]

release_toaliyun_real
luozukai 6 лет назад
Родитель
Сommit
f518a74c25
3 измененных файлов: 108 добавлений и 1 удалений
  1. +2
    -1
      mallinkService/src/main/java/com/iformall/enums/EnumBillAction.java
  2. +98
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java
  3. +8
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java

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

@@ -13,7 +13,8 @@ public enum EnumBillAction {
DEPOSIT_RETURN(5, "押金退款"), DEPOSIT_RETURN(5, "押金退款"),
DEPOSIT_MODIFY(6, "押金变更"), DEPOSIT_MODIFY(6, "押金变更"),
IMPORT_PAY(6, "导入缴费"), IMPORT_PAY(6, "导入缴费"),
UPDATE_LATE_PAY_MONEY(7, "滞纳金变更");
UPDATE_LATE_PAY_MONEY(7, "滞纳金变更"),
UPDATE_SETTLE_MONEY(8, "结算单清算");


public static EnumBillAction getEnum(Integer code) { public static EnumBillAction getEnum(Integer code) {
for (EnumBillAction value : values()) { for (EnumBillAction value : values()) {


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

@@ -58,6 +58,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
private WxMerchantSubsidyMapper wxMerchantSubsidyMapper; private WxMerchantSubsidyMapper wxMerchantSubsidyMapper;
@Autowired @Autowired
private ExcelService excelService; private ExcelService excelService;
@Autowired
private WxBillActionMapper wxBillActionMapper;



@Override @Override
public PageInfo<WxBillSettle> listAsPage(WxBillSettle record, Integer pageIndex, Integer pageSize) { public PageInfo<WxBillSettle> listAsPage(WxBillSettle record, Integer pageIndex, Integer pageSize) {
@@ -136,6 +139,21 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
return billSettle; return billSettle;
} }


public void addBillAction(Long billId,Long money){
final IdWorker idWorker = IdWorker.get();
WxBillAction billAction = new WxBillAction();
billAction.setId(idWorker.nextId());
billAction.setCreatetime(new Date());
billAction.setUserName("系统端");
billAction.setAction(EnumBillAction.UPDATE_SETTLE_MONEY.getCode());
billAction.setBillId(billId);
BigDecimal newmoney = new BigDecimal(money).divide(new BigDecimal(100),2,BigDecimal.ROUND_HALF_UP);
billAction.setDetails("通过结算单清算"+newmoney.toString()+"元");
billAction.setUpdatetime(new Date());
billAction.setPayDate(new Date());
wxBillActionMapper.insertSelective(billAction);
}

@Override @Override
public void updateFreezeOrStatus(List<WxBillSettleBill> billList,Integer freezeStatus,Integer status){ public void updateFreezeOrStatus(List<WxBillSettleBill> billList,Integer freezeStatus,Integer status){
//1租金2押金3物业4日常费用6其他8补贴 //1租金2押金3物业4日常费用6其他8补贴
@@ -148,6 +166,14 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
wxBillRent.setStatus(status); wxBillRent.setStatus(status);
wxBillRent.setPayDate(new Date()); wxBillRent.setPayDate(new Date());
} }
if(EnumBillRentStatus.PAID.getCode().equals(status)){
WxBillRent dbBill = wxBillRentMapper.selectByPrimaryKey(wxBillRent.getId());
if(dbBill!=null) {
wxBillRent.setPay(dbBill.getOwe());
wxBillRent.setPayDate(new Date());
addBillAction(bill.getBillId(), dbBill.getOwe());
}
}
wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent); wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent);
}else if(EnumBillType.DEPOSIT.getCode().equals(bill.getBillType())) { }else if(EnumBillType.DEPOSIT.getCode().equals(bill.getBillType())) {
WxBillDeposit wxBillRent = new WxBillDeposit(); WxBillDeposit wxBillRent = new WxBillDeposit();
@@ -157,6 +183,14 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
wxBillRent.setStatus(status); wxBillRent.setStatus(status);
wxBillRent.setPayDate(new Date()); wxBillRent.setPayDate(new Date());
} }
if(EnumBillRentStatus.PAID.getCode().equals(status)){
WxBillDeposit dbBill = wxBillDepositMapper.selectByPrimaryKey(wxBillRent.getId());
if(dbBill!=null) {
wxBillRent.setPay(dbBill.getOwe());
wxBillRent.setPayDate(new Date());
addBillAction(bill.getBillId(), dbBill.getOwe());
}
}
wxBillDepositMapper.updateByPrimaryKeySelective(wxBillRent); wxBillDepositMapper.updateByPrimaryKeySelective(wxBillRent);


WxBillOtherDeposit wxBillOtherDeposit = new WxBillOtherDeposit(); WxBillOtherDeposit wxBillOtherDeposit = new WxBillOtherDeposit();
@@ -166,6 +200,14 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
wxBillOtherDeposit.setStatus(status); wxBillOtherDeposit.setStatus(status);
wxBillOtherDeposit.setPayDate(new Date()); wxBillOtherDeposit.setPayDate(new Date());
} }
if(EnumBillRentStatus.PAID.getCode().equals(status)){
WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectByPrimaryKey(wxBillRent.getId());
if(dbBill!=null) {
wxBillOtherDeposit.setPay(dbBill.getOwe());
wxBillRent.setPayDate(new Date());
addBillAction(bill.getBillId(), dbBill.getOwe());
}
}
wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillOtherDeposit); wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillOtherDeposit);


WxBillPropertyDeposit propertyDeposit = new WxBillPropertyDeposit(); WxBillPropertyDeposit propertyDeposit = new WxBillPropertyDeposit();
@@ -175,6 +217,14 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
wxBillRent.setStatus(status); wxBillRent.setStatus(status);
wxBillRent.setPayDate(new Date()); wxBillRent.setPayDate(new Date());
} }
if(EnumBillRentStatus.PAID.getCode().equals(status)){
WxBillPropertyDeposit dbBill = wxBillPropertyDepositMapper.selectByPrimaryKey(wxBillRent.getId());
if(dbBill!=null) {
propertyDeposit.setPay(dbBill.getOwe());
wxBillRent.setPayDate(new Date());
addBillAction(bill.getBillId(), dbBill.getOwe());
}
}
wxBillPropertyDepositMapper.updateByPrimaryKeySelective(propertyDeposit); wxBillPropertyDepositMapper.updateByPrimaryKeySelective(propertyDeposit);


}else if(EnumBillType.PROPERTY.getCode().equals(bill.getBillType())) { }else if(EnumBillType.PROPERTY.getCode().equals(bill.getBillType())) {
@@ -185,6 +235,14 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
wxBillRent.setStatus(status); wxBillRent.setStatus(status);
wxBillRent.setPayDate(new Date()); wxBillRent.setPayDate(new Date());
} }
if(EnumBillRentStatus.PAID.getCode().equals(status)){
WxBillProperty dbBill = wxBillPropertyMapper.selectByPrimaryKey(wxBillRent.getId());
if(dbBill!=null) {
wxBillRent.setPay(dbBill.getOwe());
wxBillRent.setPayDate(new Date());
addBillAction(bill.getBillId(), dbBill.getOwe());
}
}
wxBillPropertyMapper.updateByPrimaryKeySelective(wxBillRent); wxBillPropertyMapper.updateByPrimaryKeySelective(wxBillRent);


WxBillPropertyDeposit propertyDeposit = new WxBillPropertyDeposit(); WxBillPropertyDeposit propertyDeposit = new WxBillPropertyDeposit();
@@ -194,6 +252,14 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
wxBillRent.setStatus(status); wxBillRent.setStatus(status);
wxBillRent.setPayDate(new Date()); wxBillRent.setPayDate(new Date());
} }
if(EnumBillRentStatus.PAID.getCode().equals(status)){
WxBillPropertyDeposit dbBill = wxBillPropertyDepositMapper.selectByPrimaryKey(wxBillRent.getId());
if(dbBill!=null) {
propertyDeposit.setPay(dbBill.getOwe());
wxBillRent.setPayDate(new Date());
addBillAction(bill.getBillId(), dbBill.getOwe());
}
}
wxBillPropertyDepositMapper.updateByPrimaryKeySelective(propertyDeposit); wxBillPropertyDepositMapper.updateByPrimaryKeySelective(propertyDeposit);
}else if(EnumBillType.ROUTINE.getCode().equals(bill.getBillType())) { }else if(EnumBillType.ROUTINE.getCode().equals(bill.getBillType())) {
WxBillOther wxBillRent = new WxBillOther(); WxBillOther wxBillRent = new WxBillOther();
@@ -203,6 +269,14 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
wxBillRent.setStatus(status); wxBillRent.setStatus(status);
wxBillRent.setPayDate(new Date()); wxBillRent.setPayDate(new Date());
} }
if(EnumBillRentStatus.PAID.getCode().equals(status)){
WxBillOther dbBill = wxBillOtherMapper.selectByPrimaryKey(wxBillRent.getId());
if(dbBill!=null) {
wxBillRent.setPay(dbBill.getOwe());
wxBillRent.setPayDate(new Date());
addBillAction(bill.getBillId(), dbBill.getOwe());
}
}
wxBillOtherMapper.updateByPrimaryKeySelective(wxBillRent); wxBillOtherMapper.updateByPrimaryKeySelective(wxBillRent);
}else if(EnumBillType.OTHER_DEPOSIT.getCode().equals(bill.getBillType())) { }else if(EnumBillType.OTHER_DEPOSIT.getCode().equals(bill.getBillType())) {
WxBillOtherDeposit wxBillRent = new WxBillOtherDeposit(); WxBillOtherDeposit wxBillRent = new WxBillOtherDeposit();
@@ -212,6 +286,14 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
wxBillRent.setStatus(status); wxBillRent.setStatus(status);
wxBillRent.setPayDate(new Date()); wxBillRent.setPayDate(new Date());
} }
if(EnumBillRentStatus.PAID.getCode().equals(status)){
WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectByPrimaryKey(wxBillRent.getId());
if(dbBill!=null) {
wxBillRent.setPay(dbBill.getOwe());
wxBillRent.setPayDate(new Date());
addBillAction(bill.getBillId(), dbBill.getOwe());
}
}
wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillRent); wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillRent);


WxMerchantSubsidy wxMerchantSubsidy = new WxMerchantSubsidy(); WxMerchantSubsidy wxMerchantSubsidy = new WxMerchantSubsidy();
@@ -229,6 +311,14 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
wxBillRent.setStatus(status); wxBillRent.setStatus(status);
wxBillRent.setPayDate(new Date()); wxBillRent.setPayDate(new Date());
} }
if(EnumBillRentStatus.PAID.getCode().equals(status)){
WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectByPrimaryKey(wxBillRent.getId());
if(dbBill!=null) {
wxBillRent.setPay(dbBill.getOwe());
wxBillRent.setPayDate(new Date());
addBillAction(bill.getBillId(), dbBill.getOwe());
}
}
wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillRent); wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillRent);
}else{ }else{
WxBillDaily wxBillRent = new WxBillDaily(); WxBillDaily wxBillRent = new WxBillDaily();
@@ -238,6 +328,14 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
wxBillRent.setStatus(status); wxBillRent.setStatus(status);
wxBillRent.setPayDate(new Date()); wxBillRent.setPayDate(new Date());
} }
if(EnumBillRentStatus.PAID.getCode().equals(status)){
WxBillDaily dbBill = wxBillDailyMapper.selectByPrimaryKey(wxBillRent.getId());
if(dbBill!=null) {
wxBillRent.setPay(dbBill.getOwe());
wxBillRent.setPayDate(new Date());
addBillAction(bill.getBillId(), dbBill.getOwe());
}
}
wxBillDailyMapper.updateByPrimaryKeySelective(wxBillRent); wxBillDailyMapper.updateByPrimaryKeySelective(wxBillRent);
} }
} }


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

@@ -221,6 +221,14 @@ public class WxFlowServiceImpl implements WxFlowService {
wxBillAll.setNewPrice(newPrice); wxBillAll.setNewPrice(newPrice);
} }
wxBillAllService.updateReceivePay(wxBillAll, user); wxBillAllService.updateReceivePay(wxBillAll, user);

//账单修改金额,解冻
List<WxBillSettleBill> billList = new ArrayList<>();
WxBillSettleBill settleBill = new WxBillSettleBill();
settleBill.setBillType(billType);
settleBill.setBillId(businessId);
billList.add(settleBill);
wxBillSettleService.updateFreezeOrStatus(billList,EnumFreezeType.DEF.getCode(),null);
}else if(EnumRentContractAppStatus.APPLYING.getCode().intValue() == applyStatus.intValue()) { }else if(EnumRentContractAppStatus.APPLYING.getCode().intValue() == applyStatus.intValue()) {
//账单修改金额,冻结 //账单修改金额,冻结
List<WxBillSettleBill> billList = new ArrayList<>(); List<WxBillSettleBill> billList = new ArrayList<>();


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