订单结算bug

src/main/java/com/izouma/awesomeadmin/dao/UserOrderMapper.xml

@@ -1522,7 +1522,7 @@
             user_order
         WHERE
             del_flag = 'N'
-        AND status_flag = 5
+        AND status_flag in (5,6)
         AND IFNULL(jie_suan, 'X') != 'Y'
         <![CDATA[
         AND CASE

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

@@ -1016,7 +1016,8 @@ public class UserOrderServiceImpl implements UserOrderService {
             userOrder = userOrderMapper.queryUserOrder(userOrder);
             if (userOrder != null) {
 
-                if (AppConstant.OrderStatus.FINISH == userOrder.getStatusFlag() && !"Y".equals(userOrder.getJieSuan())) {
+                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) {