fanli-server.git

			@@ -277,7 +277,7 @@
			boolean rewardOrder = false;
			int type = 1; // 1 常规跳转页面 2弹出选项（奖励券）
			if (rewardSuccess) {
			if (!VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {
			if (!VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
			rewardOrder = true; //奖励成功 2.0.2 消失
			}
			} else if (hasRewardCoupon && !freeOrder && HongBaoV2.TYPE_ZIGOU == hongBaoType
			@@ -294,8 +294,8 @@
			String unit = null;
			boolean canUse = false;

			// 版本区分：2.0.2
			if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {
			// 版本区分：2.1
			if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
			Date thirdCreateTime = order.getThirdCreateTime();
			if (thirdCreateTime != null) {
			long downOrderTime = thirdCreateTime.getTime();
			@@ -344,7 +344,7 @@
			rewardStyleVO.setColor("#E5005C");
			rewardStyleVO.setBottomColor("#FFDCEA");
			if (!newEdition) {
			if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {
			if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
			rewardStyleVO.setContent("使用奖励券 >");
			} else {
			rewardStyleVO.setContent("返利奖励 >");
			@@ -658,7 +658,7 @@
			signList.add(CommonOrder.TYPE_INVITE);

			// 版本区分：2-0-2
			if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {
			if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
			InviteOrderSubsidy orderSubsidy = inviteOrderSubsidyService.getByOrderNoAndType(uid, order.getOrderNo(), sourceType);
			if (orderSubsidy != null) {
			ClientTextStyleVO subsidyInfo = new ClientTextStyleVO();
			@@ -1061,8 +1061,8 @@
			commonOrder.getTradeId(), new Date(), commonOrder.getSourceType()));
			return new CommonOrderAddResultDTO(commonOrder, CommonOrderAddResultDTO.TYPE_ADD);
			} else {// 修改
			// 已经结算，已经失效，状态未改变的订单不处理
			if (oldCommonOrder.getState() == CommonOrder.STATE_JS \|\| oldCommonOrder.getState() == CommonOrder.STATE_SX
			// 非京东已经结算，已经失效，状态未改变的订单不处理
			if ((oldCommonOrder.getState() == CommonOrder.STATE_JS&&oldCommonOrder.getSourceType()!=Constant.SOURCE_TYPE_JD) \|\| oldCommonOrder.getState() == CommonOrder.STATE_SX
			\|\| oldCommonOrder.getState() == CommonOrder.STATE_WQ
			\|\| (oldCommonOrder.getState().intValue() == commonOrder.getState())) {
			return new CommonOrderAddResultDTO(oldCommonOrder, CommonOrderAddResultDTO.TYPE_NOUPDATE);
			@@ -1177,7 +1177,8 @@

			@Override
			public List<CommonOrderVO> listQuery(long start, int count, Integer keyType, String key, Integer state,
			Integer type, Integer orderState, String startTime, String endTime, Integer source)
			Integer type, Integer orderState, String startTime, String endTime, Integer source,List<Long> listShopId,
			List<Long> listGoodsId, Date minTime, BigDecimal money)
			throws CommonOrderException {

			List<CommonOrderVO> list = null;
			@@ -1185,10 +1186,11 @@
			if (StringUtil.isNullOrEmpty(key) \|\| keyType == 1) {// 搜索框无值或者按订单号搜索时都只搜索主订单
			list = commonOrderMapper.listQueryWithNoChild(start, count, keyType, key, state, type, orderState,
			startTime, endTime, source);
			} else
			} else {
			list = commonOrderMapper.listQuery(start, count, keyType, key, state, type, orderState, startTime, endTime,
			source);

			source, listShopId, listGoodsId, minTime, money);
			}

			if (list == null) {
			list = new ArrayList<CommonOrderVO>();
			}
			@@ -1372,12 +1374,15 @@

			@Override
			public long countQuery(Integer keyType, String key, Integer state, Integer type, Integer orderState,
			String startTime, String endTime, Integer source) throws CommonOrderException {
			String startTime, String endTime, Integer source, List<Long> listShopId, List<Long> listGoodsId,
			Date minTime, BigDecimal money) throws CommonOrderException {
			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);
			} else {
			return commonOrderMapper.countQuery(keyType, key, state, type, orderState, startTime, endTime, source, listShopId,
			listGoodsId, minTime,money);
			}
			}

			@Override
			@@ -1591,4 +1596,19 @@
			return commonOrderMapper.firstValidOrderByUid(uid, type, 4);
			}

			@Override
			public CommonOrder getFirstShareOrderByUid(Long uid) {
			return commonOrderMapper.getFirstShareOrderByUid(uid);
			}

			@Override
			public BigDecimal getTotalRewardMoneyByOrderNoAndSourceType(String orderNo, Integer sourceType) {
			return commonOrderMapper.getTotalRewardMoneyByOrderNoAndSourceType(orderNo, sourceType);
			}


			@Override
			public long count24HValidOrderByUid(Long uid, Date minTime) {
			return commonOrderMapper.count24HValidOrderByUid(uid, minTime);
			}
			}