소스 검색

Merge remote-tracking branch 'origin/master'

maxianghua 4 년 전
부모
커밋
49c5a35f03
1개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 2 2
      ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseAgreementServiceImpl.java

+ 2 - 2
ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseAgreementServiceImpl.java

@@ -479,7 +479,7 @@ public class TWarehouseAgreementServiceImpl implements ITWarehouseAgreementServi
                 BigDecimal calculate = this.getCalculate(itemNums, tWarehouseAgreementitems.getfPrice(), dayLength);
                 money = money.add(calculate);
                 days = days - dayLength;
-                information = dayLength + "天*" + tWarehouseAgreementitems.getfPrice() + "元*" + itemNums + " = " + calculate + "元";
+                information = dayLength + "天*" + tWarehouseAgreementitems.getfPrice() + "元*" + itemNums + " = " + calculate + "元";
                 if (StringUtils.isEmpty(remark)) {
                     remark = information;
                 } else {
@@ -490,7 +490,7 @@ public class TWarehouseAgreementServiceImpl implements ITWarehouseAgreementServi
                 BigDecimal calculate = this.getCalculate(itemNums, tWarehouseAgreementitems.getfPrice(), days);
                 money = money.add(calculate);
 //                long day = days - tWarehouseAgreementitems.getfFromdays();
-                information = days + "天*" + tWarehouseAgreementitems.getfPrice() + "元*" + itemNums + " = " + calculate + "元";
+                information = days + "天*" + tWarehouseAgreementitems.getfPrice() + "元*" + itemNums + " = " + calculate + "元";
                 if (StringUtils.isEmpty(remark)) {
                     remark = information;
                 } else {