lidongdong
2024-03-06 fd3a21abe6416932c43c4f3b1698abc79a326d19
修改参加活动金汇币明细报错10
3个文件已修改
32 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActRegistDAO.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActRegistMapper.xml 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActRegistDAO.java
@@ -6,6 +6,7 @@
import com.panzhihua.common.model.vos.community.ComActActEvaluateExcelVO;
import com.panzhihua.common.model.vos.community.ComActActRegistExcelVO;
import com.panzhihua.common.model.vos.community.ComActActRegistVO;
import com.panzhihua.service_community.entity.JinhuiCoinGeneralTable;
import com.panzhihua.service_community.model.dos.ComActActRegistDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -45,4 +46,8 @@
     * @return
     */
    Integer selectTotalAwardWithRegist(@Param("activityId") Long activityId, @Param("userId") Long userId);
    JinhuiCoinGeneralTable getDetails(@Param("userId") String userIdv);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
@@ -1440,16 +1440,16 @@
                if(!StringUtils.isEmpty(actActivityDO.getJinhuiCoinPunishment()) && !StringUtils.equals(actActivityDO.getJinhuiCoinPunishment(),"0"))
                {
                    //查询个人金汇币总额
                    R<JinhuiCoinGeneralTable>  jinhuiCoinGeneralTable=jinhuiCommunityService.coinTableGetDetails(userId+"");
                    JinhuiCoinGeneralTable  jinhuiCoinGeneralTable=comActActRegistDAO.getDetails(userId+"");
                    if(jinhuiCoinGeneralTable!=null)
                    {
                        if (!StringUtils.isEmpty(jinhuiCoinGeneralTable.getData().getGoldCoin()))
                        if (!StringUtils.isEmpty(jinhuiCoinGeneralTable.getGoldCoin()))
                        {
                            JinhuiCoinGeneralTableVO jinhuiVO=new JinhuiCoinGeneralTableVO();
                            jinhuiVO.setId(jinhuiCoinGeneralTable.getData().getId());
                            jinhuiVO.setId(jinhuiCoinGeneralTable.getId());
                            int punishmentGold=Integer.valueOf(actActivityDO.getJinhuiCoinPunishment());
                            int allGold=Integer.valueOf(jinhuiCoinGeneralTable.getData().getGoldCoin());
                            int allGold=Integer.valueOf(jinhuiCoinGeneralTable.getGoldCoin());
                            if(punishmentGold>=allGold)
                            {
                                jinhuiVO.setGoldCoin("0");
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActRegistMapper.xml
@@ -159,4 +159,23 @@
    <select id="selectTotalAwardWithRegist" resultType="java.lang.Integer">
        SELECT SUM(award) FROM com_act_act_regist WHERE activity_id = #{activityId} AND user_id = #{userId} AND `type` = 1
    </select>
    <select id="getDetails" resultType="com.panzhihua.service_community.entity.JinhuiCoinGeneralTable">
        select
            id,
            user_id,
            gold_coin,
            creation_time,
            update_time,
            community_id
        from jinhui_coin_general_table
        where
            user_id=#{userId}
    </select>
</mapper>