fanli-server.git

			@@ -735,10 +735,12 @@
			}
			}
			}
			} else if (commonOrder.getState() == CommonOrder.STATE_SX) {//设置失效
			// userSystemCouponService.updateS


			} else if (commonOrder.getState() == CommonOrder.STATE_SX) {// 设置免单券失效
			try {
			userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo());
			} catch (Exception e) {
			e.printStackTrace();
			}
			}

			HongBaoV2 hongBao = new HongBaoV2();
			@@ -758,7 +760,6 @@
			} else if (commonOrder.getState() == CommonOrder.STATE_SX) {
			hongBao.setState(HongBaoV2.STATE_SHIXIAO);
			hongBao.setMoney(new BigDecimal(0));

			} else {
			throw new HongBaoException(3, "维权订单不能创建红包");
			}
			@@ -794,7 +795,7 @@
			}

			UserInfo boss = threeSaleSerivce.getBoss(user.getId());
			if (boss != null && hongBao.getState() != HongBaoV2.STATE_SHIXIAO && mianDanMoney==null) {// 1级BOSS存在且红包未失效,免单不支持多级分销
			if (boss != null && hongBao.getState() != HongBaoV2.STATE_SHIXIAO && mianDanMoney == null) {// 1级BOSS存在且红包未失效,免单不支持多级分销

			// 插入一级子红包
			BigDecimal firstRate = hongBaoManageService

			@@ -70,6 +70,7 @@
			import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanDrawBackService;
			import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;
			import com.yeshi.fanli.service.inter.user.UserNotificationService;
			import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
			import com.yeshi.fanli.util.CMQManager;
			import com.yeshi.fanli.util.RedisManager;
			import com.yeshi.fanli.util.StringUtil;
			@@ -166,6 +167,9 @@

			@Resource
			private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;

			@Resource
			private UserSystemCouponService userSystemCouponService;

			@Override
			public void processOrder(Map<String, List<TaoBaoOrder>> orders) {
			@@ -524,7 +528,12 @@
			// 新版通知
			userMoneyMsgNotificationService.fanliOrderReceived(uid, hongBaoOrder.getCommonOrder().getOrderNo(),
			userGoodsCount.get(uid), money, user.getMyHongBao());

			}
			// 通知免单到账
			try {
			userSystemCouponService.updateStateByArrivalAccount(hongBaoOrder.getCommonOrder().getOrderNo());
			} catch (Exception e) {
			e.printStackTrace();
			}

			// 维权扣款（2018-08-05后开始实行）

	fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史