java/zhihuishenqu.git

			@@ -46,11 +46,11 @@
			@Override
			public R getList(int pageNum, int pageSize, String goodsId, String orderNumber,
			String goodsName, String condition, String userName,String communityId,
			String userId,String orderType) {
			String userId,String orderType,String merchantId) {

			Page page=new Page<VolunteerCreditsExchange>(pageNum,pageSize);
			return R.ok(baseMapper.getList(page,goodsId,orderNumber,goodsName,condition,
			userName,communityId,userId,orderType));
			userName,communityId,userId,orderType,merchantId));
			}

			@Override
			@@ -118,6 +118,12 @@
			// goodsService.updateById(vo);
			// }

			int num1=integral-Integer.valueOf(goods.getIntegral());
			loginUserInfoVOR.setLoveIntegral(num1+"");
			userService.putUser(loginUserInfoVOR);

			item.setPalyIntegral(goods.getIntegral());


			//增加积分明细记录
			VolunteerIntegralRecordVO virvo=new VolunteerIntegralRecordVO();
			@@ -128,11 +134,6 @@
			virService.insertVolunteer(virvo);


			int num1=integral-Integer.valueOf(goods.getIntegral());
			loginUserInfoVOR.setLoveIntegral(num1+"");
			userService.putUser(loginUserInfoVOR);

			item.setPalyIntegral(goods.getIntegral());
			//设置订单号
			item.setOrderNumber(Snowflake.getId()+"");
			int num= baseMapper.insertData(item);
			@@ -211,11 +212,12 @@

			item.setCondition("3");
			//设置订单号
			item.setOrderNumber(Snowflake.getId()+"");
			String orderNum=Snowflake.getId()+"";
			item.setOrderNumber(orderNum);
			int num= baseMapper.insertData(item);
			if(num>0)
			{
			return R.ok();
			return R.ok(orderNum);
			}
			return R.fail("操作失败");
			}
			@@ -228,15 +230,6 @@
			return R.fail("参数不能为空");
			}

			if(StringUtils.isEmpty(item.getNeedScore()))
			{
			return R.fail("所需积分不能为空");
			}

			if(StringUtils.isEmpty(item.getUserId()))
			{
			return R.fail("兑换用户id不能为空");
			}
			int num= baseMapper.update(item);
			if(num>0)
			{