注销账户不显示

crmeb-common/src/main/java/com/zbkj/common/response/OrderFrontDataResponse2.java

@@ -84,4 +84,7 @@ public class OrderFrontDataResponse2 implements Serializable {
     private Integer isRemit;
     @ApiModelProperty(value = "支付方式")
     private String payType;
+
+    @ApiModelProperty(value = "用户id")
+    private Integer userId;
 }

crmeb-front/src/main/java/com/zbkj/front/service/impl/FrontOrderServiceImpl.java

@@ -1036,10 +1036,11 @@ public class FrontOrderServiceImpl implements FrontOrderService {
             BeanUtils.copyProperties(order, infoResponse);
             infoResponse.setIsRemit(order.getIsRemit());
             infoResponse.setPayType(order.getPayType());
+            infoResponse.setUserId(order.getUid());
             // 订单详情对象列表
             List<OrderDetail> orderDetailList = orderDetailService.getByOrderNo(order.getOrderNo());
             List<OrderInfoFrontDataResponse> infoResponseList = CollUtil.newArrayList();
-            System.out.println(order.getUid() != userId);
+
             if (order.getUid() != userId) {
                 //为企业子用户
                 LambdaQueryWrapper<UserBypassAccount> queryWrapper2 = new LambdaQueryWrapper<>();

crmeb-service/src/main/resources/mapper/order/OrderDetailMapper.xml

@@ -47,5 +47,6 @@
         and od.is_reply = 0
         and od.uid = #{userId}
         and (o.is_integral != 1 or o.is_integral is null)
+        and o.is_del=0
     </select>
 </mapper>

crmeb-service/src/main/resources/mapper/user/UserMapper.xml

@@ -5,6 +5,7 @@
     <select id="findAdminList" resultType="com.zbkj.common.model.user.User" parameterType="Map">
         SELECT u.* FROM eb_user AS u
         <where>
+            is_logoff = 0
             <if test="nikename != '' and nikename != null ">
                 and u.nickname like CONCAT('%',#{nikename},'%')
             </if>