淘礼金规则修改

admin

2019-08-15 00ae1ad282df5afa8205c11e86755ff311402ece

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

@@ -1023,8 +1023,14 @@
         Integer type, Integer orderState, String startTime, String endTime, Integer source)

         throws CommonOrderException {



      List<CommonOrderVO> list = commonOrderMapper.listQuery(start, count, keyType, key, state, type, orderState,

            startTime, endTime, source);

      List<CommonOrderVO> list = null;



      if (StringUtil.isNullOrEmpty(key) || keyType == 1) {// 搜索框无值或者按订单号搜索时都只搜索主订单

         list = commonOrderMapper.listQueryWithNoChild(start, count, keyType, key, state, type, orderState,

               startTime, endTime, source);

      } else

         list = commonOrderMapper.listQuery(start, count, keyType, key, state, type, orderState, startTime, endTime,

               source);



      if (list == null) {

         list = new ArrayList<CommonOrderVO>();

@@ -1155,6 +1161,8 @@
                        || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {

                     if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {

                        // 免单成功

                        order.setOtherState(2);

                     } else if (UserSystemCouponRecord.STATE_FREE_ON == couponState) {

                        order.setOtherState(1);

                     }

                  }

@@ -1170,6 +1178,8 @@
                        || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {

                     if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {

                        // 免单成功

                        order.setOtherState(2);

                     } else if (UserSystemCouponRecord.STATE_FREE_ON == couponState) {

                        order.setOtherState(1);

                     }

                  }

@@ -1185,6 +1195,8 @@
                        || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {

                     if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {

                        // 免单成功

                        order.setOtherState(2);

                     } else if (UserSystemCouponRecord.STATE_FREE_ON == couponState) {

                        order.setOtherState(1);

                     }

                  }

@@ -1201,7 +1213,11 @@
   @Override

   public long countQuery(Integer keyType, String key, Integer state, Integer type, Integer orderState,

         String startTime, String endTime, Integer source) throws CommonOrderException {

      return commonOrderMapper.countQuery(keyType, key, state, type, orderState, startTime, endTime, source);

      if (StringUtil.isNullOrEmpty(key) || keyType == 1) {// 搜索框无值或者按订单号搜索时都只搜索主订单

         return commonOrderMapper.countQueryWithNoChild(keyType, key, state, type, orderState, startTime, endTime,

               source);

      } else

         return commonOrderMapper.countQuery(keyType, key, state, type, orderState, startTime, endTime, source);

   }



   @Override

@@ -1379,5 +1395,4 @@
      return commonOrderMapper.listBySourceTypeAndStateAndThirdCrateTime(sourceType, state, minTime, maxTime,

            (page - 1) * pageSize, pageSize);

   }



}