‘linchangsheng’ vor 5 Monaten
Ursprung
Commit
e5d556a962

+ 2 - 2
mall-server-api/src/main/java/com/gree/mall/manager/enums/LetterStatusEnum.java

@@ -11,8 +11,8 @@ import lombok.Getter;
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
 public enum LetterStatusEnum implements BaseEnum {
 
-    SEND("SEND","已发送"),
-    WAIT("WAIT","待执行"),
+    SEND("SEND","待执行"),
+    WAIT("WAIT","待发送"),
     WAIT_EXAMINE("WAIT_EXAMINE","待审核"),
     EXECUTED("EXECUTED","已执行"),
     REVOKE("REVOKE","已撤销"),

+ 3 - 3
mall-server-api/src/main/java/com/gree/mall/manager/logic/LetterLogic.java

@@ -277,7 +277,7 @@ public class LetterLogic {
         if (leLetterService.lambdaQuery().in(LeLetter::getLeLetterId,ids).ne(LeLetter::getStatus,"WAIT").count()>0)
             throw new RemoteServiceException("存在有非待发送的联络函");
         leLetterService.lambdaUpdate().in(LeLetter::getLeLetterId,ids)
-                .set(LeLetter::getStatus, LetterStatusEnum.EXECUTED.getKey()).update();
+                .set(LeLetter::getStatus, LetterStatusEnum.SEND.getKey()).update();
 
     }
 
@@ -293,12 +293,12 @@ public class LetterLogic {
         if (leLetterService.lambdaQuery().in(LeLetter::getLeLetterId,ids).isNotNull(LeLetter::getExamineStatus).ne(LeLetter::getStatus,LetterStatusEnum.WAIT.getKey()).count()>0)
             throw new RemoteServiceException("存在有待执行的联络函");
         leLetterService.lambdaUpdate().in(LeLetter::getLeLetterId,ids)
-                .set(LeLetter::getStatus, LetterStatusEnum.WAIT.getKey()).update();
+                .set(LeLetter::getStatus, LetterStatusEnum.SEND.getKey()).update();
     }
 
     public void appeal(LeLetterItem leLetterItem) {
         LeLetter leLetter = leLetterService.getById(leLetterItem.getLeLetterId());
-        if (!leLetter.getStatus().equals(LetterStatusEnum.WAIT.getKey()))
+        if (!leLetter.getStatus().equals(LetterStatusEnum.SEND.getKey()))
             throw new RemoteServiceException("不为待执行不能申诉");
         leLetter.setStatus(LetterStatusEnum.WAIT_EXAMINE.getKey());
         leLetter.updateById();