Merge branch 'renhequ' into dev

101captain

2022-01-14 6fc1e7f179acaeec4df755f72895b3b4fb50d4bb

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

@@ -7,6 +7,7 @@

import javax.annotation.Resource;

import com.panzhihua.service_community.entity.SysTemplateConfig;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -56,6 +57,10 @@
    private ComActEasyPhotoRewardMapper comActEasyPhotoRewardMapper;
    @Resource
    private ComActActSignDAO comActActSignDAO;
    @Resource
    private ComActDAO comActDAO;
    @Resource
    private SysTemplateConfigDao sysTemplateConfigDao;

    /**
     * 查询用户钱包信息
@@ -246,10 +251,12 @@
        Map<String, String> map = comActActSignDAO.getUserOpenId(easyPhotoDO.getSponsorId());
        if (map != null) {
            String openid = map.get("openid");
            ComActDO comActDO=comActDAO.selectById(easyPhotoDO.getCommunityId());
            SysTemplateConfig sysTemplateConfig=sysTemplateConfigDao.selectOne(new QueryWrapper<SysTemplateConfig>().lambda().eq(SysTemplateConfig::getAreaCode, comActDO.getAreaCode()).eq(SysTemplateConfig::getType,7));
            WxXCXTempSend util = new WxXCXTempSend();
            try {
                WxUtil.sendSubscribeJLDZ(openid, util.getAppAccessToken(), "随手拍有奖活动",
                    amount.setScale(2, RoundingMode.HALF_UP), activityTypeName);
                    amount.setScale(2, RoundingMode.HALF_UP), activityTypeName,sysTemplateConfig.getTemplateId());
            } catch (Exception e) {
                log.error("消息推送失败，失败原因：" + e.getMessage());
            }