Merge branch 'renhequ' into dev

101captain

2022-01-14 6fc1e7f179acaeec4df755f72895b3b4fb50d4bb

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComElderAuthRecordsServiceImpl.java

@@ -15,6 +15,8 @@

import javax.annotation.Resource;

import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.ComElderAuthElderliesService;
@@ -87,6 +89,8 @@
    private ComPensionAuthPensionerDAO comPensionAuthPensionerDAO;
    @Resource
    private ComElderAuthElderliesService comElderAuthElderliesService;
    @Resource
    private UserService userService;

    @Override
    public R pageElderAuthRecords(PageElderAuthRecordsDTO pageElderAuthRecordsDTO) {
@@ -164,12 +168,12 @@
        comElderAuthRecordsDO.setApprovalDate(nowDate);
        if (comElderAuthRecordVO.getApprovalStatus().equals(ComElderAuthRecordsDO.approvalStatus.tg)) {
            comElderAuthRecordsDO.setAuthStatus(ComElderAuthRecordsDO.authStatus.yrz);
            sendAuthSubscribe(comElderAuthRecordsDO.getSubmitUserId(), "高龄认证", "认证成功！");
            sendAuthSubscribe(comElderAuthRecordsDO.getSubmitUserId(), "高龄认证", "认证成功！",comElderAuthRecordVO.getAreaCode());

            authElderliesDO.setAddress(comElderAuthRecordVO.getAddress());
            comElderAuthElderliesDAO.updateById(authElderliesDO);
        } else {
            sendAuthSubscribe(comElderAuthRecordsDO.getSubmitUserId(), "高龄认证", comElderAuthRecordVO.getRejectReason());
            sendAuthSubscribe(comElderAuthRecordsDO.getSubmitUserId(), "高龄认证", comElderAuthRecordVO.getRejectReason(),comElderAuthRecordVO.getAreaCode());
        }
//        comElderAuthRecordsDO.setApprovalDate(new Date());
        int nub = comElderAuthRecordsDAO.updateById(comElderAuthRecordsDO);
@@ -179,7 +183,7 @@
        return R.ok();
    }

    private void sendAuthSubscribe(Long userId, String name, String result) {
    private void sendAuthSubscribe(Long userId, String name, String result,String areaCode) {
        //发送订阅通知
        Map<String, String> map = comActActSignDAO.getUserOpenId(userId);
        if (map != null) {
@@ -187,9 +191,10 @@
            try {
                WxXCXTempSend util = new WxXCXTempSend();
                String accessToken = util.getAppAccessToken();
                R<SysTemplateConfigVO> sysTemplateConfigVO=userService.selectTemplate(areaCode,5);
                WxUtil.sendSubscribeRZSH(openid, accessToken, name,
                        DateUtils.format(new Date(), DateUtils.ymdhms_format),
                        result);
                        result,sysTemplateConfigVO.getData().getTemplateId());
            } catch (Exception e) {
                log.error("推送审核状态订阅消息失败，失败原因：" + e.getMessage());
            }
@@ -580,7 +585,7 @@
            return R.fail("认证失败，请重新尝试");
        }
        if (addIdentityAuthDTO.getAuthMethod().intValue() == FACE_AUTH.getMethod()) {
            sendAuthSubscribe(addIdentityAuthDTO.getSubmitUserId(), "高龄认证", "认证成功！");
            sendAuthSubscribe(addIdentityAuthDTO.getSubmitUserId(), "高龄认证", "认证成功！",addIdentityAuthDTO.getAreaCode());
        }
        return R.ok();
    }