wujiefeng 1 год назад
Родитель
Сommit
a7e1d56e30

+ 2 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/pay/OrgOverviewService.java

@@ -305,7 +305,8 @@ public class OrgOverviewService extends SuperService {
         queryModel.setGeneralLedgerId(new String[]{settleAccount.getLedgerId()});
         queryModel.setStartTime(param.getStartTime());
         queryModel.setEndTime(param.getEndTime());
-        queryModel.setFilter(Map.of("transactionType",new Document("$ne", "Settle")));
+//        queryModel.setFilter(Map.of("transactionType",new Document("$ne", "Settle")));
+        queryModel.setFilter(Map.of("transactionType","Settle"));
         queryModel.setPage(pageableModel);
 
         return transactionLogService.settleAggregate(queryModel);

+ 2 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/pay/SettleService.java

@@ -118,9 +118,10 @@ public class SettleService {
             log.error("结算划账失败, projectOid: {}, paymentType: {}", projectOid, paymentType);
             throw new RuntimeException(transfer.getMsg());
         }
+
         UpdateMetaFieldModel updateMetaFieldModel = new UpdateMetaFieldModel();
         updateMetaFieldModel.setIds(settleList);
-        updateMetaFieldModel.setMetaField(Map.of("settleStatus", SettleStatus.Settle));
+        updateMetaFieldModel.setMetaField(Map.of("settleStatus", SettleStatus.Settle,"settleTime", new Date().getTime()));
         ResultContent<Void> updateManyMetaField = transactionLogService.updateManyMetaField(updateMetaFieldModel);
         if (!updateManyMetaField.getState().equals(ResultState.Success)) {
             log.error("修改账单meta字段失败, projectOid: {}, paymentType: {}", projectOid, paymentType);