fanli-server.git

			@@ -20,22 +20,33 @@
			import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoWeiQuanOrderMapper;
			import com.yeshi.fanli.entity.bus.user.HongBaoV2;
			import com.yeshi.fanli.entity.bus.user.UserInfo;
			import com.yeshi.fanli.entity.bus.user.UserSystemCouponRecord;
			import com.yeshi.fanli.entity.order.CommonOrder;
			import com.yeshi.fanli.entity.order.CommonOrderGoods;
			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.TaoBaoWeiQuanOrder;
			import com.yeshi.fanli.exception.order.CommonOrderException;
			import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
			import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
			import com.yeshi.fanli.service.inter.config.ConfigService;
			import com.yeshi.fanli.service.inter.config.SystemCouponService;
			import com.yeshi.fanli.service.inter.order.CommonOrderService;
			import com.yeshi.fanli.service.inter.user.UserSystemCouponRecordService;
			import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
			import com.yeshi.fanli.util.Constant;
			import com.yeshi.fanli.util.MoneyBigDecimalUtil;
			import com.yeshi.fanli.util.StringUtil;
			import com.yeshi.fanli.util.factory.CommonOrderGoodsFactory;
			import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
			import com.yeshi.fanli.util.taobao.TaoBaoUtil;
			import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
			import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
			import com.yeshi.fanli.vo.order.CommonOrderGoodsVO;
			import com.yeshi.fanli.vo.order.CommonOrderVO;

			import net.sf.json.JSONObject;

			@Service
			public class CommonOrderServiceImpl implements CommonOrderService {
			@@ -48,6 +59,31 @@

			@Resource
			private CommonOrderGoodsMapper commonOrderGoodsMapper;

			@Resource
			private JumpDetailV2Service jumpDetailV2Service;

			@Resource
			private ConfigService configService;

			@Resource
			private UserSystemCouponService userSystemCouponService;

			@Resource
			private UserSystemCouponRecordService userSystemCouponRecordService;

			@Resource
			private SystemCouponService systemCouponService;


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

			// 免单状态图片
			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) {
			@@ -120,7 +156,8 @@

			return listOrder;
			}



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

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

			List<String> listNo = new ArrayList<String>();
			for (CommonOrderVO commonOrderVO: listOrder) {
			listNo.add(commonOrderVO.getOrderNo());
			}

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


			/* 组合商品信息 */
			for (CommonOrderVO commonOrder : listGoods) {

			@@ -224,7 +270,11 @@

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


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

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

			Date thirdCreateTime = order.getThirdCreateTime();
			@@ -299,6 +349,8 @@
			order.setOrderState(orderStateMap);

			String hongbaoInfo = "";
			// 订单标识
			List<String> signList = new ArrayList<String>();
			/* 订单返利类型转换 */
			Integer hongBaoType = order.getHongBaoType();
			if (HongBaoV2.TYPE_ZIGOU == hongBaoType \|\| 2 == hongBaoType) {
			@@ -306,11 +358,14 @@
			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_YAOQING == hongBaoType \|\| HongBaoV2.TYPE_YIJI == hongBaoType
			\|\| HongBaoV2.TYPE_ERJI == hongBaoType \|\| HongBaoV2.TYPE_SHARE_YIJI == hongBaoType
			\|\| HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {
			@@ -318,6 +373,7 @@
			hongbaoInfo = "奖金";
			order.setOrderOrigin("3");
			order.setHongBaoTypePic(CommonOrder.TYPE_INVITE);
			signList.add(CommonOrder.TYPE_INVITE);
			}

			String hongBaoDate = null;
			@@ -379,12 +435,123 @@
			hongBaoMap.put("content", hongbaoInfo + " ¥" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());
			hongBaoMap.put("fontColor", hongbaoInfoFontColor);
			order.setHongBaoInfo(hongBaoMap);

			// 非自购的订单不显示返利、免单详情
			if (HongBaoV2.TYPE_ZIGOU != hongBaoType) {
			// 订单标识
			order.setSignList(signList);

			} else {

			// 是否免单商品
			boolean freeOrder = false;
			// 是否奖励成功
			boolean rewardSuccess = false;

			// 奖励订单、免单使用记录
			if (couponRecordList != null && couponRecordList.size() > 0) {

			for (UserSystemCouponRecord couponRecord: couponRecordList) {
			// 订单号匹配
			if (order.getOrderNo().equals(couponRecord.getOrderNo())) {

			String systemCouponType = couponRecord.getCouponType();
			Integer state = couponRecord.getState();

			// 奖励订单: 且成功
			if (CouponTypeEnum.rebatePercentCoupon.name().equals(systemCouponType)
			&& UserSystemCouponRecord.STATE_SUCCESS == state) {
			rewardSuccess = true;
			signList.add(PIC_REWARD); // 加入奖励成功图片

			} else if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType)
			\|\| CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {

			if (UserSystemCouponRecord.STATE_FREE_ON == state) {
			// 免单中
			freeOrder = true;
			signList.add(PIC_FREE_ON);
			} else if (UserSystemCouponRecord.STATE_SUCCESS == state) {
			// 免单成功
			freeOrder = true;
			signList.add(PIC_FREE_SUCCEED);
			} else if (UserSystemCouponRecord.STATE_FAIL_RULE == state \|\| UserSystemCouponRecord.STATE_FAIL_DRAWBACK == state) {
			// 规则不匹配、退款
			freeOrder = true;
			signList.add(PIC_FREE_FAIL);
			}
			}

			break;
			}
			}
			}

			// 订单标识
			order.setSignList(signList);

			boolean rewardOrder = false;

			int type = 1; // 1 常规跳转页面 2弹出选项（奖励券）
			if (rewardSuccess) {
			// 奖励成功
			rewardOrder = true;
			} else if(hasRewardCoupon && !freeOrder && HongBaoV2.TYPE_ZIGOU == hongBaoType &&
			HongBaoV2.STATE_YILINGQU == hongBaoState) {
			// 有可用的奖励券、非免单订单、且已到账的、返利订单
			type = 2;
			rewardOrder = true;
			}

			if (rewardOrder) {
			ClientTextStyleVO rewardStyleVO = new ClientTextStyleVO();
			// 奖励券进度详情
			rewardStyleVO.setContent("返利奖励 >");
			rewardStyleVO.setColor( "#E5005C");
			rewardStyleVO.setBottomColor("#FFDCEA");

			Map<String, Object> jumpLink = new HashMap<String,Object>();
			jumpLink.put("orderNo", order.getOrderNo());

			Map<String, Object> jump = new HashMap<String,Object>();
			jump.put("type", type);
			jump.put("params", jumpLink);
			jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("rewardCouponDetail"));

			Map<String, Object> rewardMap = new HashMap<String,Object>();
			rewardMap.put("text", rewardStyleVO);
			rewardMap.put("jump", jump);

			order.setRewardDetail(rewardMap);
			}

			if (freeOrder) {
			ClientTextStyleVO rewardStyleVO = new ClientTextStyleVO();
			// 返利、免单详情
			rewardStyleVO.setContent("免单详情 >");
			rewardStyleVO.setColor( "#E5005C");
			rewardStyleVO.setBottomColor("#FFDCEA");

			Map<String, Object> jumpLink = new HashMap<String,Object>();
			jumpLink.put("orderNo", order.getOrderNo());

			Map<String, Object> jump = new HashMap<String,Object>();
			jump.put("type", 1); // 页面跳转
			jump.put("params", jumpLink);
			jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("freeCouponDetail"));

			Map<String, Object> rewardMap = new HashMap<String,Object>();
			rewardMap.put("text", rewardStyleVO);
			rewardMap.put("jump", jump);

			order.setRewardDetail(rewardMap);
			}
			}
			}
			}

			@Override
			public List<CommonOrder> listBySourceTypeAndOrderId(int sourceType, String orderId) {

			return commonOrderMapper.listBySourceTypeAndOrderNo(sourceType, orderId);
			}

			@@ -429,6 +596,7 @@
			taoBaoGoods = TaoKeApiUtil.getSimpleGoodsInfo(taoBaoOrder.getAuctionId());
			} catch (TaobaoGoodsDownException e) {
			e.printStackTrace();
			taoBaoGoods=TaoBaoUtil.getSimpleGoodsBrief(taoBaoOrder.getAuctionId());
			}
			if (taoBaoGoods != null) {
			goods = CommonOrderGoodsFactory.create(taoBaoGoods);
			@@ -638,4 +806,164 @@
			return commonOrderMapper.countQuery(keyType, key, state, type, orderState, startTime, endTime);
			}

			@Override
			public CommonOrderVO getInfoByOrderNo(Long uid,String orderNo) throws CommonOrderException{
			List<CommonOrderVO> list = getOrderByUid(1, uid, null, null, null, orderNo, null, null, null);
			if (list == null \|\| list.size() == 0) {
			return null;
			} else {
			return list.get(0);
			}
			}

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

			CommonOrderVO commonOrderVO = commonOrderMapper.getCommonOrderByOrderNo(uid, orderNo, orderState);
			// 订单信息为空
			if (commonOrderVO == null) {
			return null;
			}

			List<CommonOrderVO> listOrder = new ArrayList<CommonOrderVO>();
			listOrder.add(commonOrderVO);

			// 商品信息
			List<CommonOrderVO> listGoods = commonOrderMapper.listOrderGoodsInfo(listOrder);
			// 订单商品为空
			if (listGoods == null \|\| listGoods.size() == 0) {
			return null;
			}

			/* 组合商品信息 */
			for (CommonOrderVO commonOrder : listGoods) {

			CommonOrderGoods goods = commonOrder.getCommonOrderGoods();
			if (goods == null) {
			continue;
			}

			String orderNo1 = commonOrder.getOrderNo();
			Integer sourceType = commonOrder.getSourceType();

			String orderNo2 = commonOrderVO.getOrderNo();
			Integer sourceType2 = commonOrderVO.getSourceType();

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

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

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

			Integer hongBaoType = commonOrderVO.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);

			listOrderGoods.add(commonGoodsVO);

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

			break;
			}
			}

			return commonOrderVO;
			}

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

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

			// 订单信息为空
			if (listOrder == null \|\| listOrder.size() == 0) {
			listOrder = new ArrayList<CommonOrderVO>();
			return listOrder;
			}

			// 商品信息
			List<CommonOrderVO> listGoods = commonOrderMapper.listOrderGoodsInfo(listOrder);
			// 订单商品为空
			if (listGoods == null \|\| listGoods.size() == 0) {
			return listOrder;
			}

			// 数据加工重新组织
			listDataFactory(listOrder, listGoods, uid);

			return listOrder;
			}


			@Override
			public JSONObject getRewardJumpInfo(String orderNo) {

			JSONObject map = new JSONObject();
			// 订单标识
			List<String> signList = new ArrayList<String>();
			signList.add(CommonOrder.TYPE_FANLI);
			signList.add(PIC_REWARD); // 加入奖励成功图片
			map.put("signList", signList);


			ClientTextStyleVO rewardStyleVO = new ClientTextStyleVO();
			// 奖励券进度详情
			rewardStyleVO.setContent("返利奖励 >");
			rewardStyleVO.setColor( "#E5005C");
			rewardStyleVO.setBottomColor("#FFDCEA");

			Map<String, Object> jumpLink = new HashMap<String,Object>();
			jumpLink.put("orderNo", orderNo);

			Map<String, Object> jump = new HashMap<String,Object>();
			jump.put("type", 1);
			jump.put("params", jumpLink);
			jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("rewardCouponDetail"));

			Map<String, Object> rewardMap = new HashMap<String,Object>();
			rewardMap.put("text", rewardStyleVO);
			rewardMap.put("jump", jump);

			map.put("rewardDetail", rewardMap);

			return map;
			}
			}