From 3af254f1b36e7722673fcebe110da524b276105c Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期一, 30 十二月 2024 17:56:04 +0800 Subject: [PATCH] 最新版本541200007 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 55 insertions(+), 1 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java index 9f757c2..f3398ca 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java @@ -10,13 +10,21 @@ import com.doumee.core.utils.DateUtil; import com.doumee.core.utils.SmsConstants; import com.doumee.core.utils.Utils; +import com.doumee.core.wx.wxPlat.WxPlatConstants; +import com.doumee.core.wx.wxPlat.WxPlatNotice; import com.doumee.dao.business.*; +import com.doumee.dao.business.dao.MemberMapper; +import com.doumee.dao.business.dao.SmsConfigMapper; import com.doumee.dao.business.dao.SmsEmailMapper; import com.doumee.dao.business.join.ApproveJoinMapper; import com.doumee.dao.business.model.*; import com.doumee.dao.business.vo.ApproveDataVO; +import com.doumee.dao.business.model.Member; +import com.doumee.dao.system.SystemUserMapper; import com.doumee.dao.system.join.NoticesJoinMapper; +import com.doumee.dao.system.model.Notices; +import com.doumee.dao.system.model.SystemUser; import com.doumee.dao.web.reqeust.PlatformBooksApplyDTO; import com.doumee.dao.web.reqeust.PlatformBooksCheckNumDTO; import com.doumee.dao.web.reqeust.RevokeDTO; @@ -35,6 +43,7 @@ import org.springframework.util.CollectionUtils; import java.math.BigDecimal; +import java.util.Arrays; import java.util.Date; import java.util.List; import java.util.Objects; @@ -66,6 +75,9 @@ private SystemDictDataBiz systemDictDataBiz; @Autowired + private SystemUserMapper systemUserMapper; + + @Autowired private ApproveService approveService; @Autowired @@ -85,6 +97,9 @@ @Autowired private EmayService emayService; + + @Autowired + private WxNoticeConfigMapper wxNoticeConfigMapper; @Override public Integer create(PlatformBooks platformBooks) { @@ -284,6 +299,22 @@ //鍒涘缓瀹℃壒娴佷俊鎭� approveService.createApproveForPlatfrom(approveTempl.getId(),platformBooks.getId(),platformBooks.getDriverId()); + //鍙戦�佸叕浼楀彿閫氱煡 缁欐彁浜や汉 + SystemUser driver = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda() + .eq(SystemUser::getDeleted, Constants.ZERO) + .eq(SystemUser::getType, Constants.ZERO) + .eq(SystemUser::getMobile,platformBooks.getDriverPhone()) + .isNotNull(SystemUser::getOpenid) + .last(" limit 1 ")); + + if(Objects.nonNull(driver)&&StringUtils.isNotBlank(driver.getOpenid())){ + WxPlatNotice wxPlatNotice = new WxPlatNotice(); + wxPlatNotice.sendPlatformBookTemplateNotice(systemDictDataBiz, + wxNoticeConfigMapper, platformBooks, + WxPlatConstants.platformBookContent.platformBookUpload, + systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(), + Arrays.asList(driver.getOpenid().split(",")),0); + } return platformBooks.getId(); } @@ -365,6 +396,20 @@ approve.setCheckDate(model.getCancelTime()); approveList.add(approve); } + + Notices notices = noticesJoinMapper.selectOne(new QueryWrapper<Notices>().lambda() + .eq(Notices::getObjId,id) + .eq(Notices::getType,Constants.noticesObjectType.reason) + .eq(Notices::getUserId,memberId) + .eq(Notices::getSendacopy,Constants.ZERO) + .orderByDesc(Notices::getId).last(" limit 1 ")); + if(Objects.nonNull(notices)){ + if(Constants.equalsInteger(notices.getStatus(),Constants.ZERO)){ + model.setInfo("寰呮垜澶勭悊"); + }else{ + model.setInfo(notices.getInfo()); + } + } return model; } @@ -374,7 +419,6 @@ public void revoke(RevokeDTO revokeDTO, LoginUserInfo loginUserInfo){ if(Objects.isNull(revokeDTO) || Objects.isNull(revokeDTO.getId()) - || StringUtils.isBlank(revokeDTO.getInfo()) ){ throw new BusinessException(ResponseStatus.BAD_REQUEST); } @@ -401,6 +445,16 @@ .eq(Approve::getObjId,revokeDTO.getId()) ); + noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda() + .set(Notices::getEditDate,new Date()) + .set(Notices::getInfo,"鐗╂祦杞﹂绾︾敵璇峰彇娑�") + .set(Notices::getReaded,Constants.ONE) + .set(Notices::getParam2,Constants.TWO) + .set(Notices::getStatus,Constants.ONE) + .eq(Notices::getType,Constants.noticesObjectType.reason) + .eq(Notices::getObjId,model.getId()) + ); + //鍙戦�佺煭淇¢�氱煡 SmsEmailServiceImpl.sendPlatformBookSms(systemDictDataBiz, emayService,smsEmailMapper,smsConfigMapper,platformBooksMapper,model.getId(), -- Gitblit v1.9.3