소스 검색

fix

release_toaliyun_real
winter 1 년 전
부모
커밋
218222f476
2개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java 파일 보기

@@ -1155,7 +1155,7 @@ public class WxBillAllHelper {
}else if (bill.getStarttime().before(endTime) && bill.getEndtime().after(endTime)){
int realDays = DateUtils.daysBetween(bill.getStarttime(),endTime);
int billDays = DateUtils.daysBetween(bill.getStarttime(),bill.getEndtime());
String newReceivePay = new BigDecimal(bill.getReceivePay()).multiply(new BigDecimal(realDays)).divide(new BigDecimal(billDays)).setScale(decimalSize,RoundingMode.HALF_UP).toPlainString();
String newReceivePay = new BigDecimal(bill.getReceivePay()).multiply(new BigDecimal(realDays)).divide(new BigDecimal(billDays),decimalSize,RoundingMode.HALF_UP).toPlainString();
if (isAllReturn) {
newReceivePay = "0";
}


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java 파일 보기

@@ -868,7 +868,7 @@ public class WxBillRentServiceImpl extends WxBillBaseService implements WxBillRe
this.addBillAction(ba, user);
}
}
@Override
public void completeBill(EnumBillStatus status, WxMerchant wxMerchant, MallUserInfo user) {
WxBillRent bill = new WxBillRent();


불러오는 중...
취소
저장