diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java
index a9c90a83e..e457a77f8 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java
@@ -187,7 +187,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
if(EnumBillRentStatus.PAID.getCode().equals(status)){
WxBillDeposit dbBill = wxBillDepositMapper.selectByPrimaryKey(wxBillRent.getId());
if(dbBill!=null) {
- wxBillRent.setPay(dbBill.getOwe());
+ wxBillRent.setPay(dbBill.getReceivePay()); //押金是ReceivePay
wxBillRent.setPayDate(new Date());
addBillAction(bill.getBillId(), dbBill.getOwe());
}
@@ -204,7 +204,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
if(EnumBillRentStatus.PAID.getCode().equals(status)){
WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectByPrimaryKey(wxBillRent.getId());
if(dbBill!=null) {
- wxBillOtherDeposit.setPay(dbBill.getOwe());
+ wxBillOtherDeposit.setPay(dbBill.getReceivePay());
wxBillOtherDeposit.setPayDate(new Date());
addBillAction(bill.getBillId(), dbBill.getOwe());
}
@@ -221,7 +221,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
if(EnumBillRentStatus.PAID.getCode().equals(status)){
WxBillPropertyDeposit dbBill = wxBillPropertyDepositMapper.selectByPrimaryKey(wxBillRent.getId());
if(dbBill!=null) {
- propertyDeposit.setPay(dbBill.getOwe());
+ propertyDeposit.setPay(dbBill.getReceivePay());
propertyDeposit.setPayDate(new Date());
addBillAction(bill.getBillId(), dbBill.getOwe());
}
@@ -256,7 +256,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
if(EnumBillRentStatus.PAID.getCode().equals(status)){
WxBillPropertyDeposit dbBill = wxBillPropertyDepositMapper.selectByPrimaryKey(wxBillRent.getId());
if(dbBill!=null) {
- propertyDeposit.setPay(dbBill.getOwe());
+ propertyDeposit.setPay(dbBill.getReceivePay());
propertyDeposit.setPayDate(new Date());
addBillAction(bill.getBillId(), dbBill.getOwe());
}
@@ -290,7 +290,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
if(EnumBillRentStatus.PAID.getCode().equals(status)){
WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectByPrimaryKey(wxBillRent.getId());
if(dbBill!=null) {
- wxBillRent.setPay(dbBill.getOwe());
+ wxBillRent.setPay(dbBill.getReceivePay());
wxBillRent.setPayDate(new Date());
addBillAction(bill.getBillId(), dbBill.getOwe());
}
@@ -315,7 +315,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
if(EnumBillRentStatus.PAID.getCode().equals(status)){
WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectByPrimaryKey(wxBillRent.getId());
if(dbBill!=null) {
- wxBillRent.setPay(dbBill.getOwe());
+ wxBillRent.setPay(dbBill.getReceivePay());
wxBillRent.setPayDate(new Date());
addBillAction(bill.getBillId(), dbBill.getOwe());
}
@@ -364,6 +364,10 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
public ResultData saveOrUpdate(WxBillSettle record, MallUserInfo userInfo) {
final IdWorker idWorker = IdWorker.get();
+ //检查账单是否存在其他结算单中
+
+
+
if (record.getFlowParams() == null || record.getFlowParams().size() == 0) {
record.setStatus(EnumSettleStatus.NOT_FINISH.getCode());
//选择的账单改为已结清
@@ -434,3 +438,4 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
}
}
+
diff --git a/mallinkService/src/main/resources/mapper/WxBillSettleBillMapper.xml b/mallinkService/src/main/resources/mapper/WxBillSettleBillMapper.xml
index dc34c0ed3..91280afb1 100644
--- a/mallinkService/src/main/resources/mapper/WxBillSettleBillMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxBillSettleBillMapper.xml
@@ -20,8 +20,8 @@
- `id`,`tenant_id`,`settle_id`,`type`,`bill_id`,`bill_type`
- ,`createtime`,`updatetime`
+ `id`,`tenant_id`,`settle_id`,`type`,`bill_id`,`bill_type`
+ ,`createtime`,`updatetime`
@@ -56,10 +56,10 @@
bill_type,need_pay,
- owe receive_pay
+ receive_pay
- receive_pay
+ owe receive_pay
,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type,starttime,endtime from
@@ -73,10 +73,10 @@
bill_type,need_pay,
- owe receive_pay
+ receive_pay
- receive_pay
+ owe receive_pay
,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type,starttime,endtime from
@@ -101,10 +101,10 @@
need_pay,
- owe receive_pay
+ receive_pay
- receive_pay
+ owe receive_pay
,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type,starttime,endtime from wx_bill_other_deposit
@@ -126,3 +126,4 @@
+