订单查询问题

fs-service-system/src/main/java/com/fs/store/mapper/FsStoreOrderMapper.java

@@ -77,7 +77,8 @@ public interface FsStoreOrderMapper
     public int deleteFsStoreOrderByIds(Long[] ids);
 
     @Select({"<script> " +
-            "select o.*,u.phone,u.register_code,u.register_date,u.source, c.company_name ,cu.nick_name as company_user_nick_name ,cu.phonenumber as company_usere_phonenumber   from fs_store_order o left join fs_user u on o.user_id=u.user_id  left join company c on c.company_id=o.company_id left join company_user cu on cu.user_id=o.company_user_id  " +
+            "select o.*,u.phone,u.register_code,u.register_date,u.source, c.company_name ,cu.nick_name as company_user_nick_name ,cu.phonenumber as company_usere_phonenumber,fsoa.audit_status   from fs_store_order o left join fs_user u on o.user_id=u.user_id  left join company c on c.company_id=o.company_id left join company_user cu on cu.user_id=o.company_user_id  " +
+            "left join fs_store_order_audit fsoa on fsoa.order_id = o.id " +
             "<if test = 'maps.productName != null and  maps.productName !=  \"\" '> " +
             "left join fs_store_order_item oi on o.id = oi.order_id "+
             "left join fs_store_product fsp on fsp.product_id = oi.product_id"+
@@ -159,7 +160,9 @@ public interface FsStoreOrderMapper
             " AND date_format(o.create_time,'%y%m%d') &gt;= date_format(#{maps.createTimeList[0]},'%y%m%d') " +
             " AND date_format(o.create_time,'%y%m%d') &lt;= date_format(#{maps.createTimeList[1]},'%y%m%d') " +
             "</if>" +
-
+            "<if test='maps.auditStatus !=null '>" +
+            "AND fsoa.audit_status = #{maps.auditStatus} " +
+            "</if>" +
             "<if test = 'maps.deliverySendTimeList != null    '> " +
             " AND date_format(o.delivery_send_time,'%y%m%d') &gt;= date_format(#{maps.deliverySendTimeList[0]},'%y%m%d') " +
             " AND date_format(o.delivery_send_time,'%y%m%d') &lt;= date_format(#{maps.deliverySendTimeList[1]},'%y%m%d') " +

fs-service-system/src/main/java/com/fs/store/param/FsStoreOrderParam.java

@@ -91,5 +91,7 @@ public class FsStoreOrderParam extends BaseEntity implements Serializable
     private BigDecimal payPrice;
     /* 媒体来源 */
     private Integer orderMedium;
+    /* 审核状态 */
+    private Integer auditStatus;
 
 }

fs-service-system/src/main/java/com/fs/store/service/impl/FsStoreOrderAuditServiceImpl.java

@@ -71,10 +71,12 @@ public class FsStoreOrderAuditServiceImpl extends ServiceImpl<FsStoreOrderAuditM
             message = "审核通过";
         } else { // 审核拒绝
             newStatus = OrderAuditStateEnum.COMPANY_REJECT;
-            message = "销售:审核拒绝";
+
             if (StringUtils.isBlank(param.getReviewContent())) {
                 throw new CustomException("被拒原因不能为空");
             }
+            // 拒绝原因放在备注 中 订单查询展示 xgb修改 20250915
+            message = "销售:审核拒绝;"+param.getReviewContent();
             fsStoreOrderAudit.setReason(param.getReviewContent());
         }
 

fs-service-system/src/main/java/com/fs/store/vo/FsStoreOrderVO.java

@@ -243,6 +243,11 @@ public class FsStoreOrderVO implements Serializable
     private String orderVisit;
 
     private String orderMedium;
+    /** 审核状态 */
+    private Integer auditStatus;
+    /* 发货时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date deliverySendTime;
 
 
 }