diff --git a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvBuyerAddressDao.java b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvBuyerAddressDao.java
index dc62e64..d1ae843 100644
--- a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvBuyerAddressDao.java
+++ b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvBuyerAddressDao.java
@@ -11,10 +11,7 @@ package com.heyu.api.data.dao.vv;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.heyu.api.data.entity.vv.VvBuyerAddressEntity;
-import com.lz.mybatis.plugin.annotations.By;
-import com.lz.mybatis.plugin.annotations.Column;
-import com.lz.mybatis.plugin.annotations.IF;
-import com.lz.mybatis.plugin.annotations.OrderByIdDesc;
+import com.lz.mybatis.plugin.annotations.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -43,7 +40,7 @@ public interface VvBuyerAddressDao extends BaseMapper<VvBuyerAddressEntity> {
 
 
     @OrderByIdDesc
-    List<VvBuyerAddressEntity> selectAppByCondition(IPage page, Long buyerId);
+    List<VvBuyerAddressEntity> selectAppByCondition(IPage page, Long buyerId,@NE String status);
 
 
 
diff --git a/api-mapper/src/main/java/com/heyu/api/data/enums/BuyerAddressEnums.java b/api-mapper/src/main/java/com/heyu/api/data/enums/BuyerAddressEnums.java
index a54b78f..fe3c1ec 100644
--- a/api-mapper/src/main/java/com/heyu/api/data/enums/BuyerAddressEnums.java
+++ b/api-mapper/src/main/java/com/heyu/api/data/enums/BuyerAddressEnums.java
@@ -4,7 +4,7 @@ public enum BuyerAddressEnums {
 
     common("common","默认"),
     default_address("default","默认地址"),
-    delete("delete","删除")
+    deleted("deleted","删除")
     ;
 
 
diff --git a/api-mapper/src/main/java/com/heyu/api/data/service/impl/AbstractOrderAction.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/AbstractOrderAction.java
index 9aec094..834dbc8 100644
--- a/api-mapper/src/main/java/com/heyu/api/data/service/impl/AbstractOrderAction.java
+++ b/api-mapper/src/main/java/com/heyu/api/data/service/impl/AbstractOrderAction.java
@@ -28,7 +28,8 @@ public abstract class AbstractOrderAction {
             new ToShippingAction(),
             new TrackLogisticsAction(),
             new UnShippingAction(),
-            new AppToPayAction()
+            new AppToPayAction(),
+            new BuyerSubmitCommentAction()
     );
 
     public static List<ActionDTO> getOrderActionDTO(VvTradeOrderLineEntity vvTradeOrderLineEntity, boolean isApp) {
diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppBuyerAddressManagerController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppBuyerAddressManagerController.java
index 970953c..97cca33 100644
--- a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppBuyerAddressManagerController.java
+++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppBuyerAddressManagerController.java
@@ -47,7 +47,8 @@ public class AppBuyerAddressManagerController {
                     @Override
                     public List doSelect(IPage page) {
                         return vvBuyerAddressDao.selectAppByCondition(page,
-                                appBuyerAddressRequest.getBuyerId()
+                                appBuyerAddressRequest.getBuyerId(),
+                                BuyerAddressEnums.deleted.getStatus()
                         );
                     }
                 });
diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppCommentController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppCommentController.java
index 7c4a954..9a6d072 100644
--- a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppCommentController.java
+++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppCommentController.java
@@ -84,7 +84,6 @@ public class AppCommentController {
                         }
                     });
         } else {
-
             pageUtils = PPageUtils.startPage(appCommentRequest.getPageNum(), appCommentRequest.getPageSize())
                     .doSelect(new ISelect() {
                         @Override
diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java
index 7748aab..fbf5080 100644
--- a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java
+++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java
@@ -144,6 +144,13 @@ public class AppOrderController {
     @Describe("订单列表")
     @RequestMapping("/list")
     public R list(@RequestBody AppOrderRequest vvOrderRequest) {
+        Integer commentStatus = null;
+        if(ApiConstants.WAIT_COMMENT.equals(vvOrderRequest.getStatus())){
+            commentStatus = 0;
+            vvOrderRequest.setStatus(OrderStatusEnums.delivered.getStatus());
+        }
+        Integer newcommentStatus = commentStatus;
+
         PPageUtils pageUtils = PPageUtils.startPage(vvOrderRequest.getPageNum(), vvOrderRequest.getPageSize())
                 .doSelect(new ISelect() {
                     @Override
@@ -152,7 +159,7 @@ public class AppOrderController {
                                 page,
                                 vvOrderRequest.getTradeOrderIds(),
                                 vvOrderRequest.getStatus(),
-                                ApiConstants.WAIT_COMMENT.equals(vvOrderRequest.getStatus()) ? 1 :null,
+                                newcommentStatus,
                                 OrderStatusEnums.delete.getStatus(),
                                 vvOrderRequest.getMinCreateTimestamp(),
                                 vvOrderRequest.getMaxCreateTimestamp(),