订单状态查询bug

alien-store/src/main/java/shop/alien/store/service/LifeUserOrderService.java

@@ -1075,7 +1075,7 @@ public class LifeUserOrderService extends ServiceImpl<LifeUserOrderMapper, LifeU
             // 非-1状态：直接添加状态条件
 //            String sql = baseSql + " and ocm1.status = " + orderStatus;
 //            lifeUserOrderQueryWrapper.inSql("luo.id", sql);
-            lifeUserOrderQueryWrapper.eq("ocm.status", orderStatus);
+            lifeUserOrderQueryWrapper.eq("luo.status", orderStatus);
         }
         lifeUserOrderQueryWrapper.groupBy("luo.id");
         IPage<LifeUserOrderVo> lifeUserOrderVoIPage = lifeUserOrderMapper.queryUserOrderList(brandedPage, lifeUserOrderQueryWrapper);

alien-store/src/main/java/shop/alien/store/service/impl/LifeCouponServiceImpl.java

@@ -279,8 +279,8 @@ public class LifeCouponServiceImpl extends ServiceImpl<LifeCouponMapper, LifeCou
                 // 订单状态 -> 已完成 筛选出未完成的状态
                 List<OrderCouponMiddle> collect = couponMiddleList.stream().filter(x -> x.getStatus() == OrderStatusEnum.WAIT_USE.getStatus() || x.getStatus() == OrderStatusEnum.REFUND_FAILED.getStatus())
                         .collect(Collectors.toList());
-                if (!isExist) {
-                    lifeUserOrder.setStatus(OrderStatusEnum.USED.getStatus());
+                if (isExist) {
+                    lifeUserOrder.setStatus(OrderStatusEnum.COMPLETE.getStatus());
                     lifeUserOrder.setFinishTime(new Date());
                     lifeUserOrder.setCreatedTime(new Date());
                     lifeUserOrderMapper.updateById(lifeUserOrder);