From 802bbc9b1a26334607b04ab562e62594e383d2c2 Mon Sep 17 00:00:00 2001 From: huanghongfa <huanghongfa123456> Date: 星期六, 31 七月 2021 17:58:31 +0800 Subject: [PATCH] 修改bug以及获取天气接口 --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java index 5203441..041110a 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java @@ -87,15 +87,17 @@ if(comActEasyPhotoVO1.getActivityId() != null && comActEasyPhotoVO1.getStatus().equals(ComActEasyPhotoDO.status.ywc)){ //查询随手拍活动 ComActEasyPhotoActivityDO photoActivityDO = comActEasyPhotoActivityMapper.selectById(comActEasyPhotoVO1.getActivityId()); - if(comActEasyPhotoVO1.getActivityType() != null){ - if(comActEasyPhotoVO1.getActivityType().equals(ComActEasyPhotoDO.activityType.yz)){ - comActEasyPhotoVO1.setActivityMoney(photoActivityDO.getGoodReward()); - }else if(comActEasyPhotoVO1.getActivityType().equals(ComActEasyPhotoDO.activityType.jl)){ - comActEasyPhotoVO1.setActivityMoney(photoActivityDO.getExcellentReward()); - }else if(comActEasyPhotoVO1.getActivityType().equals(ComActEasyPhotoDO.activityType.pt)){ - comActEasyPhotoVO1.setActivityMoney(photoActivityDO.getOrdinaryReward()); - }else if(comActEasyPhotoVO1.getActivityType().equals(ComActEasyPhotoDO.activityType.yb)){ - comActEasyPhotoVO1.setActivityMoney(photoActivityDO.getCommonlyReward()); + if(photoActivityDO != null){ + if(comActEasyPhotoVO1.getActivityType() != null){ + if(comActEasyPhotoVO1.getActivityType().equals(ComActEasyPhotoDO.activityType.yz)){ + comActEasyPhotoVO1.setActivityMoney(photoActivityDO.getGoodReward()); + }else if(comActEasyPhotoVO1.getActivityType().equals(ComActEasyPhotoDO.activityType.jl)){ + comActEasyPhotoVO1.setActivityMoney(photoActivityDO.getExcellentReward()); + }else if(comActEasyPhotoVO1.getActivityType().equals(ComActEasyPhotoDO.activityType.pt)){ + comActEasyPhotoVO1.setActivityMoney(photoActivityDO.getOrdinaryReward()); + }else if(comActEasyPhotoVO1.getActivityType().equals(ComActEasyPhotoDO.activityType.yb)){ + comActEasyPhotoVO1.setActivityMoney(photoActivityDO.getCommonlyReward()); + } } } } -- Gitblit v1.7.1