fanli-server.git

			@@ -1,7 +1,6 @@
			package com.yeshi.fanli.service.impl.order;

			import java.math.BigDecimal;
			import java.text.ParseException;
			import java.text.SimpleDateFormat;
			import java.util.ArrayList;
			import java.util.Date;
			@@ -201,414 +200,7 @@
			return listOrder;
			}

			@Override
			public Map<String, BigDecimal> countHistoryOrder(Long uid, Integer day, Integer source) {
			return commonOrderMapper.countHistoryOrder(uid, day, source);
			}

			@Override
			public long countBonusOrderNumber(Long uid, Integer type, Integer day, String startTime, String endTime,
			Integer source) {
			return commonOrderMapper.countBonusOrderNumber(uid, type, day, startTime, endTime, source);
			}

			@Override
			public BigDecimal countBonusOrderMoney(Long uid, Integer type, Integer day, String startTime, String endTime,
			Integer source) {
			return commonOrderMapper.countBonusOrderMoney(uid, type, day, startTime, endTime, source);
			}

			@Override
			public Map<String, Object> countBonusOrderMoneyAndNumber(Long uid, Integer type, Integer day, String startTime,
			String endTime, Integer source) {
			return commonOrderMapper.countBonusOrderMoneyAndNumber(uid, type, day, startTime, endTime, source);
			}

			@Override
			public Long countUserOrderToApp(Long uid, Integer type, String startTime, String endTime,
			Integer day, Integer source, Integer state, Integer stateOrder) {
			return commonOrderMapper.countUserOrderToApp(uid, type, startTime, endTime, day, source, state, stateOrder);
			}

			private BigDecimal getWeiQuanMoney(List<TaoBaoWeiQuanOrder> listWQ, int sourceType, Long uid) {
			BigDecimal weiQuanMoney = new BigDecimal(0);
			if (listWQ != null && listWQ.size() > 0) {
			for (TaoBaoWeiQuanOrder weiQuanOrder : listWQ) {
			String tradeId = weiQuanOrder.getOrderItemId();
			// 查询红包
			List<String> tradeList = new ArrayList<>();
			tradeList.add(tradeId);
			List<HongBaoV2> hongBaoList = hongBaoV2Service.listBySourceTypeAndTradeIdListAndUid(sourceType, uid,
			tradeList);
			if (hongBaoList != null && hongBaoList.size() > 0) {
			CommonOrder commonOrder = commonOrderMapper.selectBySourceTypeAndTradeId(sourceType, tradeId);
			if (commonOrder != null && commonOrder.getSettlement().compareTo(new BigDecimal(0)) > 0) {
			BigDecimal wqMoney = MoneyBigDecimalUtil
			.mul(hongBaoList.get(0).getMoney(), weiQuanOrder.getMoney())
			.divide(commonOrder.getSettlement(), 2, BigDecimal.ROUND_UP);
			if (wqMoney.compareTo(hongBaoList.get(0).getMoney()) > 0)
			wqMoney = hongBaoList.get(0).getMoney();
			weiQuanMoney = weiQuanMoney.add(wqMoney);
			}
			}
			}
			}
			return weiQuanMoney;
			}

			public void listDataFactory(AcceptData acceptData, List<CommonOrderVO> listOrder, List<CommonOrderVO> listGoods,
			Long uid) {

			List<String> listTB = new ArrayList<String>();
			List<String> listJD = new ArrayList<String>();
			List<String> listPDD = new ArrayList<String>();
			for (CommonOrderVO commonOrderVO : listOrder) {
			Integer sourceType = commonOrderVO.getSourceType();
			if (sourceType == null) {
			continue;
			} else if (sourceType == Constant.SOURCE_TYPE_TAOBAO) {
			listTB.add(commonOrderVO.getOrderNo());
			} else if (sourceType == Constant.SOURCE_TYPE_JD) {
			listJD.add(commonOrderVO.getOrderNo());
			} else if (sourceType == Constant.SOURCE_TYPE_PDD) {
			listPDD.add(commonOrderVO.getOrderNo());
			}
			}

			List<UserSystemCouponRecord> listRecordTB = null;
			if (listTB.size() > 0) {
			listRecordTB = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_TAOBAO, listTB);
			}

			List<UserSystemCouponRecord> listRecordJD = null;
			if (listJD.size() > 0) {
			listRecordJD = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_JD, listJD);
			}

			List<UserSystemCouponRecord> listRecordPDD = null;
			if (listPDD.size() > 0) {
			listRecordPDD = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_PDD, listPDD);
			}

			/* 组合商品信息 */
			for (CommonOrderVO commonOrder : listGoods) {
			CommonOrderGoods goods = commonOrder.getCommonOrderGoods();
			if (goods == null) {
			continue;
			}

			String orderNo1 = commonOrder.getOrderNo();
			Integer sourceType = commonOrder.getSourceType();
			for (CommonOrderVO order : listOrder) {
			String orderNo2 = order.getOrderNo();
			Integer sourceType2 = order.getSourceType();

			// 来源、订单号相同
			if (sourceType.equals(sourceType2) && orderNo1.equals(orderNo2)) {
			// 加入商品信息
			List<CommonOrderGoodsVO> listOrderGoods = order.getListOrderGoods();

			CommonOrderGoodsVO commonGoodsVO = new CommonOrderGoodsVO();
			try {
			PropertyUtils.copyProperties(commonGoodsVO, goods);
			} catch (Exception e) {
			e.printStackTrace();
			}

			commonGoodsVO.setGoodsType(sourceType2);

			String picture = commonGoodsVO.getPicture();
			if (!StringUtil.isNullOrEmpty(picture) && !picture.contains("320x320")) {
			commonGoodsVO.setPicture(TbImgUtil.getTBSize320Img(picture));
			}

			Integer hongBaoType = order.getHongBaoType();
			// 邀请订单信息保护
			if (HongBaoV2.TYPE_YAOQING == hongBaoType \|\| HongBaoV2.TYPE_YIJI == hongBaoType
			\|\| HongBaoV2.TYPE_ERJI == hongBaoType \|\| HongBaoV2.TYPE_SHARE_YIJI == hongBaoType
			\|\| HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {
			Map<String, String> titleMap = new HashMap<String, String>();
			titleMap.put("content", "为保障用户隐私，商品信息已隐藏!");
			titleMap.put("fontColor", "#888888");
			titleMap.put("bottomColor", "#E9E9E9");
			commonGoodsVO.setTitle(null);
			commonGoodsVO.setGoodsTitle(titleMap);
			}

			// 购买数量
			commonGoodsVO.setActualCount(commonOrder.getTotalCount() + "件");

			BigDecimal totalSettlement = commonOrder.getTotalSettlement();
			if (totalSettlement == null \|\| totalSettlement.compareTo(new BigDecimal(0)) <= 0) {
			totalSettlement = commonOrder.getTotalPayment();
			}
			// 实付款
			commonGoodsVO.setActualPay("付款金额：¥" + totalSettlement);

			Integer orderType = order.getOrderType();
			if (orderType == null) {
			String shopType = commonGoodsVO.getShopType();
			if (CommonOrderGoodsVO.TYPE_TAOBAO.equalsIgnoreCase(shopType)) {
			order.setOrderType(1);
			} else if (CommonOrderGoodsVO.TYPE_TMALL.equalsIgnoreCase(shopType)) {
			order.setOrderType(2);
			}
			}
			listOrderGoods.add(commonGoodsVO);
			break;
			}
			}
			}

			SimpleDateFormat format = new SimpleDateFormat("yyyy.MM.dd HH:mm");
			SimpleDateFormat formatday = new SimpleDateFormat("yyyy.MM.dd");

			// 是否存在奖励券
			// boolean hasRewardCoupon =
			// userSystemCouponService.hasRewardCoupon(uid);
			boolean hasRewardCoupon = userSystemCouponService.getIncludeNotExchange(uid);
			boolean exchangeCoupon = userSystemCouponService.getIncludeExchange(uid);

			// 2019.8.1开始返回维权信息
			Date august = null;
			try {
			august = TimeUtil.parse("2019-08-01");
			} catch (ParseException e) {
			e.printStackTrace();
			}

			/* 组织订单状态等信息 */
			for (CommonOrderVO order : listOrder) {

			Date thirdCreateTime = order.getThirdCreateTime();
			if (thirdCreateTime != null) {
			order.setDownTime("下单时间：" + format.format(thirdCreateTime));
			order.setObtainTime(thirdCreateTime.getTime());
			}

			Date settleTime = order.getSettleTime();
			if (settleTime != null) {
			order.setReceiveTime("收货时间：" + format.format(settleTime));
			}

			Integer sourceType2 = order.getSourceType();
			if (sourceType2 == Constant.SOURCE_TYPE_TAOBAO) {
			Integer orderType = order.getOrderType();
			if (orderType == null) {
			order.setOrderType(1);
			}
			} else if (sourceType2 == Constant.SOURCE_TYPE_JD) {
			order.setOrderType(3);
			} else if (sourceType2 == Constant.SOURCE_TYPE_PDD) {
			order.setOrderType(4);
			}

			/* 订单状态转换处理 */
			String orderStateContent = "";
			Map<String, String> orderStateMap = new HashMap<String, String>();

			// 订单状态
			Integer orderState = order.getState();
			// 红包状态
			Integer hongBaoState = order.getHongBaoState();

			Integer stateWholeOrder = order.getStateWholeOrder();
			if (CommonOrder.STATE_WHOLE_ORDER_BUFENYOUXIAO == stateWholeOrder) {
			// 整个订单部分失效：判断真实状态订单、红包
			CommonOrderVO buFenOrder = commonOrderMapper.getBuFenOrderState(uid, order.getOrderNo());
			if (buFenOrder != null) {
			// 有效的订单状态
			orderState = buFenOrder.getState();
			// 有效的红包状态
			hongBaoState = buFenOrder.getHongBaoState();
			}
			}

			BigDecimal hongBao = order.getHongBao();
			if (hongBao == null) {
			hongBao = new BigDecimal(0);
			}

			if (CommonOrder.STATE_FK == orderState) {
			orderStateContent = "已付款";
			} else if (CommonOrder.STATE_JS == orderState) {
			orderStateContent = "已收货";
			} else if (CommonOrder.STATE_SX == orderState) {
			orderStateContent = "未付款/已退款";
			} else if (CommonOrder.STATE_WQ == orderState) {
			orderStateContent = "已维权";

			Integer sourceType = order.getSourceType();
			if (sourceType != null && sourceType == Constant.SOURCE_TYPE_TAOBAO) {
			/* 订单维权判断是否全部维权 */
			List<TaoBaoWeiQuanOrder> listWQ = taoBaoWeiQuanOrderMapper
			.selectListByOrderIdAndState(order.getOrderNo(), "维权成功");

			boolean isPart = false;// 默认失效
			BigDecimal weiQuanMoney = getWeiQuanMoney(listWQ, sourceType, uid);

			if (!VersionUtil.greaterThan_1_6_0(acceptData.getPlatform(), acceptData.getVersion())) {
			if (isPart) {
			hongBaoState = HongBaoV2.STATE_BUFENSHIXIAO; // 部分失效
			} else {
			hongBaoState = HongBaoV2.STATE_SHIXIAO; // 全部失效
			}
			} else {
			// 2019.8.1 返回维权信息
			if (settleTime != null && august != null && settleTime.getTime() > august.getTime()) {
			orderStateContent = "维权成功";
			WeiQuanInfo weiQuanInfo = new WeiQuanInfo();
			weiQuanInfo.setOldHongBao("¥" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());
			// if (isPart) {
			weiQuanInfo
			.setWqHongBao("维权：-¥" + weiQuanMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
			hongBao = MoneyBigDecimalUtil.sub(hongBao, weiQuanMoney);
			// } else {
			// weiQuanInfo
			// .setWqHongBao("维权：-¥" + weiQuanMoney.setScale(2,
			// BigDecimal.ROUND_DOWN).toString());
			// hongBao = MoneyBigDecimalUtil.sub(hongBao,
			// weiQuanMoney);
			// }
			order.setWeiQuanInfo(weiQuanInfo);
			}
			}
			}
			}
			orderStateMap.put("content", orderStateContent);
			orderStateMap.put("fontColor", "#666666");
			order.setOrderState(orderStateMap);

			String hongbaoInfo = "";
			// 订单标识
			List<String> signList = new ArrayList<String>();

			Integer hongBaoType = order.getHongBaoType();
			if (HongBaoV2.TYPE_ZIGOU == hongBaoType \|\| 2 == hongBaoType) { // 自购
			hongbaoInfo = "返利";
			order.setOrderOrigin("1");
			order.setHongBaoTypePic(CommonOrder.TYPE_FANLI);
			signList.add(CommonOrder.TYPE_FANLI);
			} else if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType) { // 分享
			hongbaoInfo = "奖金";
			order.setOrderOrigin("2");
			order.setHongBaoTypePic(CommonOrder.TYPE_SHARE);
			signList.add(CommonOrder.TYPE_SHARE);
			} else if (HongBaoV2.TYPE_SHARE_YIJI == hongBaoType \|\| HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {
			// 邀请订单 (下级的分享订单)
			hongbaoInfo = "奖金";
			order.setOrderOrigin("3");
			order.setHongBaoTypePic(CommonOrder.TYPE_INVITE);
			signList.add(CommonOrder.TYPE_INVITE);
			} else if (HongBaoV2.TYPE_YAOQING == hongBaoType \|\| HongBaoV2.TYPE_YIJI == hongBaoType
			\|\| HongBaoV2.TYPE_ERJI == hongBaoType) { // 邀请订单
			hongbaoInfo = "奖金";
			order.setOrderOrigin("3");
			order.setHongBaoTypePic(CommonOrder.TYPE_INVITE);
			signList.add(CommonOrder.TYPE_INVITE);

			// 版本区分：2-0-2
			if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {
			InviteOrderSubsidy orderSubsidy = inviteOrderSubsidyService.getByOrderNoAndType(uid, order.getOrderNo(), sourceType2);
			if (orderSubsidy != null) {
			ClientTextStyleVO subsidyInfo = new ClientTextStyleVO();
			if (orderSubsidy.getState() == InviteOrderSubsidy.STATE_SUBSIDIZED) {
			subsidyInfo.setColor("#E5005C");
			subsidyInfo.setContent("已补贴¥" + orderSubsidy.getMoney());
			} else {
			subsidyInfo.setColor("#888888");
			subsidyInfo.setContent("补贴¥" + orderSubsidy.getMoney());

			// 解释信息（问号）
			List<String> subsidyList = new ArrayList<String>();
			subsidyList.add("额外补贴能否获得由系统算法自动判断，人为无法干涉；");
			subsidyList.add("额外补贴到账时间以及金额请以实际到账为准；");
			subsidyList.add("额外补贴产生后将会在消息-资金消息中提醒你。");
			order.setSubsidyList(subsidyList);
			}
			order.setSubsidy(subsidyInfo);
			}
			}
			}

			String hongBaoDate = null;
			String hongBaoState_Str = "";
			String hongbaoInfoFontColor = "#E5005C";
			String stateContent = "";
			String stateFontColor = "#E5005C";
			Integer orderHongBaoState = null;

			if (HongBaoV2.STATE_KELINGQU == hongBaoState \|\| HongBaoV2.STATE_BUKELINGQU == hongBaoState) {
			orderHongBaoState = 1;
			stateContent = "未到账";
			hongBaoState_Str = "预估";
			Date preAccountTime = order.getPreAccountTime();
			if (preAccountTime != null)
			hongBaoDate = "预计到账时间：" + formatday.format(preAccountTime);
			} else if (HongBaoV2.STATE_YILINGQU == hongBaoState) {
			orderHongBaoState = 3;
			stateContent = "已到账";
			Date accountTime = order.getAccountTime();
			if (accountTime != null)
			hongBaoDate = "到账时间：" + formatday.format(accountTime);
			} else if (HongBaoV2.STATE_BUFENSHIXIAO == hongBaoState) {
			stateContent = "部分失效";
			orderHongBaoState = 3;
			Date accountTime = order.getAccountTime();
			if (accountTime != null)
			hongBaoDate = "到账时间：" + formatday.format(accountTime);
			} else if (HongBaoV2.STATE_SHIXIAO == hongBaoState) {
			orderHongBaoState = 4;
			stateContent = "已失效";
			hongbaoInfoFontColor = "#888888";
			}
			order.setHongBaoState(orderHongBaoState);
			order.setHongBaoDate(hongBaoDate);

			if (!StringUtil.isNullOrEmpty(order.getStateDesc()))
			stateContent = stateContent + "-" + order.getStateDesc();

			Map<String, String> stateMap = new HashMap<String, String>();
			stateMap.put("content", stateContent);
			stateMap.put("fontColor", stateFontColor);
			order.setAccountState(stateMap);

			hongbaoInfo = hongBaoState_Str + hongbaoInfo;
			Map<String, String> hongBaoMap = new HashMap<String, String>();
			hongBaoMap.put("content", hongbaoInfo + " ¥" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());
			hongBaoMap.put("fontColor", hongbaoInfoFontColor);
			order.setHongBaoInfo(hongBaoMap);

			Integer sourceType = order.getSourceType();
			// 非自购的订单不显示返利、免单详情
			if (HongBaoV2.TYPE_ZIGOU != hongBaoType) {
			order.setSignList(signList);
			} else {
			// 奖励订单、免单使用记录
			if (sourceType == null) {
			setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType, null,
			signList, acceptData);
			} else if (sourceType == Constant.SOURCE_TYPE_TAOBAO) {
			setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType,
			listRecordTB, signList, acceptData);
			} else if (sourceType == Constant.SOURCE_TYPE_JD) {
			setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType,
			listRecordJD, signList, acceptData);
			} else if (sourceType == Constant.SOURCE_TYPE_PDD) {
			setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType,
			listRecordPDD, signList, acceptData);
			}
			}

			// 分享、邀请隐藏订单号
			if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType \|\| HongBaoV2.TYPE_YAOQING == hongBaoType
			\|\| HongBaoV2.TYPE_YIJI == hongBaoType \|\| HongBaoV2.TYPE_ERJI == hongBaoType
			\|\| HongBaoV2.TYPE_SHARE_YIJI == hongBaoType \|\| HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {
			order.setOrderNo(UserUtil.filterOrderId(order.getOrderNo()));
			}
			}
			}


			/**
			* 订单：免单标识奖励标识
			*
			@@ -683,11 +275,11 @@
			}

			boolean rewardOrder = false;

			int type = 1; // 1 常规跳转页面 2弹出选项（奖励券）
			if (rewardSuccess) {
			// 奖励成功
			rewardOrder = true;
			if (!VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
			rewardOrder = true; //奖励成功 2.0.2 消失
			}
			} else if (hasRewardCoupon && !freeOrder && HongBaoV2.TYPE_ZIGOU == hongBaoType
			&& HongBaoV2.STATE_YILINGQU == hongBaoState) {
			// 有可用的奖励券、非免单订单、且已到账的、返利订单
			@@ -702,12 +294,12 @@
			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();
			long limitDate = Long.parseLong("1573315200000"); // TODO 日期待确定2019-11-10
			long limitDate = Long.parseLong("1571760000000"); // TODO 日期待确定2019-11-10
			if (downOrderTime > limitDate) {
			newEdition = true;
			Date endDay = DateUtil.plusDayDate(4, thirdCreateTime);
			@@ -752,9 +344,13 @@
			rewardStyleVO.setColor("#E5005C");
			rewardStyleVO.setBottomColor("#FFDCEA");
			if (!newEdition) {
			rewardStyleVO.setContent("返利奖励 >");
			if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
			rewardStyleVO.setContent("使用奖励券 >");
			} else {
			rewardStyleVO.setContent("返利奖励 >");
			}
			} else if (canUse) {
			rewardStyleVO.setContent("返利奖励 ");
			rewardStyleVO.setContent("使用奖励券");

			ClientTextStyleVO txt1 = new ClientTextStyleVO();
			txt1.setContent("剩");
			@@ -765,6 +361,7 @@
			txt2.setContent(num);
			txt2.setColor("#E5005C");
			txt2.setBottomColor("#FFDCEA");
			txt2.setFontSize("1.33");

			ClientTextStyleVO txt3 = new ClientTextStyleVO();
			txt3.setContent(unit + "关闭 >");
			@@ -1061,25 +658,24 @@
			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();
			subsidyInfo.setContent("(补贴¥" + orderSubsidy.getMoney() + ")");
			if (orderSubsidy.getState() == InviteOrderSubsidy.STATE_SUBSIDIZED) {
			subsidyInfo.setColor("#E5005C");
			subsidyInfo.setContent("已补贴¥" + orderSubsidy.getMoney());
			} else {
			subsidyInfo.setColor("#888888");
			subsidyInfo.setContent("补贴¥" + orderSubsidy.getMoney());

			// 解释信息（问号）
			List<String> subsidyList = new ArrayList<String>();
			subsidyList.add("额外补贴能否获得由系统算法自动判断，人为无法干涉；");
			subsidyList.add("额外补贴到账时间以及金额请以实际到账为准；");
			subsidyList.add("额外补贴产生后将会在消息-资金消息中提醒你。");
			order.setSubsidyList(subsidyList);
			}
			order.setSubsidy(subsidyInfo);

			// 解释信息（问号）
			List<String> subsidyList = new ArrayList<String>();
			subsidyList.add("额外补贴能否获得由系统算法自动判断，人为无法干涉；");
			subsidyList.add("额外补贴到账时间以及金额请以实际到账为准；");
			subsidyList.add("额外补贴产生后将会在消息-资金消息中提醒你。");
			order.setSubsidyList(subsidyList);
			}
			}
			}
			@@ -1172,6 +768,64 @@
			}
			}
			}

			@Override
			public Map<String, BigDecimal> countHistoryOrder(Long uid, Integer day, Integer source) {
			return commonOrderMapper.countHistoryOrder(uid, day, source);
			}

			@Override
			public long countBonusOrderNumber(Long uid, Integer type, Integer day, String startTime, String endTime,
			Integer source) {
			return commonOrderMapper.countBonusOrderNumber(uid, type, day, startTime, endTime, source);
			}

			@Override
			public BigDecimal countBonusOrderMoney(Long uid, Integer type, Integer day, String startTime, String endTime,
			Integer source) {
			return commonOrderMapper.countBonusOrderMoney(uid, type, day, startTime, endTime, source);
			}

			@Override
			public Map<String, Object> countBonusOrderMoneyAndNumber(Long uid, Integer type, Integer day, String startTime,
			String endTime, Integer source) {
			return commonOrderMapper.countBonusOrderMoneyAndNumber(uid, type, day, startTime, endTime, source);
			}

			@Override
			public Long countUserOrderToApp(Long uid, Integer type, String startTime, String endTime,
			Integer day, Integer source, Integer state, Integer stateOrder) {
			return commonOrderMapper.countUserOrderToApp(uid, type, startTime, endTime, day, source, state, stateOrder);
			}

			private BigDecimal getWeiQuanMoney(List<TaoBaoWeiQuanOrder> listWQ, int sourceType, Long uid) {
			BigDecimal weiQuanMoney = new BigDecimal(0);
			if (listWQ != null && listWQ.size() > 0) {
			for (TaoBaoWeiQuanOrder weiQuanOrder : listWQ) {
			String tradeId = weiQuanOrder.getOrderItemId();
			// 查询红包
			List<String> tradeList = new ArrayList<>();
			tradeList.add(tradeId);
			List<HongBaoV2> hongBaoList = hongBaoV2Service.listBySourceTypeAndTradeIdListAndUid(sourceType, uid,
			tradeList);
			if (hongBaoList != null && hongBaoList.size() > 0) {
			CommonOrder commonOrder = commonOrderMapper.selectBySourceTypeAndTradeId(sourceType, tradeId);
			if (commonOrder != null && commonOrder.getSettlement().compareTo(new BigDecimal(0)) > 0) {
			BigDecimal wqMoney = MoneyBigDecimalUtil
			.mul(hongBaoList.get(0).getMoney(), weiQuanOrder.getMoney())
			.divide(commonOrder.getSettlement(), 2, BigDecimal.ROUND_UP);
			if (wqMoney.compareTo(hongBaoList.get(0).getMoney()) > 0)
			wqMoney = hongBaoList.get(0).getMoney();
			weiQuanMoney = weiQuanMoney.add(wqMoney);
			}
			}
			}
			}
			return weiQuanMoney;
			}





			@Override
			@@ -1407,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);
			@@ -1523,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;
			@@ -1531,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>();
			}
			@@ -1718,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
			@@ -1919,4 +1578,37 @@
			return commonOrderList.get(0);
			}



			@Override
			public CommonOrderVO firstValidOrderByUid(Long uid) {
			return commonOrderMapper.firstValidOrderByUid(uid, null, null);
			}

			@Override
			public CommonOrderVO firstValidOrderByUidAndType(Long uid, Integer type) {
			return commonOrderMapper.firstValidOrderByUid(uid, type, null);
			}


			@Override
			public CommonOrderVO firstValidOrderLastMonthByUidAndType(Long uid, Integer type) {
			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);
			}
			}