删除相册

src/main/java/com/izouma/awesomeadmin/service/impl/UserOrderServiceImpl.java

@@ -1016,7 +1016,7 @@ public class UserOrderServiceImpl implements UserOrderService {
             userOrder = userOrderMapper.queryUserOrder(userOrder);
             if (userOrder != null) {
 
-                if ((AppConstant.OrderStatus.FINISH == userOrder.getStatusFlag()||AppConstant.OrderStatus.END == userOrder.getStatusFlag())
+                if ((AppConstant.OrderStatus.FINISH == userOrder.getStatusFlag() || AppConstant.OrderStatus.END == userOrder.getStatusFlag())
                         && !"Y".equals(userOrder.getJieSuan())) {
 
                     if ((userOrder.getAlbumQuantity() > 0 && AppConstant.OrderAlbumStatus.FINISH == userOrder.getAlbumStatus()) || userOrder.getAlbumQuantity() <= 0) {
@@ -1693,6 +1693,8 @@ public class UserOrderServiceImpl implements UserOrderService {
                         resultOrder.setTotalAlbum(userOrder.getAlbumQuantity());
                         resultOrder.setNeedAlbum(userOrder.getAlbumQuantity() - orderAlbum.getTotalNum());
                     }
+
+                    resultOrder.setFailAlbum(orderAlbum.getFailNum());
                 }