Merge branch 'master' into dev

cweb/src/main/java/com/cweb/notify/LaKaLaController.java

@@ -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());
-                    }
                 }
             }
 

schedule/src/main/java/com/hfkj/schedule/Merchant.java

@@ -256,7 +256,10 @@ public class Merchant {
                             }
 
                             BsMerPlatformNo merPlatform = merPlatformNoService.getPlatformNo(mer.getId(), PlatformTypeEnum.type1);
-                            BsMerLedger merLedger = new BsMerLedger();
+
+                            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());
@@ -267,7 +270,7 @@ public class Merchant {
                                 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();

service/src/main/java/com/hfkj/service/impl/BsMerSettleAcctApplyServiceImpl.java

@@ -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");