Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/inv/service/impl/InvAccountExcelServiceImpl.java

@@ -138,7 +138,8 @@ public class InvAccountExcelServiceImpl extends ServiceImpl<InvAccountExcelMappe
         InvAccountCard enterAccountCard = invAccountCardService.getById(invAccountExcel.getEnterCardNum());
         InvAccount outAccount = insAccountService.getById(outAccountCard.getAccountId());
         InvAccount enterAccount = insAccountService.getById(enterAccountCard.getAccountId());
-
+        Double applyAmount = Double.parseDouble(invAccountExcel.getApplyAmount());
+        Double payoutAmount1 = Double.parseDouble(invAccountExcel.getPayoutAmount());
 
         //判断是转账给内部还是外部
         if (invAccountExcel.getOutFlag().equals("0")) {
@@ -184,7 +185,10 @@ public class InvAccountExcelServiceImpl extends ServiceImpl<InvAccountExcelMappe
             outJsonUtil(outProfit, outAccount, outAccountCard,invAccountOperate.getAccountOperateId(),payOutAmount);
             entJsonUtil(entProfit, enterAccount, enterAccountCard, invAccountOperate1.getAccountOperateId(), payOutAmount);
 
-            if (invAccountExcel.getApplyAmount().equals(payOutAmount)) {
+            if (applyAmount == Double.parseDouble(payOutAmount)) {
+                invAccountExcel.setTransferFlag("0");
+                invAccountExcel.setPayoutAmount(String.valueOf(Double.parseDouble(payOutAmount) + Double.parseDouble(invAccountExcel.getPayoutAmount())));
+            } else if (applyAmount == (Double.parseDouble(payOutAmount) + payoutAmount1)) {
                 invAccountExcel.setTransferFlag("0");
                 invAccountExcel.setPayoutAmount(String.valueOf(Double.parseDouble(payOutAmount) + Double.parseDouble(invAccountExcel.getPayoutAmount())));
             } else {
@@ -208,7 +212,11 @@ public class InvAccountExcelServiceImpl extends ServiceImpl<InvAccountExcelMappe
             if (invAccountExcel.getApplyAmount().equals(payOutAmount)) {
                 invAccountExcel.setTransferFlag("0");
                 invAccountExcel.setPayoutAmount(String.valueOf(Integer.parseInt(payOutAmount) + Integer.parseInt(invAccountExcel.getPayoutAmount())));
-            } else {
+            } else if (applyAmount == (Double.parseDouble(payOutAmount) + payoutAmount1)) {
+                invAccountExcel.setTransferFlag("0");
+                invAccountExcel.setPayoutAmount(String.valueOf(Double.parseDouble(payOutAmount) + Double.parseDouble(invAccountExcel.getPayoutAmount())));
+            }
+            else {
                 invAccountExcel.setTransferFlag("1");
                 invAccountExcel.setPayoutAmount(String.valueOf(Integer.parseInt(payOutAmount) + Integer.parseInt(invAccountExcel.getPayoutAmount())));
             }
@@ -226,7 +234,6 @@ public class InvAccountExcelServiceImpl extends ServiceImpl<InvAccountExcelMappe
         insAccountOpService.saveBatch(list);
     }
 
-
 }