~jiangyouyao/beauty-erp.git

			@@ -1026,8 +1026,8 @@
			}

			sourceOrder.setArrears(sourceOrder.getArrears() - refundTotal);
			sourceOrder.setCardPay(sourceOrder.getCardPay() + cardPayTotal);
			sourceOrder.setCashPay(sourceOrder.getCashPay() + cashPayTotal);
			sourceOrder.setCardPay(sourceOrder.getCardPay()==null?0:sourceOrder.getCardPay() + cardPayTotal);
			sourceOrder.setCashPay(sourceOrder.getCashPay()==null?0:sourceOrder.getCashPay() + cashPayTotal);
			sysOrderDao.update(sourceOrder);
			}

			@@ -1188,7 +1188,7 @@
			List<ShoppingGoodsAssemble> assembleList = shoppingGoodsAssembleDao.selectGoodsByShoppingGoodsIdAndType(sysOrderItem.getGoodsId(), ShoppingGoods.SHOPPING_GOODS_TYPE_XM);
			assembleList.forEach(item -> {
			//TODO 补综合卡逻辑
			createProjuseByAssemble(order, sysOrderItem, item, null, null);
			createProjuseByAssemble(order, sysOrderItem, item, null, null,null,0);
			});

			//处理综合卡中包含的套餐
			@@ -1209,7 +1209,7 @@
			* 通过组合关系创建用户项目余次
			*/
			private SysProjUse createProjuseByAssemble(SysOrder order, SysOrderItem sysOrderItem,
			ShoppingGoodsAssemble goodsAssemble, Long taocanId, Date failTime) {
			ShoppingGoodsAssemble goodsAssemble, Long taocanId, Date failTime,String source,Integer maxCount) {
			//计算折扣
			Double zk = sysOrderItem.getZkPrice() / sysOrderItem.getPrice();

			@@ -1217,34 +1217,26 @@
			puse.setIsOver(Dictionary.DELETED_N);
			puse.setOrderItemId(sysOrderItem.getId());
			puse.setProjId(goodsAssemble.getAssembleGoodId());
			puse.setSurplusCount(goodsAssemble.getTotal());
			puse.setSurplusCount(goodsAssemble.getTotal()==null?maxCount: goodsAssemble.getTotal());
			puse.setDeductionNum(goodsAssemble.getDeductionNum());
			puse.setProjName(goodsAssemble.getShoppingGoods().getName());
			puse.setVipId(order.getVipId());
			puse.setStatus(Dictionary.TAOCAN_STATUS_YX);
			puse.setTaocanId(taocanId);
			puse.setType(Dictionary.SHOPPING_GOODS_TYPE_XM);
			puse.setSource(source);

			if (taocanId == null) {
			puse.setPrice(goodsAssemble.getShoppingGoods().getPrice() * zk);
			} else {
			puse.setPrice(goodsAssemble.getPrice() * zk);
			}

			// 赠送和打折后金额为0的都视为赠送项目
			if (sysOrderItem.getIsFree().equals(Dictionary.FLAG_NO) && sysOrderItem.getZkPrice() > 0) {
			puse.setSource(Dictionary.TAOCAN_SOURCE_GM);
			} else {

			puse.setSource(Dictionary.TAOCAN_SOURCE_ZS);
			//赠送项目是否计算消耗业绩否则赠送产品按原价计算消耗
			boolean zsConsumeAchieve = projServicesService.skipServiceOrderStep(Dictionary.ZS_CONSUME_ACHIEVE);
			if(zsConsumeAchieve){
			if(sysOrderItem.getPrice()>0){




			}else{
			if(sysOrderItem.getPrice()<=0){
			//等于0取原价
			if (taocanId == null) {
			puse.setPrice(goodsAssemble.getShoppingGoods().getPrice() );
			@@ -1252,13 +1244,10 @@
			puse.setPrice(goodsAssemble.getPrice());
			}
			}

			}else{
			puse.setPrice(0D);
			}


			}
			puse.setBalance(MoneyUtil.mul(puse.getPrice(), Double.valueOf(puse.getSurplusCount())));
			puse.setFailTime(failTime);
			sysProjUseDao.insert(puse);
			@@ -1308,19 +1297,21 @@
			//创建套餐绑定的项目
			List<ShoppingGoodsAssemble> assembleList = shoppingGoodsAssembleDao.selectGoodsByShoppingGoodsIdAndType(projId, ShoppingGoods.SHOPPING_GOODS_TYPE_XM);
			for (ShoppingGoodsAssemble assemble : assembleList) {
			SysProjUse tempUse = createProjuseByAssemble(order, sysOrderItem, assemble, taocanProjUse.getId(),taocanProjUse.getFailTime());
			SysProjUse tempUse = createProjuseByAssemble(order, sysOrderItem, assemble, taocanProjUse.getId(),taocanProjUse.getFailTime(),taocanProjUse.getSource(),taocanShoppingGoods.getCarUseCount());
			sumBanance += tempUse.getBalance();
			surplusCount += tempUse.getSurplusCount();
			}
			if (Dictionary.FLAG_NO_N.equals(taocanShoppingGoods.getIsCourse())) {
			//固定套餐，剩余次数等于绑定项目的次数
			taocanProjUse.setSurplusCount(surplusCount);
			//合计套餐余额
			taocanProjUse.setBalance(sumBanance);
			} else {
			//任选套餐剩余次数等于最大使用次数
			taocanProjUse.setSurplusCount(taocanShoppingGoods.getCarUseCount());
			taocanProjUse.setBalance(sysOrderItem.getZkPrice());
			}
			//合计套餐余额
			taocanProjUse.setBalance(sumBanance);

			sysProjUseDao.update(taocanProjUse);
			}

			@@ -1356,11 +1347,7 @@
			//赠送项目是否计算消耗业绩否则赠送产品按原价计算消耗
			boolean zsConsumeAchieve = projServicesService.skipServiceOrderStep(Dictionary.ZS_CONSUME_ACHIEVE);
			if(zsConsumeAchieve){
			if(sysOrderItem.getPrice()>0){
			puse.setPrice(sysOrderItem.getZkPrice());
			}else{
			puse.setPrice(sysOrderItem.getShoppingGoods().getSealPice());
			}
			}else{
			puse.setPrice(0D);
			}