java/zhihuishenqu.git

			@@ -7,6 +7,8 @@
			import com.panzhihua.common.model.dtos.community.reserve.*;
			import com.panzhihua.common.model.vos.R;
			import com.panzhihua.common.model.vos.community.reserve.*;
			import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
			import com.panzhihua.common.service.user.UserService;
			import com.panzhihua.common.utlis.DateUtils;
			import com.panzhihua.common.utlis.WxUtil;
			import com.panzhihua.common.utlis.WxXCXTempSend;
			@@ -55,6 +57,8 @@
			private ComActReserveOperationRecordService comActReserveOperationRecordService;
			@Resource
			private ComActActSignDAO comActActSignDAO;
			@Resource
			private UserService userService;

			private final static String CANCEL="用户取消";
			@Override
			@@ -244,7 +248,7 @@
			ComActReserveDO reserveDO = comActReserveMapper.selectById(reserveRecordDO.getReserveId());
			// 预约以后给用户推送消息
			Map<String, String> map = comActActSignDAO.getUserOpenId(reserveRecordDO.getUserId());

			R<SysTemplateConfigVO> sysTemplateConfigVO=userService.selectTemplate(makeHandleDTO.getAreaCode(),10);
			//判断处理是否通过
			if(makeHandleDTO.getIsOk().equals(MakeHandleAdminDTO.isOk.yes)){
			reserveRecordDO.setStatus(ComActReserveRecordDO.status.cg);
			@@ -255,7 +259,7 @@
			String openid = map.get("openid");
			try {
			WxUtil.sendSubscribeYYTX(openid, util.getAppAccessToken(), "预约成功",
			reserveDO.getTitle(), reserveRecordDO.getName(), makeHandleDTO.getMakeTime());
			reserveDO.getTitle(), reserveRecordDO.getName(), makeHandleDTO.getMakeTime(),sysTemplateConfigVO.getData().getTemplateId());
			} catch (Exception e) {
			log.error("消息推送失败，失败原因：" + e.getMessage());
			}
			@@ -270,7 +274,7 @@
			String openid = map.get("openid");
			try {
			WxUtil.sendSubscribeYYTX(openid, util.getAppAccessToken(), "预约失败",
			reserveDO.getTitle(), reserveRecordDO.getName(), DateUtils.format(reserveRecordDO.getReserveTime(),DateUtils.ymdhms_format));
			reserveDO.getTitle(), reserveRecordDO.getName(), DateUtils.format(reserveRecordDO.getReserveTime(),DateUtils.ymdhms_format),sysTemplateConfigVO.getData().getTemplateId());
			} catch (Exception e) {
			log.error("消息推送失败，失败原因：" + e.getMessage());
			}