hurui
/
gratia-pay-parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
yy_dev
胡锐 2 years ago
parent 78fc811bb5 007ae38b38
commit 92f9167b26
3 changed files with 15 additions and 17 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      cweb/src/main/java/com/cweb/notify/LaKaLaController.java
  2. 26
      schedule/src/main/java/com/hfkj/schedule/Merchant.java
  3. 2
      service/src/main/java/com/hfkj/service/impl/BsMerSettleAcctApplyServiceImpl.java

4
cweb/src/main/java/com/cweb/notify/LaKaLaController.java
Unescape View File

@ -146,10 +146,6 @@ public class LaKaLaController {
merLedger.setRejectReason(respData.getString("remark"));
}
merLedgerService.editMerLedger(merLedger);
if (merLedger.getStatus().equals(MerLedgerStatusEnum.status1.getNumber())) {
laKaLaLedgerService.applyLedgerReceiver(merLedger.getMerId());
}
}
}

26
schedule/src/main/java/com/hfkj/schedule/Merchant.java
Unescape View File

@ -256,18 +256,21 @@ public class Merchant {
}
BsMerPlatformNo merPlatform = merPlatformNoService.getPlatformNo(mer.getId(), PlatformTypeEnum.type1);
BsMerLedger merLedger = new BsMerLedger();
merLedger.setMerId(mer.getId());
merLedger.setMerName(mer.getMerName());
merLedger.setPlatformType(merPlatform.getPlatformType());
merLedger.setPlatformNo(merPlatform.getPlatformNo());
merLedger.setCupNo(merPlatform.getCupNo());
merLedger.setStatus(MerLedgerStatusEnum.status2.getNumber());
merLedger.setReceiverStatus(false);
merLedgerService.editMerLedger(merLedger);
laKaLaLedgerService.applyLedgerReceiver(merLedger.getMerId());
BsMerLedger merLedger = merLedgerService.getMerLedger(mer.getId(), PlatformTypeEnum.type1);
if (merLedger == null) {
merLedger = new BsMerLedger();
merLedger.setMerId(mer.getId());
merLedger.setMerName(mer.getMerName());
merLedger.setPlatformType(merPlatform.getPlatformType());
merLedger.setPlatformNo(merPlatform.getPlatformNo());
merLedger.setCupNo(merPlatform.getCupNo());
merLedger.setStatus(MerLedgerStatusEnum.status2.getNumber());
merLedger.setReceiverStatus(false);
merLedgerService.editMerLedger(merLedger);
laKaLaLedgerService.applyLedgerReceiver(merLedger.getMerId());
}
} else if (customer.getString("customerStatus").equals("REJECT")) {
contractRecord.setStatus(3);
merContractRecordService.updateRecord(contractRecord);
@ -312,7 +315,6 @@ public class Merchant {
if (settle != null) {
settle.setStatus(0);
merSettleAcctService.editMerSettleAcct(settle);
}
BsMerSettleAcct newSettle = new BsMerSettleAcct();

2
service/src/main/java/com/hfkj/service/impl/BsMerSettleAcctApplyServiceImpl.java
Unescape View File

@ -130,7 +130,7 @@ public class BsMerSettleAcctApplyServiceImpl implements BsMerSettleAcctApplyServ
}
if (MapUtils.getInteger(param, "status") != null) {
criteria.andApplyNoIsNotNull();
criteria.andStatusEqualTo(MapUtils.getInteger(param, "status"));
}
example.setOrderByClause("create_time desc");

Write Preview
Loading…
Cancel
Save