Parcourir la source

[修改][结算单][修改跳点率计算]

release_toaliyun_real
luozukai il y a 6 ans
Parent
révision
ae3b56bbe4
2 fichiers modifiés avec 21 ajouts et 21 suppressions
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillSettleController.java
  2. +20
    -20
      mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillSettleController.java Voir le fichier

@@ -60,7 +60,7 @@ public class WxBillSettleController extends BaseController {
@SystemControllerLog(description = "账单管理-结算单-id查找") @SystemControllerLog(description = "账单管理-结算单-id查找")
public ResultData findById(Long id) { public ResultData findById(Long id) {
logger.debug("[" + getIpAddr() + "] WxBillSettleController::findById"); logger.debug("[" + getIpAddr() + "] WxBillSettleController::findById");
return new ResultData(Result.SUCCESS, "查询成功", wxBillSettleService.getById(id, EnumFilterSettle.NO.getCode()));
return new ResultData(Result.SUCCESS, "查询成功", wxBillSettleService.getById(id, EnumFilterSettle.YES.getCode()));
} }


@PostMapping("addOrUpdate") @PostMapping("addOrUpdate")


+ 20
- 20
mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java Voir le fichier

@@ -170,9 +170,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
if(EnumBillRentStatus.PAID.getCode().equals(status)){ if(EnumBillRentStatus.PAID.getCode().equals(status)){
WxBillRent dbBill = wxBillRentMapper.selectByPrimaryKey(wxBillRent.getId()); WxBillRent dbBill = wxBillRentMapper.selectByPrimaryKey(wxBillRent.getId());
if(dbBill!=null) { if(dbBill!=null) {
wxBillRent.setPay(dbBill.getOwe());
wxBillRent.setPay(dbBill.getReceivePay());
wxBillRent.setPayDate(new Date()); wxBillRent.setPayDate(new Date());
addBillAction(bill.getBillId(), dbBill.getOwe());
addBillAction(bill.getBillId(), dbBill.getReceivePay());
} }
} }
wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent); wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent);
@@ -187,9 +187,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
if(EnumBillRentStatus.PAID.getCode().equals(status)){ if(EnumBillRentStatus.PAID.getCode().equals(status)){
WxBillDeposit dbBill = wxBillDepositMapper.selectByPrimaryKey(wxBillRent.getId()); WxBillDeposit dbBill = wxBillDepositMapper.selectByPrimaryKey(wxBillRent.getId());
if(dbBill!=null) { if(dbBill!=null) {
wxBillRent.setPay(dbBill.getOwe());
wxBillRent.setPay(dbBill.getReceivePay());
wxBillRent.setPayDate(new Date()); wxBillRent.setPayDate(new Date());
addBillAction(bill.getBillId(), dbBill.getOwe());
addBillAction(bill.getBillId(), dbBill.getReceivePay());
} }
} }
wxBillDepositMapper.updateByPrimaryKeySelective(wxBillRent); wxBillDepositMapper.updateByPrimaryKeySelective(wxBillRent);
@@ -204,9 +204,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
if(EnumBillRentStatus.PAID.getCode().equals(status)){ if(EnumBillRentStatus.PAID.getCode().equals(status)){
WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectByPrimaryKey(wxBillRent.getId()); WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectByPrimaryKey(wxBillRent.getId());
if(dbBill!=null) { if(dbBill!=null) {
wxBillOtherDeposit.setPay(dbBill.getOwe());
wxBillOtherDeposit.setPay(dbBill.getReceivePay());
wxBillRent.setPayDate(new Date()); wxBillRent.setPayDate(new Date());
addBillAction(bill.getBillId(), dbBill.getOwe());
addBillAction(bill.getBillId(), dbBill.getReceivePay());
} }
} }
wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillOtherDeposit); wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillOtherDeposit);
@@ -221,9 +221,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
if(EnumBillRentStatus.PAID.getCode().equals(status)){ if(EnumBillRentStatus.PAID.getCode().equals(status)){
WxBillPropertyDeposit dbBill = wxBillPropertyDepositMapper.selectByPrimaryKey(wxBillRent.getId()); WxBillPropertyDeposit dbBill = wxBillPropertyDepositMapper.selectByPrimaryKey(wxBillRent.getId());
if(dbBill!=null) { if(dbBill!=null) {
propertyDeposit.setPay(dbBill.getOwe());
propertyDeposit.setPay(dbBill.getReceivePay());
wxBillRent.setPayDate(new Date()); wxBillRent.setPayDate(new Date());
addBillAction(bill.getBillId(), dbBill.getOwe());
addBillAction(bill.getBillId(), dbBill.getReceivePay());
} }
} }
wxBillPropertyDepositMapper.updateByPrimaryKeySelective(propertyDeposit); wxBillPropertyDepositMapper.updateByPrimaryKeySelective(propertyDeposit);
@@ -239,9 +239,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
if(EnumBillRentStatus.PAID.getCode().equals(status)){ if(EnumBillRentStatus.PAID.getCode().equals(status)){
WxBillProperty dbBill = wxBillPropertyMapper.selectByPrimaryKey(wxBillRent.getId()); WxBillProperty dbBill = wxBillPropertyMapper.selectByPrimaryKey(wxBillRent.getId());
if(dbBill!=null) { if(dbBill!=null) {
wxBillRent.setPay(dbBill.getOwe());
wxBillRent.setPay(dbBill.getReceivePay());
wxBillRent.setPayDate(new Date()); wxBillRent.setPayDate(new Date());
addBillAction(bill.getBillId(), dbBill.getOwe());
addBillAction(bill.getBillId(), dbBill.getReceivePay());
} }
} }
wxBillPropertyMapper.updateByPrimaryKeySelective(wxBillRent); wxBillPropertyMapper.updateByPrimaryKeySelective(wxBillRent);
@@ -256,9 +256,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
if(EnumBillRentStatus.PAID.getCode().equals(status)){ if(EnumBillRentStatus.PAID.getCode().equals(status)){
WxBillPropertyDeposit dbBill = wxBillPropertyDepositMapper.selectByPrimaryKey(wxBillRent.getId()); WxBillPropertyDeposit dbBill = wxBillPropertyDepositMapper.selectByPrimaryKey(wxBillRent.getId());
if(dbBill!=null) { if(dbBill!=null) {
propertyDeposit.setPay(dbBill.getOwe());
propertyDeposit.setPay(dbBill.getReceivePay());
wxBillRent.setPayDate(new Date()); wxBillRent.setPayDate(new Date());
addBillAction(bill.getBillId(), dbBill.getOwe());
addBillAction(bill.getBillId(), dbBill.getReceivePay());
} }
} }
wxBillPropertyDepositMapper.updateByPrimaryKeySelective(propertyDeposit); wxBillPropertyDepositMapper.updateByPrimaryKeySelective(propertyDeposit);
@@ -273,9 +273,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
if(EnumBillRentStatus.PAID.getCode().equals(status)){ if(EnumBillRentStatus.PAID.getCode().equals(status)){
WxBillOther dbBill = wxBillOtherMapper.selectByPrimaryKey(wxBillRent.getId()); WxBillOther dbBill = wxBillOtherMapper.selectByPrimaryKey(wxBillRent.getId());
if(dbBill!=null) { if(dbBill!=null) {
wxBillRent.setPay(dbBill.getOwe());
wxBillRent.setPay(dbBill.getReceivePay());
wxBillRent.setPayDate(new Date()); wxBillRent.setPayDate(new Date());
addBillAction(bill.getBillId(), dbBill.getOwe());
addBillAction(bill.getBillId(), dbBill.getReceivePay());
} }
} }
wxBillOtherMapper.updateByPrimaryKeySelective(wxBillRent); wxBillOtherMapper.updateByPrimaryKeySelective(wxBillRent);
@@ -290,9 +290,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
if(EnumBillRentStatus.PAID.getCode().equals(status)){ if(EnumBillRentStatus.PAID.getCode().equals(status)){
WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectByPrimaryKey(wxBillRent.getId()); WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectByPrimaryKey(wxBillRent.getId());
if(dbBill!=null) { if(dbBill!=null) {
wxBillRent.setPay(dbBill.getOwe());
wxBillRent.setPay(dbBill.getReceivePay());
wxBillRent.setPayDate(new Date()); wxBillRent.setPayDate(new Date());
addBillAction(bill.getBillId(), dbBill.getOwe());
addBillAction(bill.getBillId(), dbBill.getReceivePay());
} }
} }
wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillRent); wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillRent);
@@ -315,9 +315,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
if(EnumBillRentStatus.PAID.getCode().equals(status)){ if(EnumBillRentStatus.PAID.getCode().equals(status)){
WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectByPrimaryKey(wxBillRent.getId()); WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectByPrimaryKey(wxBillRent.getId());
if(dbBill!=null) { if(dbBill!=null) {
wxBillRent.setPay(dbBill.getOwe());
wxBillRent.setPay(dbBill.getReceivePay());
wxBillRent.setPayDate(new Date()); wxBillRent.setPayDate(new Date());
addBillAction(bill.getBillId(), dbBill.getOwe());
addBillAction(bill.getBillId(), dbBill.getReceivePay());
} }
} }
wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillRent); wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillRent);
@@ -332,9 +332,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
if(EnumBillRentStatus.PAID.getCode().equals(status)){ if(EnumBillRentStatus.PAID.getCode().equals(status)){
WxBillDaily dbBill = wxBillDailyMapper.selectByPrimaryKey(wxBillRent.getId()); WxBillDaily dbBill = wxBillDailyMapper.selectByPrimaryKey(wxBillRent.getId());
if(dbBill!=null) { if(dbBill!=null) {
wxBillRent.setPay(dbBill.getOwe());
wxBillRent.setPay(dbBill.getReceivePay());
wxBillRent.setPayDate(new Date()); wxBillRent.setPayDate(new Date());
addBillAction(bill.getBillId(), dbBill.getOwe());
addBillAction(bill.getBillId(), dbBill.getReceivePay());
} }
} }
wxBillDailyMapper.updateByPrimaryKeySelective(wxBillRent); wxBillDailyMapper.updateByPrimaryKeySelective(wxBillRent);


Chargement…
Annuler
Enregistrer