lidongdong
2023-08-28 e404524a8376e21ee8a5e320593a0ed162ffed6f
修改获取用户积分为0
2个文件已添加
4个文件已修改
98 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/VolunteerMerchantService.java 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerMerchantServiceImpl.java 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserDO.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java
@@ -112,4 +112,5 @@
    private String relationName;
    private String appid;
    private String loveIntegral;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserVO.java
@@ -64,6 +64,9 @@
    private String openid;
    private String loveIntegral;
    /**
     * 用户类型(用户类型 1 小程序 2 运营平台 3 社区平台 5 商家后台 6 网格综治APP 7 网格综治后台 8大屏 9城管后台 10一键报警app)
     */
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/VolunteerMerchantService.java
New file
@@ -0,0 +1,27 @@
package com.panzhihua.service_community.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.VolunteerTypeVO;
import com.panzhihua.service_community.entity.VolunteerMerchant;
import com.panzhihua.service_community.entity.VolunteerType;
public interface VolunteerMerchantService extends IService<VolunteerMerchant>
{
    /**
     * 分页查询
     * @param
     * @return
     */
    R volunteerMerchantGetList(int pageNum,int pageSize,String type);
    /**
     * 新增
     * @param
     * @return
     */
    R insertVolunteerMerchant(VolunteerTypeVO volunteerTypeVO);
    R updateVolunteerMerchant(VolunteerTypeVO volunteerTypeVO);
    R deleteVolunteerMerchant(String id);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerMerchantServiceImpl.java
New file
@@ -0,0 +1,52 @@
package com.panzhihua.service_community.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.VolunteerTypeVO;
import com.panzhihua.service_community.dao.VolunteerMerchantDao;
import com.panzhihua.service_community.dao.VolunteerTypeDao;
import com.panzhihua.service_community.entity.VolunteerActivity;
import com.panzhihua.service_community.entity.VolunteerMerchant;
import com.panzhihua.service_community.entity.VolunteerType;
import com.panzhihua.service_community.service.VolunteerMerchantService;
import com.panzhihua.service_community.service.VolunteerTypeService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@Slf4j
@Service
public class VolunteerMerchantServiceImpl extends ServiceImpl<VolunteerMerchantDao,
        VolunteerMerchant> implements VolunteerMerchantService {
    @Override
    public R volunteerMerchantGetList(int pageNum, int pageSize, String type) {
        return null;
    }
    @Override
    public R insertVolunteerMerchant(VolunteerTypeVO volunteerTypeVO) {
        return null;
    }
    @Override
    public R updateVolunteerMerchant(VolunteerTypeVO volunteerTypeVO) {
        return null;
    }
    @Override
    public R deleteVolunteerMerchant(String id) {
        return null;
    }
//    @Override
//    public R volunteerTypeDelete(String id) {
//        int num= baseMapper.volunteerTypeDelete(id);
//        if(num>0)
//        {
//            return R.ok();
//        }
//        return R.fail("添加失败");
//    }
}
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserDO.java
@@ -197,6 +197,8 @@
     */
    private String plaintextPassword;
    private String loveIntegral;
    /**
     * 街道id
     */
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml
@@ -40,10 +40,15 @@
        <result property="bigAgeTips" column="big_age_tips"/>
        <result property="plaintextPassword" column="plaintext_password"/>
        <result property="relationName" column="relation_name"/>
        <result property="loveIntegral" column="love_integral"/>
    </resultMap>
    <sql id="columns">
        `user_id`,`account`,`password`,`openid`,`session_key`,`unionid`,`phone`,`nick_name`,`name`,`community_id`,`sex`,`id_card`,`birthday`,`image_url`,`type`,`job`,`is_volunteer`,`is_partymember`,`status`,`create_at`,`last_login_time`,`tags`,`family_id`,`face_url`,`face_state`,`reject_reson`,`area_id`,`card_photo_front`,`card_photo_back`,`family_book`,`continuous_landing_days`,`is_tips`,`work_status`,`work_start_time`,`work_end_time`,`big_age_tips`
        `user_id`,`account`,`password`,`openid`,`session_key`,`unionid`,`phone`,`nick_name`,`name`,
        `community_id`,`sex`,`id_card`,`birthday`,`image_url`,`type`,`job`,`is_volunteer`,`is_partymember`,
        `status`,`create_at`,`last_login_time`,`tags`,`family_id`,`face_url`,`face_state`,`reject_reson`,`area_id`,
        `card_photo_front`,`card_photo_back`,`family_book`,`continuous_landing_days`,`is_tips`,`work_status`,
        `work_start_time`,`work_end_time`,`big_age_tips`,love_integral
    </sql>
@@ -71,7 +76,8 @@
    </update>
    <select id="selectVolunteerMngByPhone" resultType="com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO">
        select id,create_at,state,name,phone,photo_path,political_face,reject_reson,apply_reson,address,age,job,integral,community_id,submit_user_id  from com_mng_volunteer_mng where phone=#{phone} order by create_at desc limit 1
        select id,create_at,state,name,phone,photo_path,political_face,reject_reson,apply_reson,address,age,job,integral,love_integral
               community_id,submit_user_id  from com_mng_volunteer_mng where phone=#{phone} order by create_at desc limit 1
    </select>
    <select id="selectCountMemberRole" resultType="java.lang.Integer">
@@ -93,6 +99,7 @@
        a.name communityName,
        u.status,
        u.create_at,
        u.love_integral,
        u.last_login_time
        from sys_user u
        left join com_act a on u.community_id=a.community_id
@@ -164,6 +171,7 @@
        e.role_name,
        e.role_id ,
        u.`status`,
        u.love_integral,
        u.create_at,
        u.last_login_time
        FROM
@@ -312,6 +320,7 @@
        u.phone,
        u.id_card,
        u.face_state,
        u.love_integral,
        c.area_name communityName,
        u.create_at
        FROM