fanli-server.git

			@@ -22,6 +22,7 @@
			import com.yeshi.fanli.dao.mybatis.order.CommonOrderGoodsMapper;
			import com.yeshi.fanli.dao.mybatis.order.CommonOrderMapper;
			import com.yeshi.fanli.dao.mybatis.order.CommonOrderTradeIdMapMapper;
			import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoOrderGoodsMapper;
			import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoWeiQuanOrderMapper;
			import com.yeshi.fanli.dto.mq.order.OrderTopicTagEnum;
			import com.yeshi.fanli.dto.mq.order.body.OrderConfirmMQMsg;
			@@ -48,6 +49,7 @@
			import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;
			import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
			import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
			import com.yeshi.fanli.entity.taobao.TaoBaoOrderGoods;
			import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
			import com.yeshi.fanli.exception.order.CommonOrderException;
			import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
			@@ -150,6 +152,9 @@

			@Resource
			private UserLevelManager userLevelManager;

			@Resource
			private TaoBaoOrderGoodsMapper taoBaoOrderGoodsMapper;

			@Resource(name = "producer")
			private Producer orderProducer;
			@@ -874,7 +879,6 @@
			return commonOrderMapper.countUserOrderToApp(uid, type, startTime, endTime, day, source, state, stateOrder);
			}


			@Override
			public BigDecimal getWeiQuanMoney(List<TaoBaoWeiQuanOrder> listWQ, int sourceType, Long uid) {
			BigDecimal weiQuanMoney = new BigDecimal(0);
			@@ -936,8 +940,14 @@
			if ("饿了么".equalsIgnoreCase(taoBaoOrder.getOrderType())) {
			cog.setGoodsId(taoBaoOrder.getTradeId() + "");
			cog.setGoodsType(Constant.SOURCE_TYPE_ELME);
			TaoBaoOrderGoods goods = taoBaoOrderGoodsMapper.selectByTradeId(taoBaoOrder.getTradeId());
			if (goods == null) {
			cog.setPicture("http://img.flqapp.com/resource/goods/elme_picture_demo.png");
			cog.setTitle(taoBaoOrder.getTitle());
			} else {
			cog.setPicture(goods.getImg());
			cog.setTitle(goods.getTitle());
			}
			newCommonOrder.setCommonOrderGoods(cog);
			} else {
			cog.setGoodsId(taoBaoOrder.getAuctionId() + "");
			@@ -1794,7 +1804,6 @@
			return listVO;
			}


			@Override
			public Date getThirdCreateTime(String orderId, int sourceType) {
			List<CommonOrder> list = listBySourceTypeAndOrderId(sourceType, orderId);
			@@ -1802,7 +1811,6 @@
			return null;
			return list.get(0).getThirdCreateTime();
			}


			@Override
			public List<CommonOrderVO> getOrderList(AcceptData acceptData, Integer page, Long uid, Integer state, Integer type,
			@@ -1837,8 +1845,6 @@
			return commonOrderMapper.countOrderList(uid, state, type, orderState, orderNo, startTime, endTime, dateType,
			listSource);
			}



			/**
			* 订单信息加工
			@@ -1892,7 +1898,6 @@
			if (listPDD.size() > 0) {
			listRecordPDD = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_PDD, listPDD);
			}


			SimpleDateFormat format = new SimpleDateFormat("yyyy.MM.dd HH:mm");
			SimpleDateFormat formatday = new SimpleDateFormat("yyyy.MM.dd");
			@@ -1984,7 +1989,6 @@
			order.setReceiveTime("收货时间：" + format.format(settleTime));
			}


			Map<String, String> orderStateMap = new HashMap<String, String>();
			// 订单状态
			Integer orderState = order.getState();
			@@ -2006,11 +2010,11 @@
			}

			// 红包信息
			List<HongBaoOrder> hongBaoOrderList = hongBaoOrderService.listDetailByOrderIdAndSourceTypeAndUid(orderNo, sourceType, uid);
			List<HongBaoOrder> hongBaoOrderList = hongBaoOrderService.listDetailByOrderIdAndSourceTypeAndUid(orderNo,
			sourceType, uid);
			HongBaoCountVO hongBaoCountVO = hongBaoOrderService.getHongBaoCountVO(hongBaoOrderList);
			BigDecimal hongBao = hongBaoCountVO.getValidMoney();
			Integer hongBaoState = hongBaoCountVO.getCurrentState();


			/* 订单状态转换处理 */
			String orderStateContent = "";
			@@ -2024,7 +2028,8 @@
			orderStateContent = "已售后";
			if (sourceType == Constant.SOURCE_TYPE_TAOBAO) {
			/* 订单维权判断是否全部维权 */
			List<TaoBaoWeiQuanOrder> listWQ = taoBaoWeiQuanOrderMapper.selectListByOrderIdAndState(order.getOrderNo(), "维权成功");
			List<TaoBaoWeiQuanOrder> listWQ = taoBaoWeiQuanOrderMapper
			.selectListByOrderIdAndState(order.getOrderNo(), "维权成功");
			BigDecimal weiQuanMoney = getWeiQuanMoney(listWQ, sourceType, uid);
			hongBao = MoneyBigDecimalUtil.sub(hongBao, weiQuanMoney);
			}
			@@ -2069,11 +2074,13 @@
			signList.add(CommonOrder.TYPE_INVITE);

			// 红包加上补贴金额
			InviteOrderSubsidy orderSubsidy = inviteOrderSubsidyService.getByOrderNoAndType(uid, orderNo, sourceType);
			InviteOrderSubsidy orderSubsidy = inviteOrderSubsidyService.getByOrderNoAndType(uid, orderNo,
			sourceType);
			if (orderSubsidy != null && orderSubsidy.getMoney() != null) {
			BigDecimal subsidyMoney = orderSubsidy.getMoney();
			// 维权金额
			InviteOrderSubsidyDebt subsidyDebt = inviteOrderSubsidyDebtService.getBySourceId(orderSubsidy.getId());
			InviteOrderSubsidyDebt subsidyDebt = inviteOrderSubsidyDebtService
			.getBySourceId(orderSubsidy.getId());
			if (subsidyDebt != null && subsidyDebt.getOriginMoney() != null) {
			subsidyMoney = subsidyMoney.subtract(subsidyDebt.getOriginMoney());
			}
			@@ -2132,8 +2139,9 @@
			order.setHongBaoInfo(hongBaoMap);

			// 分享、邀请隐藏订单号
			if (HongBaoV2.TYPE_YAOQING == hongBaoType \|\| HongBaoV2.TYPE_YIJI == hongBaoType \|\| HongBaoV2.TYPE_ERJI == hongBaoType
			\|\| HongBaoV2.TYPE_SHARE_YIJI == hongBaoType \|\| HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {
			if (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()));
			}
			}