fanli-server.git

			@@ -11,16 +11,19 @@
			import javax.annotation.Resource;

			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;
			import org.yeshi.utils.DateUtil;

			import com.yeshi.fanli.dao.mybatis.user.UserSystemCouponMapper;
			import com.yeshi.fanli.entity.bus.user.HongBaoV2;
			import com.yeshi.fanli.entity.bus.user.Order;
			import com.yeshi.fanli.entity.bus.user.UserInfo;
			import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
			import com.yeshi.fanli.entity.bus.user.UserSystemCoupon;
			import com.yeshi.fanli.entity.bus.user.UserSystemCouponRecord;
			import com.yeshi.fanli.entity.common.JumpDetailV2;
			import com.yeshi.fanli.entity.money.UserMoneyDetail;
			import com.yeshi.fanli.entity.order.CommonOrder;
			import com.yeshi.fanli.entity.order.HongBaoOrder;
			import com.yeshi.fanli.entity.system.SystemCoupon;
			import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;
			import com.yeshi.fanli.exception.user.UserSystemCouponException;
			@@ -28,12 +31,19 @@
			import com.yeshi.fanli.service.inter.config.ConfigService;
			import com.yeshi.fanli.service.inter.config.SystemCouponService;
			import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;
			import com.yeshi.fanli.service.inter.msg.UserMoneyMsgNotificationService;
			import com.yeshi.fanli.service.inter.order.CommonOrderService;
			import com.yeshi.fanli.service.inter.order.HongBaoOrderService;
			import com.yeshi.fanli.service.inter.order.OrderHongBaoMapService;
			import com.yeshi.fanli.service.inter.order.OrderService;
			import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
			import com.yeshi.fanli.service.inter.user.UserInfoService;
			import com.yeshi.fanli.service.inter.user.UserMoneyDetailService;
			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.factory.UserMoneyDetailFactory;
			import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
			import com.yeshi.fanli.vo.order.CommonOrderVO;
			import com.yeshi.fanli.vo.user.UserSystemCouponRecordVO;
			@@ -67,11 +77,27 @@

			@Resource
			private HongBaoOrderService hongBaoOrderService;

			@Resource
			private OrderHongBaoMapService orderHongBaoMapService;

			@Resource
			private OrderService orderService;

			@Resource
			private UserMoneyDetailService userMoneyDetailService;

			@Resource
			private UserInfoService userInfoService;

			@Resource
			private UserMoneyMsgNotificationService userMoneyMsgNotificationService;

			@Resource
			private UserInfoExtraService userInfoExtraService;

			// 券失效图片
			public final static String PIC_INVALID= "http://192.168.1.200/icon/mian_invalid.png";


			public final static String PIC_INVALID = "http://192.168.1.200/icon/mian_invalid.png";

			@Override
			public int insertSelective(UserSystemCoupon record) {
			@@ -99,6 +125,11 @@
			}

			@Override
			public List<UserSystemCoupon> getUserCouponBySource(Long uid, String source) {
			return userSystemCouponMapper.getUserCouponBySource(uid, source);
			}

			@Override
			public long countUserCouponList(Long uid) {
			return userSystemCouponMapper.countUserCouponList(uid);
			}
			@@ -117,7 +148,7 @@
			}

			// 数据组织
			listDataFactory(listVO);
			listDataFactory(listVO, uid);

			return listVO;
			}
			@@ -127,7 +158,7 @@
			*
			* @param listVO
			*/
			public void listDataFactory(List<UserSystemCouponVO> listVO) {
			public void listDataFactory(List<UserSystemCouponVO> listVO, Long uid) throws Exception{

			for (UserSystemCouponVO userCouponVO : listVO) {

			@@ -147,30 +178,38 @@
			userCouponVO.setCouponPicture(systemCoupon.getPicture());
			userCouponVO.setCouponEffect(systemCoupon.getEffect());
			userCouponVO.setCouponRule(systemCoupon.getRule());

			// 使用中状态改变为已使用
			Integer state = userCouponVO.getState();
			if (UserSystemCoupon.STATE_IN_USE == state) {
			state = UserSystemCoupon.STATE_END_USE;
			userCouponVO.setState(state);
			}


			// 按钮跳转

			// 使用状态
			Integer state = userCouponVO.getState();

			// 按钮跳转
			Map<String, Object> jumpBtn = null;

			Integer stateActivated = userCouponVO.getStateActivated();

			if (stateActivated == null \|\| stateActivated == 0) {
			// 显示规则
			userCouponVO.setCouponRule(systemCoupon.getRemark());
			systemCoupon.setEffect("待激活");

			// 状态未激活
			userCouponVO.setState(0);
			userCouponVO.setCouponEffect("待激活");

			// 状态未激活 -且未被使用
			if (UserSystemCoupon.STATE_CAN_USE == state) {
			userCouponVO.setState(0);
			}

			jumpBtn = new HashMap<String, Object>();
			Map<String, Object> jumpLink = new HashMap<String, Object>();
			jumpLink.put("url", configService.get("invite_activation_url"));

			UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
			if (userInfoExtra != null && userInfoExtra.getInviteCode() != null
			&& userInfoExtra.getInviteCode().trim().length() > 0) {

			jumpLink.put("url", configService.get("invite_activation_success_url" +"?alert=ture"));
			} else {

			jumpLink.put("url", configService.get("invite_activation_url"));
			}

			jumpBtn.put("params", jumpLink);
			jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite"));

			@@ -184,25 +223,35 @@
			CouponTypeEnum type = systemCoupon.getType();
			if (CouponTypeEnum.freeCoupon == type \|\| CouponTypeEnum.welfareFreeCoupon == type) {
			// 免单券、福利免单券
			jumpLink.put("url", configService.get("invite_activation_url"));

			// 免单商品列表
			jumpLink.put("url", configService.get("free_goods_list"));

			jumpBtn = new HashMap<String, Object>();
			jumpBtn.put("params", jumpLink);
			jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("web"));

			} else if (CouponTypeEnum.rebatePercentCoupon == type) {
			// 返利奖励券
			jumpLink.put("url", configService.get("invite_activation_url"));

			// 返利奖励券- 跳转至订单到账界面
			jumpLink.put("state", 2);

			jumpBtn = new HashMap<String, Object>();
			jumpBtn.put("params", jumpLink);
			jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite"));
			// 跳转订单列表
			jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("orderList"));
			}
			} else if (UserSystemCoupon.STATE_END_USE == state \|\| UserSystemCoupon.STATE_OVERDUE == state) {
			userCouponVO.setCouponPicture(PIC_INVALID);

			} else if (UserSystemCoupon.STATE_IN_USE == state) {
			// 使用中
			userCouponVO.setInUseExplain(configService.get("free_coupon_using-help"));
			}

			}

			// 券失效图片替换
			if (UserSystemCoupon.STATE_END_USE == state \|\| UserSystemCoupon.STATE_OVERDUE == state) {
			userCouponVO.setCouponPicture(PIC_INVALID);
			}

			userCouponVO.setJumpBtn(jumpBtn);

			String couponTerm = "有效期：";
			@@ -217,7 +266,8 @@
			if (UserSystemCoupon.STATE_CAN_USE == state) {
			int differentDays = 0;
			if (endTime != null && startTime != null) {
			differentDays = DateUtil.differentDaysByMillisecond(new Date(), endTime) + 1;
			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
			differentDays = DateUtil.daysBetween(sdf.format(new Date()), sdf.format(endTime)) + 1;
			if (differentDays < 0) {
			differentDays = 0;
			}
			@@ -241,9 +291,8 @@
			listCouponId.add(systemCoupon.getId());
			}

			List<UserSystemCouponVO> listVO = userSystemCouponMapper.getEnableListByCouponId(uid, activated,
			listCouponId);

			List<UserSystemCouponVO> listVO = userSystemCouponMapper.getEnableListByCouponId(uid, activated, listCouponId);

			if (listVO == null \|\| listVO.size() == 0) {
			return null;
			}
			@@ -268,7 +317,7 @@
			userCouponVO.setCouponName(systemCoupon.getName());
			userCouponVO.setCouponEffect(systemCoupon.getEffect());
			userCouponVO.setCouponRule(systemCoupon.getRule());


			Integer stateActivated = userCouponVO.getStateActivated();
			if (stateActivated == null \|\| stateActivated == 0) {
			userCouponVO.setCouponPicture(PIC_INVALID); // 未激活
			@@ -284,8 +333,9 @@
			if (endTime != null && startTime != null) {
			SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
			couponTerm = couponTerm + sdf.format(startTime) + "-" + sdf.format(endTime);

			differentDays = DateUtil.differentDaysByMillisecond(new Date(), endTime) + 1;

			SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
			differentDays = DateUtil.daysBetween(sdf2.format(new Date()), sdf2.format(endTime)) + 1;
			if (differentDays < 0) {
			differentDays = 0;
			}
			@@ -374,14 +424,19 @@
			if (!uid.equals(couponUid)) {
			throw new UserSystemCouponException(1, "传递参数不匹配");
			}


			SystemCoupon systemCoupon = userSystemCoupon.getSystemCoupon();


			SystemCoupon baseCoupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());
			if (baseCoupon == null \|\| baseCoupon.getId() == null) {
			throw new UserSystemCouponException(1, "未找到券基本信息");
			}

			if (baseCoupon.getType() != CouponTypeEnum.freeCoupon
			&& baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon) {
			throw new UserSystemCouponException(1, "券类型不匹配");
			}

			Date date = new Date();
			// 更新券使用
			userSystemCoupon.setState(UserSystemCoupon.STATE_IN_USE); // 正在匹配
			@@ -401,6 +456,7 @@
			userSystemCouponRecordService.insertSelective(couponRecord);
			}

			@Transactional
			@Override
			public void useOrderCoupon(Long uid, Long id, String orderNo) throws UserSystemCouponException, Exception {

			@@ -423,6 +479,11 @@
			}
			}

			if (systemCoupon.getType() != CouponTypeEnum.rebatePercentCoupon) {
			throw new UserSystemCouponException(1, "券类型不匹配");
			}


			if (orderNo == null \|\| orderNo.trim().length() == 0) {
			throw new UserSystemCouponException(1, "订单号不存在");
			}
			@@ -433,7 +494,6 @@
			throw new UserSystemCouponException(1, "订单信息获取失败");
			}

			Long commonOrderId = orderVO.getId();

			BigDecimal hongBao = orderVO.getHongBao();
			// 红包状态
			@@ -443,6 +503,10 @@

			// 条件: A:必须是返利订单、B:必须已经处于已到账状态
			if (HongBaoV2.TYPE_ZIGOU == hongBaoType && HongBaoV2.STATE_YILINGQU == hongBaoState \|\| hongBao != null) {

			Order order = orderService.findOrderByOrderIdAndType(orderNo, Order.ORDER_TYPE_TAOBAO);
			if (order == null)
			return;

			/* 奖金计算以及相关红包信息处理 */

			@@ -460,15 +524,22 @@
			hongBaoV2.setCreateTime(new Date());
			hongBaoV2.setUpdateTime(new Date());
			hongBaoV2.setUserInfo(new UserInfo(uid));
			hongBaoV2.setPreGetTime(new Date());
			hongBaoV2.setGetTime(new Date());
			hongBaoV2Service.insertSelective(hongBaoV2);

			// 2、订单关联红包表
			HongBaoOrder hongBaoOrder = new HongBaoOrder();
			hongBaoOrder.setHongBaoV2(hongBaoV2);
			hongBaoOrder.setCommonOrder(new CommonOrder(commonOrderId));
			hongBaoOrderService.insertSelective(hongBaoOrder);
			// 2.插入关联
			orderHongBaoMapService.addOrderHongBaoMap(hongBaoV2, order);

			// TODO 红包相关信息插入以及通知
			// 3.插入资金明细,用户余额
			UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createOrderReward(orderNo, money,
			new UserInfo(uid));
			userMoneyDetailService.addUserMoneyDetail(userMoneyDetail);
			userInfoService.addMoney(new UserInfo(uid), money);

			// 插入资金通知
			userMoneyMsgNotificationService.orderReward(uid, orderNo, money,
			userInfoService.selectByPKey(uid).getMyHongBao());

			/* 用户券信息状态及记录处理 */

			@@ -492,7 +563,6 @@

			}


			@Override
			public UserSystemCouponRecordVO getRewardCouponRecord(String orderNo) throws UserSystemCouponException, Exception {

			@@ -527,21 +597,26 @@
			throw new UserSystemCouponException(1, "券类型不正确");
			}

			List<CommonOrderVO> list = commonOrderService.getCouponHongbaoByOrderNo(userSystemCoupon.getUid(),
			HongBaoV2.STATE_YILINGQU, orderNo);

			if (list == null \|\| list.size() == 0) {
			Long uid = userSystemCoupon.getUid();

			CommonOrderVO commonOrderVO= commonOrderService.getCommonOrderByOrderNo(userSystemCoupon.getUid(),
			orderNo, CommonOrder.STATE_JS);

			if (commonOrderVO == null) {
			throw new UserSystemCouponException(1, "订单信息获取失败");
			}

			// 获取奖励金额
			Map<String, BigDecimal> map = orderHongBaoMapService.getCouponHongbaoByOrderNo(orderNo, uid);

			UserSystemCouponRecordVO userRecordVO = new UserSystemCouponRecordVO();
			userRecordVO.setCouponMoneyState("已到账");
			userRecordVO.setCommonOrder(list.get(0));
			userRecordVO.setCouponName("奖励金: ¥" + list.get(0).getCouponMoney().setScale(2, BigDecimal.ROUND_DOWN));
			userRecordVO.setCommonOrder(commonOrderVO);
			userRecordVO.setCouponName("奖励金: ¥" + map.get("couponMoney").setScale(2, BigDecimal.ROUND_DOWN));

			// 比例
			BigDecimal percent = baseCoupon.getPercent();
			BigDecimal hongBao = list.get(0).getHongBao().setScale(2, BigDecimal.ROUND_DOWN);
			BigDecimal hongBao = map.get("totalMoney").setScale(2, BigDecimal.ROUND_DOWN);
			userRecordVO.setCouponEffect("返利¥" + hongBao + "已返" + percent + "%");

			// 跳转福利中心
			@@ -563,7 +638,6 @@
			return userRecordVO;
			}


			@Override
			public UserSystemCouponRecordVO getFreeCouponRecord(String orderNo) throws UserSystemCouponException, Exception {

			@@ -597,20 +671,19 @@
			if (orderVO == null) {
			throw new UserSystemCouponException(1, "订单信息获取失败");
			}


			UserSystemCouponRecordVO userRecordVO = new UserSystemCouponRecordVO();
			userRecordVO.setCommonOrder(orderVO);


			ClientTextStyleVO fanMoney = new ClientTextStyleVO();
			fanMoney.setContent("返利: ¥" + orderVO.getHongBao().setScale(2, BigDecimal.ROUND_DOWN));
			fanMoney.setContent("返利: ¥" + orderVO.getHongBao().setScale(2, BigDecimal.ROUND_DOWN));
			fanMoney.setColor("#000000"); // 默认黑色
			userRecordVO.setFanMoney(fanMoney);


			ClientTextStyleVO payMoney = new ClientTextStyleVO();
			payMoney.setContent("实付款:¥"+ orderVO.getPayment().setScale(2, BigDecimal.ROUND_DOWN));
			payMoney.setContent("实付款:¥" + orderVO.getPayment().setScale(2, BigDecimal.ROUND_DOWN));
			payMoney.setColor("#000000"); // 默认黑色



			String progressMsg = "";
			String progressColor = "";
			// 跳转奖励券规则
			@@ -618,62 +691,62 @@

			// 进度： 1 灰色 2 红色 3 绿色
			String progressState1 = "3";
			String progressState2 = "1";
			String progressState2 = "1";
			String progressState3 = "1";
			String progressState4 = "1";


			String goodsState = "商品收货";
			// 文字状态
			String text2Color = "#999999";
			String text3Color = "#999999";
			String text4Color = "#999999";


			// 底部备注
			String rewardCouponRemark = "";
			// 状态跳转
			JumpDetailV2 jumpDetail = null;
			// 进度状态 1等待 2 失败 3成功
			// 进度状态 1等待 2 失败 3成功
			int progressState = 1;


			Integer stateRecord = record.getState();
			if (UserSystemCouponRecord.STATE_FAIL_RULE == stateRecord) {
			// 规则不匹配
			progressState = 2;


			progressColor = "#E41212";
			progressMsg = "抱歉不符合免单规则，免单失败" ;

			progressState1 = "2"; //不匹配

			progressMsg = "抱歉不符合免单规则，免单失败";

			progressState1 = "2"; // 不匹配

			payMoney.setColor("#E41212");


			userRecordVO.setCouponMoneyState("已退回");
			userRecordVO.setCouponName(baseCoupon.getName());


			jumpDetail = jumpDetailV2Service.getByTypeCache("welfareCore");


			rewardCouponRemark = configService.get("free_coupon_back_remark");


			} else if (UserSystemCouponRecord.STATE_FAIL_DRAWBACK == stateRecord) {
			// 退款
			progressState = 2;


			progressColor = "#E41212";
			progressMsg = "商品已退款，免单失败";


			text2Color = "#E41212";
			goodsState = "商品已退款";


			progressState2 = "2";


			userRecordVO.setCouponMoneyState("已退回");
			userRecordVO.setCouponName(baseCoupon.getName());


			jumpDetail = jumpDetailV2Service.getByTypeCache("welfareCore");


			rewardCouponRemark = configService.get("free_coupon_back_remark");

			} else if (UserSystemCouponRecord.STATE_FREE_ON == stateRecord) {

			} else if (UserSystemCouponRecord.STATE_FREE_ON == stateRecord) {
			// 免单中
			if (CommonOrder.STATE_JS == orderVO.getState()) {
			progressColor = "#ECA01B";
			@@ -684,65 +757,65 @@
			progressColor = "#ECA01B";
			progressMsg = "免单发起，等待收货";
			}


			rewardCouponRemark = configService.get("free_coupon_remark");

			} else if (UserSystemCouponRecord.STATE_SUCCESS == stateRecord) {

			} else if (UserSystemCouponRecord.STATE_SUCCESS == stateRecord) {
			// 免单成功
			progressState = 3;


			progressColor = "#3EBF13";
			progressMsg = "免单成功，免单金已转入余额";


			progressState2 = "3";
			progressState3 = "3";
			progressState4 = "3";


			text2Color = "#000000";
			text3Color = "#000000";
			text4Color = "#000000";


			userRecordVO.setCouponMoneyState("已到账");
			userRecordVO.setCouponName("返利: ¥" + orderVO.getHongBao().setScale(2, BigDecimal.ROUND_DOWN));


			jumpDetail = jumpDetailV2Service.getByTypeCache("capitalDetails");


			rewardCouponRemark = configService.get("free_coupon_remark");
			}
			userRecordVO.setProgressState(progressState);
			userRecordVO.setPayMoney(payMoney);


			// 显示提示较大字
			ClientTextStyleVO progressMsgStyle = new ClientTextStyleVO();
			progressMsgStyle.setContent(progressMsg);
			progressMsgStyle.setContent(progressMsg);
			progressMsgStyle.setColor(progressColor);
			userRecordVO.setProgressMsg(progressMsgStyle);

			/* --- 进度点 ---- */

			/* --- 进度点 ---- */
			Map<String, Object> map1 = new HashMap<String, Object>();
			map1.put("state", progressState1);


			Map<String, Object> map2 = new HashMap<String, Object>();
			map2.put("state", progressState2);
			ClientTextStyleVO style2 = new ClientTextStyleVO();
			style2.setContent(goodsState);
			style2.setContent(goodsState);
			style2.setColor(text2Color);
			map2.put("text", style2);


			Map<String, Object> map3 = new HashMap<String, Object>();
			map3.put("state", progressState3);
			ClientTextStyleVO style3 = new ClientTextStyleVO();
			style3.setContent("返利到账");
			style3.setContent("返利到账");
			style3.setColor(text3Color);
			map3.put("text", style3);


			Map<String, Object> map4 = new HashMap<String, Object>();
			map4.put("state", progressState4);
			ClientTextStyleVO style4 = new ClientTextStyleVO();
			style4.setContent("免单成功");
			style4.setContent("免单成功");
			style4.setColor(text4Color);
			map4.put("text", style4);


			// 圆点颜色
			List<Object> progressList = new ArrayList<Object>();
			progressList.add(map1);
			@@ -750,7 +823,7 @@
			progressList.add(map3);
			progressList.add(map4);
			userRecordVO.setProgressList(progressList);


			if (jumpDetail != null) {
			Map<String, Object> jumpState = new HashMap<String, Object>();
			jumpState.put("jumpDetail", jumpDetail);
			@@ -762,8 +835,10 @@
			if (rewardCouponRemark != null && rewardCouponRemark.trim().length() > 0) {
			userRecordVO.setRemark(JSONObject.fromObject(rewardCouponRemark));
			}


			return userRecordVO;
			}



			}