需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/workorder/OrderBaseLogic.java

@@ -230,7 +230,7 @@ public class OrderBaseLogic {
                 .or(CollectionUtils.isNotEmpty(orderStatusList) && orderStatusList.contains("DJD"))
                                 .eq(CollectionUtils.isNotEmpty(orderStatusList) && orderStatusList.contains("DJD"),PgOrderBase::getIsMeet,false)
                 )
-                .in(CollectionUtils.isEmpty(orderStatusList) || !orderStatusList.contains("DJD"),PgOrderBase::getIsMeet,true)
+                .in(CollectionUtils.isNotEmpty(orderStatusList) && !orderStatusList.contains("DJD"),PgOrderBase::getIsMeet,true)
                 .eq(StringUtils.equals(orderStatus, OrderBaseStatusEnum.YCD.getKey()),PgOrderBase::getIsException,true)
                 .between(!StringUtils.equals(orderStatus, OrderBaseStatusEnum.YWG.getKey())
                         && StringUtils.isNoneBlank(startTime, endTime) && (byDay == null || byDay != 3), PgOrderBase::getDispatchTime, startTime, endTime)

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

@@ -393,8 +393,19 @@ public class LetterLogic {
         LeLetter leLetter = leLetterService.getById(leLetterItem.getLeLetterId());
         if (!leLetter.getStatus().equals(LetterStatusEnum.SEND.getKey()))
             throw new RemoteServiceException("不为待执行不能申诉");
+
         leLetter.setStatus(LetterStatusEnum.WAIT_EXAMINE.getKey());
+        if (leLetterItem.getWebsitAppeal().equals("OK")){
+            leLetter.setStatus(LetterStatusEnum.EXECUTED.getKey());
+            leLetter.setExaminePrice(leLetter.getPrice());
+            leLetter.setExamineFration(leLetter.getFraction());
+        }
+
+
         leLetter.updateById();
+
+
+
         leLetterItem.insert();
     }