winter пре 1 година
родитељ
комит
49f3e0a498
2 измењених фајлова са 8 додато и 4 уклоњено
  1. +5
    -1
      mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java
  2. +3
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java

+ 5
- 1
mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java Прегледај датотеку

@@ -360,12 +360,16 @@ public class WxBillAllHelper {
* 那是之前的账单,不处理。
* @param merchant
*/
public boolean billEndCalcute(Integer decimalSize,Date endTime,WxAllBill bill,WxBillAction action, boolean isAllReturn) {
public boolean billEndCalcute(Integer decimalSize,Date endTime,WxAllBill bill,WxBillAction action) {
String endTimeStr = DateUtils.date2String(endTime,DateUtils.DATE_TIME_PATTERN);
boolean isUpdate = false;
action.setBillId(bill.getId());
action.setBillType(bill.getBillType());
String oldReceivePay = bill.getReceivePay();
boolean isAllReturn = false;
if (EnumBillAllType.getEnum(bill.getBillType()).isDeposit()) {
isAllReturn = true;
}
//如果账单的开始时间在结束时间之后,已经支付了的要退回。
if (!bill.getStarttime().before(endTime)) {
bill.setReceivePay("0");


+ 3
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java Прегледај датотеку

@@ -562,7 +562,7 @@ public class WxAllBillServiceImpl extends WxBillBaseService implements WxAllBill
for (int i = 0 ; i < brList.size() ; i ++ ) {
WxAllBill brent = brList.get(i);
WxBillAction action = new WxBillAction();
boolean isUpdate = wxBillAllHelper.billEndCalcute(rentContract.getDecimalSize(),rentContract.getEndContractTime(), brent, action, false);
boolean isUpdate = wxBillAllHelper.billEndCalcute(rentContract.getDecimalSize(),rentContract.getEndContractTime(), brent, action);
if (isUpdate) {
realRentList.add(brent);
actionList.add(action);
@@ -603,7 +603,7 @@ public class WxAllBillServiceImpl extends WxBillBaseService implements WxAllBill
for (int i = 0 ; i < brList.size() ; i ++ ) {
WxAllBill brent = brList.get(i);
WxBillAction action = new WxBillAction();
boolean isUpdate = wxBillAllHelper.billEndCalcute(propertyContract.getDecimalSize() ,propertyContract.getEndContractTime(), brent, action, false);
boolean isUpdate = wxBillAllHelper.billEndCalcute(propertyContract.getDecimalSize() ,propertyContract.getEndContractTime(), brent, action);
if (isUpdate) {
realRentList.add(brent);
actionList.add(action);
@@ -642,7 +642,7 @@ public class WxAllBillServiceImpl extends WxBillBaseService implements WxAllBill
for (int i = 0 ; i < brList.size() ; i ++ ) {
WxAllBill brent = brList.get(i);
WxBillAction action = new WxBillAction();
boolean isUpdate = wxBillAllHelper.billEndCalcute(2,current, brent, action, false);
boolean isUpdate = wxBillAllHelper.billEndCalcute(2,current, brent, action);
if (isUpdate) {
realRentList.add(brent);
actionList.add(action);


Loading…
Откажи
Сачувај