fanli-server.git

			@@ -79,7 +79,6 @@
			@Resource
			private HongBaoV2Service hongBaoV2Service;


			// 奖励订单图片
			public final static String PIC_REWARD= "http://img.flqapp.com/resource/order/order_state_reward.png";

			@@ -87,7 +86,6 @@
			public final static String PIC_FREE_ON = "http://img.flqapp.com/resource/order/order_state_freeing.png";
			public final static String PIC_FREE_FAIL = "http://img.flqapp.com/resource/order/order_state_free_fail.png";
			public final static String PIC_FREE_SUCCEED = "http://img.flqapp.com/resource/order/order_state_free_suc.png";


			@Override
			public int insert(CommonOrder record) {
			@@ -161,7 +159,6 @@
			return listOrder;
			}


			@Override
			public Map<String, BigDecimal> countHistoryOrder(Long uid, Integer day) {
			return commonOrderMapper.countHistoryOrder(uid, day);
			@@ -198,7 +195,6 @@

			// 已经使用券订单
			List<UserSystemCouponRecord> couponRecordList = userSystemCouponRecordService.getRecordByOrderNoList(listNo);


			/* 组合商品信息 */
			for (CommonOrderVO commonOrder : listGoods) {
			@@ -479,7 +475,8 @@
			// 免单成功
			freeOrder = true;
			signList.add(PIC_FREE_SUCCEED);
			} else if (UserSystemCouponRecord.STATE_FAIL_RULE == state \|\| UserSystemCouponRecord.STATE_FAIL_DRAWBACK == state) {
			} else if (UserSystemCouponRecord.STATE_FAIL_RULE == state
			\|\| UserSystemCouponRecord.STATE_FAIL_DRAWBACK == state) {
			// 规则不匹配、退款
			freeOrder = true;
			signList.add(PIC_FREE_FAIL);
			@@ -500,8 +497,8 @@
			if (rewardSuccess) {
			// 奖励成功
			rewardOrder = true;
			} else if(hasRewardCoupon && !freeOrder && HongBaoV2.TYPE_ZIGOU == hongBaoType &&
			HongBaoV2.STATE_YILINGQU == hongBaoState) {
			} else if (hasRewardCoupon && !freeOrder && HongBaoV2.TYPE_ZIGOU == hongBaoType
			&& HongBaoV2.STATE_YILINGQU == hongBaoState) {
			// 有可用的奖励券、非免单订单、且已到账的、返利订单
			type = 2;
			rewardOrder = true;
			@@ -845,7 +842,8 @@
			}

			@Override
			public CommonOrderVO getCommonOrderByOrderNo(Long uid, String orderNo, Integer orderState) throws CommonOrderException {
			public CommonOrderVO getCommonOrderByOrderNo(Long uid, String orderNo, Integer orderState)
			throws CommonOrderException {

			CommonOrderVO commonOrderVO = commonOrderMapper.getCommonOrderByOrderNo(uid, orderNo, orderState);
			// 订单信息为空
			@@ -937,7 +935,8 @@
			}

			@Override
			public List<CommonOrderVO> getCouponHongbaoByOrderNo(Long uid, Integer hongBaoState, String orderNo) throws CommonOrderException {
			public List<CommonOrderVO> getCouponHongbaoByOrderNo(Long uid, Integer hongBaoState, String orderNo)
			throws CommonOrderException {

			List<CommonOrderVO> listOrder = commonOrderMapper.getCouponHongbaoByOrderNo(uid, hongBaoState, orderNo);

			@@ -960,7 +959,6 @@
			return listOrder;
			}


			@Override
			public JSONObject getRewardJumpInfo(String orderNo) {

			@@ -970,7 +968,6 @@
			signList.add(CommonOrder.TYPE_FANLI);
			signList.add(PIC_REWARD); // 加入奖励成功图片
			map.put("signList", signList);


			ClientTextStyleVO rewardStyleVO = new ClientTextStyleVO();
			// 奖励券进度详情
			@@ -994,4 +991,10 @@

			return map;
			}

			@Override
			public CommonOrder selectBySourceTypeAndTradeId(int sourceType, String tradeId) {

			return commonOrderMapper.selectBySourceTypeAndTradeId(sourceType, tradeId);
			}
			}