|
|
|
@ -857,7 +857,7 @@ public class StudentAccountAssetAllocationService extends CoreBaseService<Studen
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
outAccountAssetAllocation.setAvailableFunds(availableFunds.subtract(transfer));
|
|
|
|
|
outAccountAssetAllocation.setInitialInvestmentCapital(outAccountAssetAllocation.getApplicationId() == -1 ? availableFunds : availableFunds.subtract(transfer));
|
|
|
|
|
// outAccountAssetAllocation.setInitialInvestmentCapital(outAccountAssetAllocation.getApplicationId() == -1 ? availableFunds : availableFunds.subtract(transfer));
|
|
|
|
|
if (outAccountAssetAllocation.getTransferOutAmount() == null) {
|
|
|
|
|
outAccountAssetAllocation.setTransferOutAmount(BigDecimal.ZERO);
|
|
|
|
|
}
|
|
|
|
@ -870,7 +870,7 @@ public class StudentAccountAssetAllocationService extends CoreBaseService<Studen
|
|
|
|
|
if (toAccountAssetAllocation.getTransferinAmount() == null) {
|
|
|
|
|
toAccountAssetAllocation.setTransferinAmount(BigDecimal.ZERO);
|
|
|
|
|
}
|
|
|
|
|
toAccountAssetAllocation.setInitialInvestmentCapital(toAccountAssetAllocation.getInitialInvestmentCapital().add(transfer));
|
|
|
|
|
// toAccountAssetAllocation.setInitialInvestmentCapital(toAccountAssetAllocation.getInitialInvestmentCapital().add(transfer));
|
|
|
|
|
toAccountAssetAllocation.setAvailableFunds(toAccountAssetAllocation.getAvailableFunds().add(transfer));
|
|
|
|
|
toAccountAssetAllocation.setTransferinAmount(toAccountAssetAllocation.getTransferinAmount().add(transfer));
|
|
|
|
|
studentAccountAssetAllocationDao.updateById(toAccountAssetAllocation);
|
|
|
|
@ -889,9 +889,9 @@ public class StudentAccountAssetAllocationService extends CoreBaseService<Studen
|
|
|
|
|
String url = "http://120.79.161.177:8029/Account/UpdatePevcAvailable";
|
|
|
|
|
String postData;
|
|
|
|
|
if (outAccountAssetAllocation.getApplicationId() == 18) {
|
|
|
|
|
postData = "UserId=" + coreUser.getId() + "&&Money=" + money + "&&CZId=" + 1;
|
|
|
|
|
postData = "UserId=" + coreUser.getOldId() + "&&Money=" + money + "&&CZId=" + 1;
|
|
|
|
|
} else {
|
|
|
|
|
postData = "UserId=" + coreUser.getId() + "&&Money=" + money + "&&CZId=" + 2;
|
|
|
|
|
postData = "UserId=" + coreUser.getOldId() + "&&Money=" + money + "&&CZId=" + 2;
|
|
|
|
|
}
|
|
|
|
|
String result = HttpUtil.sendPostRequest(url, postData);
|
|
|
|
|
StudentAccountAssetAllocationQuery updateQuery = new StudentAccountAssetAllocationQuery();
|
|
|
|
|