~jiangyouyao/beauty-erp.git

			@@ -114,66 +114,87 @@
			void handleExtensionOrder(ShopOrder order) {
			//判读客户是否存在上级，存在则产生上级的收益
			BizUser bizUser = bizUserService.findByOpenId(order.getUserId());
			if(StringUtils.isNotBlank(bizUser.getParentOpenId())){//存在上级

			LogUtil.debug("处理分销订单userOpid={}",bizUser.getOpenId());
			//判断是否重复生成
			QueryWrapper queryWrapper=new QueryWrapper();
			queryWrapper.eq("order_id",order.getId());
			Integer orderCount = shopSalesmanOrderDao.selectCount(queryWrapper);
			if(orderCount==0){
			ShopSalesmanOrder salesmanOrder=new ShopSalesmanOrder();
			salesmanOrder.setCompanyId(order.getCompanyId());
			salesmanOrder.setCreateBy(MatrixConstance.SYSTEM_USER);
			salesmanOrder.setUpdateBy(MatrixConstance.SYSTEM_USER);
			salesmanOrder.setCreateTime(new Date());
			salesmanOrder.setUpdateTime(new Date());
			salesmanOrder.setOrderId(Long.parseLong(order.getId()+""));
			salesmanOrder.setUserId(order.getUserId());
			salesmanOrder.setSalesUserId(bizUser.getParentOpenId());
			salesmanOrder.setRevenueType(ShopSalesmanOrder.REVENUE_TYPE_SALES);
			salesmanOrder.setOrderStatus(ShopSalesmanOrder.STATUS_DJS);
			Double salesAmount=0D;
			Double selfAmount=0D;
			Double invitationAmount=0D;
			Double orderTotal=0D;
			Double zk=1D;

			BizUser salesMan=bizUserService.findByOpenId(bizUser.getParentOpenId());
			BizUser invitationMan=null;
			ShopSalesmanOrder invitationOrder=null;
			boolean hasInvitationMan=StringUtils.isNotBlank(salesMan.getParentOpenId());

			//判断推广员是否还存在上级,存在则计算邀请收益
			if(hasInvitationMan){
			invitationMan=bizUserService.findByOpenId(salesMan.getParentOpenId());
			invitationOrder=new ShopSalesmanOrder();
			BeanUtils.copyProperties(salesmanOrder,invitationOrder);
			invitationOrder.setSalesUserId(invitationMan.getOpenId());
			invitationOrder.setRevenueType(ShopSalesmanOrder.REVENUE_TYPE_INVITATION);
			LogUtil.debug("处理分销订单userOpid={}",bizUser.getOpenId());
			//判断是否重复生成
			QueryWrapper queryWrapper=new QueryWrapper();
			queryWrapper.eq("order_id",order.getId());
			Integer orderCount = shopSalesmanOrderDao.selectCount(queryWrapper);
			if(orderCount==0){
			ShopSalesmanOrder salesmanOrder=new ShopSalesmanOrder();
			salesmanOrder.setCompanyId(order.getCompanyId());
			salesmanOrder.setCreateBy(MatrixConstance.SYSTEM_USER);
			salesmanOrder.setUpdateBy(MatrixConstance.SYSTEM_USER);
			salesmanOrder.setCreateTime(new Date());
			salesmanOrder.setUpdateTime(new Date());
			salesmanOrder.setOrderId(Long.parseLong(order.getId()+""));
			salesmanOrder.setUserId(order.getUserId());
			salesmanOrder.setRevenueType(ShopSalesmanOrder.REVENUE_TYPE_SALES);
			salesmanOrder.setOrderStatus(ShopSalesmanOrder.STATUS_DJS);
			Double selfAmount=0D;
			Double zk=1D;
			//分销订单总额
			Double orderTotal=0D;
			for (ShopOrderDetails item:order.getDetails() ){
			if(item.getShopProduct().getAbleSales()==ShopProduct.ABLE_SALES){
			orderTotal+=item.getTotalPrice().doubleValue();
			}

			//收益计算
			}
			//自购返佣
			Integer isSales = bizUser.getIsSales();
			if(BizUser.IS_SALES == isSales){
			for (ShopOrderDetails item:order.getDetails() ){
			if(StringUtils.isNotBlank(item.getShopProduct().getAttrValues())
			&& item.getShopProduct().getAbleSales()==ShopProduct.ABLE_SALES){
			if(item.getShopProduct().getAbleSales()==ShopProduct.ABLE_SALES){
			//分销规则是否开启自购返佣
			BusParameterSettings zgfy = parameterSettingsDao.selectCompanyParamByCode(FenxiaoSettingConstant.FX_ZGFY, bizUser.getCompanyId());
			//按分销等级计算
			ShopSalesmanGrade shopSalesmanGrade = shopSalesmanGradeDao.selectById(salesMan.getSalesmanGrade());
			ShopSalesmanGrade shopSalesmanGrade = shopSalesmanGradeDao.selectById(bizUser.getSalesmanGrade());
			if(ObjectUtil.isNotEmpty(zgfy)) {
			//获取商品的自购返佣价格,如果没有设置，在去获取当前推广人的等级的自购返佣比例
			if(StrUtil.isNotEmpty(zgfy.getParamValue()) &&
			FenxiaoSettingConstant.FX_ZGFY_YES.equals(zgfy.getParamValue())) {
			if(item.getShopSku().getSelfPrice() == null
			if(StrUtil.isNotEmpty(zgfy.getParamValue()) &&
			FenxiaoSettingConstant.FX_ZGFY_YES.equals(zgfy.getParamValue())) {
			if(item.getShopSku().getSelfPrice() == null
			\|\|item.getShopSku().getSealesPrice().doubleValue() == 0){
			selfAmount+=item.getTotalPrice().doubleValue()*(shopSalesmanGrade.getSelfCommission()/100);
			}else {
			//按产品设置的自购返佣金额计算
			selfAmount+=item.getShopSku().getSelfPrice().doubleValue()*item.getCount();
			}
			}
			}else {
			//按产品设置的自购返佣金额计算
			selfAmount+=item.getShopSku().getSelfPrice().doubleValue()*item.getCount();
			}
			}
			}
			}
			}
			//自购返佣记录
			if(selfAmount > 0) {
			//整体的优惠金额折算成折扣，* 佣金
			zk=order.getOrderMoney().doubleValue()/orderTotal;
			selfAmount=selfAmount*zk;
			salesmanOrder.setAmount(selfAmount);
			salesmanOrder.setSalesUserId(order.getUserId());
			shopSalesmanOrderDao.insert(salesmanOrder);
			}
			}

			//存在上级
			if(StringUtils.isNotBlank(bizUser.getParentOpenId())) {
			BizUser salesMan=bizUserService.findByOpenId(bizUser.getParentOpenId());
			Double salesAmount=0D;
			Double invitationAmount=0D;
			BizUser invitationMan=null;
			ShopSalesmanOrder invitationOrder=null;
			boolean hasInvitationMan=StringUtils.isNotBlank(salesMan.getParentOpenId());
			//判断推广员是否还存在上级,存在则计算邀请收益
			if(hasInvitationMan){
			invitationMan=bizUserService.findByOpenId(salesMan.getParentOpenId());
			invitationOrder=new ShopSalesmanOrder();
			BeanUtils.copyProperties(salesmanOrder,invitationOrder);
			invitationOrder.setSalesUserId(invitationMan.getOpenId());
			invitationOrder.setRevenueType(ShopSalesmanOrder.REVENUE_TYPE_INVITATION);
			}
			//收益计算
			for (ShopOrderDetails item:order.getDetails() ){
			if(item.getShopProduct().getAbleSales()==ShopProduct.ABLE_SALES){
			//按分销等级计算
			ShopSalesmanGrade shopSalesmanGrade = shopSalesmanGradeDao.selectById(salesMan.getSalesmanGrade());
			//推广提成，按分销等级计算或者按产品设置的推广金额计算
			if(item.getShopSku().getSealesPrice()==null
			\|\|item.getShopSku().getSealesPrice().doubleValue()==0){
			@@ -193,25 +214,16 @@
			invitationAmount+=item.getShopSku().getInvitationPrice().doubleValue()*item.getCount();
			}
			}

			orderTotal+=item.getTotalPrice().doubleValue();
			}
			}
			//自购返佣记录
			if(selfAmount > 0) {
			//整体的优惠金额折算成折扣，* 佣金
			zk=order.getOrderMoney().doubleValue()/orderTotal;
			selfAmount=selfAmount*zk;
			salesmanOrder.setAmount(selfAmount);
			shopSalesmanOrderDao.insert(salesmanOrder);
			}
			//推广提成记录
			if(salesAmount>0){
			//整体的优惠金额折算成折扣，* 佣金
			zk=order.getOrderMoney().doubleValue()/orderTotal;
			salesAmount=salesAmount*zk;
			salesmanOrder.setAmount(salesAmount);
			shopSalesmanOrderDao.insert(salesmanOrder);
			//整体的优惠金额折算成折扣，* 佣金
			zk=order.getOrderMoney().doubleValue()/orderTotal;
			salesAmount=salesAmount*zk;
			salesmanOrder.setAmount(salesAmount);
			salesmanOrder.setSalesUserId(bizUser.getParentOpenId());
			shopSalesmanOrderDao.insert(salesmanOrder);
			}
			//邀请提成记录
			if(invitationAmount > 0) {
			@@ -221,12 +233,10 @@
			shopSalesmanOrderDao.insert(invitationOrder);
			}
			}else{
			LogUtil.debug("重复订单id={}",order.getId());
			LogUtil.debug("不存在父级userOpid={}",bizUser.getOpenId());
			}
			}else{
			LogUtil.debug("不存在父级userOpid={}",bizUser.getOpenId());
			LogUtil.debug("重复订单id={}",order.getId());
			}


			}
			}