Merge branch 'haucheng_panzhihua' into huacheng_test

101captain

2022-08-03 37466a6157e0c447d2fef3b847b7e9d9a1992503

Merge branch 'haucheng_panzhihua' into huacheng_test

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PartyBuildingMemberVO.java

@@ -29,6 +29,7 @@
    @ApiModelProperty(value = "转正时间")
    private Date employmentTime;
    @ApiModelProperty(value = "所属党组织id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long orgId;
    @ApiModelProperty(value = "头像图片路径")
    private String photoPath;
@@ -67,6 +68,7 @@
    private String position;

    @ApiModelProperty(value = "报道单位id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long checkUnitId;

    @ApiModelProperty(value = "报道单位名称")

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java

@@ -982,23 +982,23 @@
                        }
                    }

                    if (type.equals(1)) {// 审核通过给用户增加积分
                        communityService.addIntegralTradeAdmin(
                            new AddComActIntegralUserDTO(id, AddComActIntegralUserDTO.integralType.fbwxy,
                                this.getCommunityId(), comActMicroWishVO1.getSponsorId()));
                        if (R.isOk(userResult)) {
                            String openid = userResult.getData().toString();
                            WxXCXTempSend util = new WxXCXTempSend();
                            R<SysTemplateConfigVO> sysTemplateConfigVO=userService.selectTemplate(this.getAreaCode(),4);
                            try {
                                WxUtil.sendSubscribeSHZT(openid, util.getAccessToken(), "微心愿",
                                    DateUtils.format(comActMicroWishVO1.getExamineAt(), DateUtils.ymdhms_format),
                                    "审核通过",sysTemplateConfigVO.getData().getTemplateId());
                            } catch (Exception e) {
                                log.error("消息推送失败，失败原因：" + e.getMessage());
                            }
                        }
                    }
//                    if (type.equals(1)) {// 审核通过给用户增加积分
//                        communityService.addIntegralTradeAdmin(
//                            new AddComActIntegralUserDTO(id, AddComActIntegralUserDTO.integralType.fbwxy,
//                                this.getCommunityId(), comActMicroWishVO1.getSponsorId()));
//                        if (R.isOk(userResult)) {
//                            String openid = userResult.getData().toString();
//                            WxXCXTempSend util = new WxXCXTempSend();
//                            R<SysTemplateConfigVO> sysTemplateConfigVO=userService.selectTemplate(this.getAreaCode(),4);
//                            try {
//                                WxUtil.sendSubscribeSHZT(openid, util.getAccessToken(), "微心愿",
//                                    DateUtils.format(comActMicroWishVO1.getExamineAt(), DateUtils.ymdhms_format),
//                                    "审核通过",sysTemplateConfigVO.getData().getTemplateId());
//                            } catch (Exception e) {
//                                log.error("消息推送失败，失败原因：" + e.getMessage());
//                            }
//                        }
//                    }
                }
            }
        }

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngRealCompanyDO.java

@@ -4,6 +4,8 @@

import com.baomidou.mybatisplus.annotation.*;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;

/**
@@ -17,6 +19,7 @@

    /** 主键 */
    @TableId(type = IdType.ASSIGN_ID)
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    /** 社区ID */

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberWestServiceImpl.java

@@ -93,6 +93,7 @@
        Date date = new Date();
        comPbMemberWestDO1.setCreateAt(date);
        comPbMemberWestDO1.setUpdateAt(date);
        comPbMemberWestDO1.setId(null);
        int insert = comPbMemberWestDAO.insert(comPbMemberWestDO1);
        if (insert > 0) {
            // 删除已驳回的记录