java/HongRuiTang.git

			@@ -2666,10 +2666,6 @@
			OrderGoods orderGoods;
			String orderGoodsId;
			GoodsFile goodsFile;
			//BigDecimal cycleMoney = new BigDecimal("0.00");
			//BigDecimal experienceMoney = new BigDecimal("0.00");
			//BigDecimal serviceMoney = new BigDecimal("0.00");
			//BigDecimal goodsMoney = new BigDecimal("0.00");
			List<OrderGoods> orderGoodsList = new ArrayList<>();
			ConsumerGoods consumerGoods;
			String consumerGoodsId;
			@@ -2810,24 +2806,6 @@
			consumerGoodsList.add(consumerGoods);
			}
			}

			//商户变更计算
			/*switch (orderGoods.getGoodsType()) {
			case 1:
			cycleMoney = cycleMoney.add(orderGoods.getGoodsReceivableMoney());
			break;
			case 2:
			serviceMoney = serviceMoney.add(orderGoods.getGoodsReceivableMoney());
			break;
			case 3:
			experienceMoney = experienceMoney.add(orderGoods.getGoodsReceivableMoney());
			break;
			case 4:
			goodsMoney = goodsMoney.add(orderGoods.getGoodsReceivableMoney());
			break;
			default:
			break;
			}*/
			}
			//创建订单
			Order order = new Order();
			@@ -2894,15 +2872,6 @@
			memberTotalChangeDto.setUserId(order.getUserId());
			memberTotalChangeDto.setConsumeTime(nowTime);
			remoteMemberService.changeMemberTotal(memberTotalChangeDto);
			//更新商户统计
			/*ShopTotalChangeDto shopTotalChangeDto = new ShopTotalChangeDto();
			shopTotalChangeDto.setShopId(order.getShopId());
			shopTotalChangeDto.setOrderType(1);
			shopTotalChangeDto.setCycleMoney(cycleMoney);
			shopTotalChangeDto.setServiceMoney(serviceMoney);
			shopTotalChangeDto.setExperienceMoney(experienceMoney);
			shopTotalChangeDto.setGoodsMoney(goodsMoney);
			remoteShopService.changeShopTotal(shopTotalChangeDto);*/
			//创建支付记录
			PayRecord payRecord = new PayRecord();
			payRecord.setDelFlag(0);