资金相关

performance-api/src/main/java/com/clx/performance/param/pc/PagePlatformMarginAccountParam.java

@@ -24,7 +24,7 @@ public class PagePlatformMarginAccountParam extends PageParam {
     private String runningWaterNo;
 
     @ApiModelProperty(value="流水类型10：充值 20：冻结 30：解冻 40：提现冻结 50：提现成功 60：扣除 70：提现失败",example = "10")
-    private String runningWaterType;
+    private Integer runningWaterType;
 
     @ApiModelProperty(value="操作开始时间",example = "2020-01-01 10:10:10")
     private String beginTime;

performance-api/src/main/java/com/clx/performance/param/pc/PagePlatformPrepaidFreightAccountParam.java

@@ -27,7 +27,7 @@ public class PagePlatformPrepaidFreightAccountParam extends PageParam {
     private String orderChildNo;
 
     @ApiModelProperty(value="流水类型10：充值 20：冻结 30：解冻 40：提现冻结 50：提现成功 60：扣除 70：提现失败",example = "10")
-    private String runningWaterType;
+    private Integer runningWaterType;
 
     @ApiModelProperty(value="操作开始时间",example = "2020-01-01 10:10:10")
     private String beginTime;

performance-web/src/main/java/com/clx/performance/service/impl/OwnerAccountServiceImpl.java

@@ -166,6 +166,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
                 entity.setStatus(OwnerAccountEnum.CaseOutStatus.PENDING_PAYMENT.getCode());
                 entity.setCaseOutBank(param.getOwnerOpenBank());
                 entity.setCaseOutBankNumber(param.getOwnerBankAccount());
+                entity.setCreateBy(loginUserInfo.getUserName());
 
                 ownerCaseOutDao.saveEntity(entity);
 
@@ -326,12 +327,15 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
      */
     @Override
     public void accountCaseOutApprove(OwnerCaseOutApproveParam param) {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
         OwnerCaseOut entity = new OwnerCaseOut();
         entity.setId(param.getId());
         entity.setPaymentProof(param.getPaymentProof());
         entity.setPlatformPaymentBank(entity.getPlatformPaymentBank());
         entity.setPlatformPaymentBankNumber(param.getPlatformPaymentBankNumber());
         entity.setPlatformPayBalance(param.getPlatformPayBalance());
+        entity.setPaymentTime(LocalDateTime.now());
+        entity.setPaymentBy(loginUserInfo.getUserName());
         entity.setStatus(OwnerAccountEnum.CaseOutStatus.TO_BE_CONFIRMED.getCode());
         ownerCaseOutDao.updateEntityByKey(entity);
     }
@@ -346,10 +350,10 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
         }
         OwnerCaseOut ownerCaseOut = optional.get();
         BigDecimal caseOutBalance = ownerCaseOut.getCaseOutBalance();
-        BigDecimal platformPayBalance = ownerCaseOut.getPlatformPayBalance();
-        if (platformPayBalance.compareTo(caseOutBalance) != 0) {
-            throw new ServiceSystemException(PerformanceResultEnum.MONEY_NO_SAME);
-        }
+//        BigDecimal platformPayBalance = ownerCaseOut.getPlatformPayBalance();
+//        if (platformPayBalance.compareTo(caseOutBalance) != 0) {
+//            throw new ServiceSystemException(PerformanceResultEnum.MONEY_NO_SAME);
+//        }
 
         //给对应账户减少金额
         while (true) {

performance-web/src/main/java/com/clx/performance/service/impl/OwnerRunningWaterRecordServiceImpl.java

@@ -81,7 +81,7 @@ public class OwnerRunningWaterRecordServiceImpl implements OwnerRunningWaterReco
             rowData.add(new ExcelData(dto.getUsableBalance()));
             rowData.add(new ExcelData(dto.getAccountBalance()));
             rowData.add(new ExcelData(dto.getTakeOutBalance()));
-            rowData.add(new ExcelData(dto.getRunningWaterNo().toString()));
+            rowData.add(new ExcelData(dto.getRunningWaterNo() == null ? "" : dto.getRunningWaterNo().toString()));
             rowData.add(new ExcelData(dto.getCreateBy()));
             rowData.add(new ExcelData(dto.getCreateTime().toString()));