diff --git a/cweb/src/main/java/com/cweb/controller/BsMerLedgerController.java b/cweb/src/main/java/com/cweb/controller/BsMerLedgerController.java index f077005..0ff4c50 100644 --- a/cweb/src/main/java/com/cweb/controller/BsMerLedgerController.java +++ b/cweb/src/main/java/com/cweb/controller/BsMerLedgerController.java @@ -88,11 +88,12 @@ public class BsMerLedgerController { } merLedger.setReceiverStatus(false); } else { - if (!merLedger.getStatus().equals(MerLedgerStatusEnum.status3.getNumber())) { + if (merLedger.getStatus().equals(MerLedgerStatusEnum.status1.getNumber()) + || merLedger.getStatus().equals(MerLedgerStatusEnum.status2.getNumber())) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "暂时无法修改"); } - merLedger = new BsMerLedger(); merLedger.setMerId(merPlatform.getMerId()); + merLedger.setMerName(mer.getMerName()); merLedger.setPlatformType(merPlatform.getPlatformType()); merLedger.setPlatformNo(merPlatform.getPlatformNo()); merLedger.setCupNo(merPlatform.getCupNo());