Merge branch 'dev-hongbao'

admin

2019-01-03 5981b2cae7c20ec9021c8ccbe1a926f35f640210

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java

@@ -54,8 +54,7 @@
         } else if (orderList.get(0).getState() == 1

               && orderList.get(0).getResultCode() == LostOrder.RESULT_CODE_SUCCESS) {

            return -1;

         } else if (orderList.get(0).getState() == 1

               && orderList.get(0).getResultCode() == LostOrder.RESULT_CODE_FAIL) {

         } else {

            return -6;

         }

      }