java/qijisheng.git

			@@ -102,11 +102,20 @@
			//直推上级
			if("1".equals(s)){
			ztsj_price = ztsj_price.add(superiorSubcommission);
			ztsj_point += superiorRebatePoints;
			}
			//直帮上级
			if("2".equals(s)){
			zbsj_price = zbsj_price.add(superiorSubcommission);
			}
			}
			split = orderGood.getSuperiorType().split(",");
			for (String s : split) {
			//直推上级
			if("1".equals(s)){
			ztsj_point += superiorRebatePoints;
			}
			//直帮上级
			if("2".equals(s)){
			zbsj_point += superiorRebatePoints;
			}
			}
			@@ -262,7 +271,7 @@
			shopAppUser.setLavePoint(shopAppUser.getLavePoint() + hxmd_point);
			shopAppUser.setAvailablePoint(shopAppUser.getAvailablePoint() + earnPoint1);
			shopAppUser.setTotalPoint(shopAppUser.getTotalPoint() + hxmd_point);
			shopAppUser.setShopAchievementPoint(shopAppUser.getShopAchievementPoint() + bdmdsj_point);
			shopAppUser.setShopAchievementPoint(shopAppUser.getShopAchievementPoint() + hxmd_point);
			//门店返佣
			shop.setShopAllPoint(shop.getShopAllPoint() + hxmd_point);
			shop.setServerPoint(shop.getServerPoint() + hxmd_point);
			@@ -395,7 +404,7 @@
			bdShopAppUser.setLavePoint(bdShopAppUser.getLavePoint() + bdmd_point);
			bdShopAppUser.setAvailablePoint(bdShopAppUser.getAvailablePoint() + earnPoint1);
			bdShopAppUser.setTotalPoint(bdShopAppUser.getTotalPoint() + bdmd_point);
			bdShopAppUser.setShopSharePoint(bdShopAppUser.getShopSharePoint() + bdmdsj_point);
			bdShopAppUser.setShopSharePoint(bdShopAppUser.getShopSharePoint() + bdmd_point);
			//门店返佣
			shop1.setShopAllPoint(shop1.getShopAllPoint() + bdmd_point);
			shop1.setSharePoint(shop1.getSharePoint() + bdmd_point);
			@@ -463,7 +472,7 @@
			}

			//上级门店分佣
			Integer pid = shopClient.getShopById(order.getShopId()).getData().getPid();
			Integer pid = shop1.getPid();
			Shop shop2 = shopClient.getShopById(pid).getData();
			if(null != shop2){
			AppUser sjShopAppUser = appUserClient.getAppUserById(shop2.getAppUserId());